Merge branch 'development' of github.com:open-ephys/plugin-GUI into development

Author: aacuevas

Source/Plugins/LfpDisplayNode/LfpDisplayCanvas.cpp

@@ -230,7 +230,7 @@ void LfpDisplayCanvas::update()
     channelOverlapFactor = options->selectedOverlapValue.getFloatValue();
 
 	std::cout << "Checking channels: " << nChans << std::endl;
-	for (int i = 0; i <= processor->getNumInputs() + 1; i++) // extra channel for events
+	for (int i = 0; i < processor->getNumInputs() + 1; i++) // extra channel for events
     {
 		//std::cout << i << std::endl;
 		if (processor->getNumInputs() > 0)
@@ -282,7 +282,7 @@ void LfpDisplayCanvas::update()
 
 		std::cout << "Changing channels on LFP display" << std::endl;
 		if (nChans > 0)
-			lfpDisplay->setNumChannels(nChans + 1); // add an extra channel for events
+			lfpDisplay->setNumChannels(nChans);
 
         // update channel names
 		//std::cout << "Updating channel names" << std::endl;

Source/Plugins/LfpDisplayNode/LfpDisplayEditor.cpp

@@ -37,7 +37,7 @@ LfpDisplayEditor::LfpDisplayEditor(GenericProcessor* parentNode, bool useDefault
 
     subprocessorSelection = new ComboBox("Subprocessor sample rate");
 //    subprocessorSelection->setBounds(subprocessorSelectionLabel->getX()+5, subprocessorSelectionLabel->getBottom(), 60, 22);
-    subprocessorSelection->setBounds(10, 30, 50, 22);
+    subprocessorSelection->setBounds(10, 30, 55, 22);
     subprocessorSelection->addListener(this);
     addAndMakeVisible(subprocessorSelection);
 
@@ -148,18 +148,17 @@ void LfpDisplayEditor::updateSubprocessorSelectorOptions()
 
 			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);
 
+            return;
 		}
 	}
+
+    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)
@@ -206,7 +205,7 @@ void LfpDisplayEditor::loadVisualizerParameters(XmlElement* xml)
 		{
 			std::cout << "LfpDisplay found " << xmlNode->getIntAttribute("SubprocessorId") << std::endl;
 			defaultSubprocessor = xmlNode->getIntAttribute("SubprocessorId");
-			subprocessorSelection->setSelectedItemIndex(defaultSubprocessor + 1, sendNotification);
+			subprocessorSelection->setSelectedItemIndex(defaultSubprocessor, sendNotification);
 
 		}
 	}

Source/Plugins/LfpDisplayNode/LfpDisplayNode.cpp

@@ -123,13 +123,10 @@ void LfpDisplayNode::updateSettings()
     displayBufferIndex.clear();
 	displayBufferIndex.insertMultiple(0, 0, numChannelsInSubprocessor + numEventChannels);
 
-    // 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;
-	}
+    // update the editor's subprocessor selection display and sample rate
+	LfpDisplayEditor * ed = (LfpDisplayEditor*)getEditor();
+	ed->updateSubprocessorSelectorOptions();
+	numSubprocessors = totalSubprocessors;
 }
 
 uint32 LfpDisplayNode::getChannelSourceID(const EventChannel* event) const