Fix bug in LFP Display sub-processor selection

Author: jsiegle

Source/Plugins/LfpDisplayNode/LfpDisplayEditor.cpp

@@ -120,43 +120,46 @@ void LfpDisplayEditor::updateSubprocessorSelectorOptions()
     inputSampleRates.clear();
     subprocessorSelection->clear(dontSendNotification);
 
-    hasNoInputs = lfpProcessor->getTotalDataChannels() != 0;
-    
-    for (int i = 0, len = lfpProcessor->getTotalDataChannels(); i < len; ++i)
-    {
-        int subProcessorIdx = lfpProcessor->getDataChannel(i)->getSubProcessorIdx();
-        
-        bool success = inputSubprocessorIndices.add(subProcessorIdx);
-        
-        if (success) inputSampleRates.set(subProcessorIdx, lfpProcessor->getDataChannel(i)->getSampleRate());
-        
-    }
-    
-    for (int i = 0; i < inputSubprocessorIndices.size(); ++i)
-    {
-        subprocessorSelection->addItem (String (*(inputSubprocessorIndices.begin() + i)), i + 1);
-    }
-    
-    if (defaultSubprocessor >= 0)
-    {
-		subprocessorSelection->setSelectedId(defaultSubprocessor + 1, dontSendNotification);
-        
-        String sampleRateLabelText = "Sample Rate: ";
-		sampleRateLabelText += String(inputSampleRates[*(inputSubprocessorIndices.begin() + defaultSubprocessor)]);
-        
-        subprocessorSampleRateLabel->setText(sampleRateLabelText, dontSendNotification);
-		//setCanvasDrawableSubprocessor(defaultSubprocessor);
-    }
-    else
-    {
-        subprocessorSelection->addItem ("None", 1);
-        subprocessorSelection->setSelectedId(1, dontSendNotification);
-        
-        String sampleRateLabelText = "Sample Rate: <not available>";
-        subprocessorSampleRateLabel->setText(sampleRateLabelText, dontSendNotification);
-        //setCanvasDrawableSubprocessor(-1);
-        
-    }
+	if (lfpProcessor->getTotalDataChannels() != 0)
+
+	{
+
+		for (int i = 0, len = lfpProcessor->getTotalDataChannels(); i < len; ++i)
+		{
+			int subProcessorIdx = lfpProcessor->getDataChannel(i)->getSubProcessorIdx();
+
+			bool success = inputSubprocessorIndices.add(subProcessorIdx);
+
+			if (success) inputSampleRates.set(subProcessorIdx, lfpProcessor->getDataChannel(i)->getSampleRate());
+
+		}
+
+		for (int i = 0; i < inputSubprocessorIndices.size(); ++i)
+		{
+			subprocessorSelection->addItem(String(*(inputSubprocessorIndices.begin() + i)), i + 1);
+		}
+
+		if (defaultSubprocessor >= 0)
+		{
+			subprocessorSelection->setSelectedId(defaultSubprocessor + 1, dontSendNotification);
+
+			String sampleRateLabelText = "Sample Rate: ";
+			sampleRateLabelText += String(inputSampleRates[*(inputSubprocessorIndices.begin() + defaultSubprocessor)]);
+
+			subprocessorSampleRateLabel->setText(sampleRateLabelText, dontSendNotification);
+			//setCanvasDrawableSubprocessor(defaultSubprocessor);
+		}
+		else
+		{
+			subprocessorSelection->addItem("None", 1);
+			subprocessorSelection->setSelectedId(1, dontSendNotification);
+
+			String sampleRateLabelText = "Sample Rate: <not available>";
+			subprocessorSampleRateLabel->setText(sampleRateLabelText, dontSendNotification);
+			//setCanvasDrawableSubprocessor(-1);
+
+		}
+	}
 }
 
 void LfpDisplayEditor::setCanvasDrawableSubprocessor(int index)

Source/Plugins/LfpDisplayNode/LfpDisplayNode.cpp

@@ -46,6 +46,7 @@ LfpDisplayNode::LfpDisplayNode()
     }
 
 	subprocessorToDraw = 0;
+	numSubprocessors = -1;
 	numChannelsInSubprocessor = 0;
 	updateSubprocessorsFlag = true;
 }
@@ -70,10 +71,20 @@ void LfpDisplayNode::updateSettings()
     std::cout << "Setting num inputs on LfpDisplayNode to " << getNumInputs() << std::endl;
 
 	numChannelsInSubprocessor = 0;
+	int totalSubprocessors = 0;
+	int currentSubprocessor = -1;
 
 	for (int i = 0; i < getNumInputs(); i++)
 	{
-		if (getDataChannel(i)->getSubProcessorIdx() == subprocessorToDraw)
+		int channelSubprocessor = getDataChannel(i)->getSubProcessorIdx();
+
+		if (currentSubprocessor != channelSubprocessor)
+		{
+			totalSubprocessors++;
+			currentSubprocessor = channelSubprocessor;
+		}
+
+		if (channelSubprocessor == subprocessorToDraw)
 		{
 			numChannelsInSubprocessor++;
 			subprocessorSampleRate = getDataChannel(i)->getSampleRate();
@@ -112,16 +123,13 @@ void LfpDisplayNode::updateSettings()
     displayBufferIndex.clear();
 	displayBufferIndex.insertMultiple(0, 0, numChannelsInSubprocessor + numEventChannels);
 
-    // update the editor's subprocessor selection display
-	if (updateSubprocessorsFlag)
+    // update the editor's subprocessor selection display, only if there's a mismatch in # of subprocessors
+	if (numSubprocessors != totalSubprocessors)
 	{
 		LfpDisplayEditor * ed = (LfpDisplayEditor*)getEditor();
 		ed->updateSubprocessorSelectorOptions();
+		numSubprocessors = totalSubprocessors;
 	}
-	else {
-		updateSubprocessorsFlag = true;
-	}
-    
 }
 
 uint32 LfpDisplayNode::getChannelSourceID(const EventChannel* event) const

Source/Plugins/LfpDisplayNode/LfpDisplayNode.h

@@ -98,6 +98,7 @@ class LfpDisplayNode :  public GenericProcessor
 
 	int subprocessorToDraw;
 	int numChannelsInSubprocessor;
+	int numSubprocessors;
 	float subprocessorSampleRate;
 
     CriticalSection displayMutex;

Source/UI/EditorViewport.cpp

@@ -1584,7 +1584,7 @@ const String EditorViewport::loadState(File fileToLoad)
 							{
 								procDesc.set(2, 4); //DataThread
 								procDesc.set(3, 1); //index
-								procDesc.set(4, "Rhytm FPGA"); //libraryName
+								procDesc.set(4, "Rhythm FPGA"); //libraryName
 							}
 							else
 								procDesc.set(3, int(procDesc[3]) - 1); //arrange old nodes to its current index
@@ -1685,7 +1685,6 @@ const String EditorViewport::loadState(File fileToLoad)
 
     AccessClass::getProcessorGraph()->restoreParameters();
 
-
     String error = "Opened ";
     error += currentFile.getFileName();