Match stream name when re-loading electrodes

Author: medengineer

Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetector.cpp

@@ -818,7 +818,7 @@ void SpikeDetector::loadCustomParametersFromXml(XmlElement* xml)
 
             SpikeChannel::Type type = SpikeChannel::typeFromNumChannels(spikeParamsXml->getIntAttribute("num_channels", 1));
 
-            if (!alreadyLoaded(name, type, stream_source))
+            if (!alreadyLoaded(name, type, stream_source, stream_name))
             {
                 uint16 streamId = findSimilarStream(stream_source, stream_name, sample_rate, true);
 
@@ -849,7 +849,7 @@ void SpikeDetector::loadCustomParametersFromXml(XmlElement* xml)
     }
 }
 
-bool SpikeDetector::alreadyLoaded(String name, SpikeChannel::Type type, int stream_source)
+bool SpikeDetector::alreadyLoaded(String name, SpikeChannel::Type type, int stream_source, String stream_name)
 {
     //std::cout << "Next channel: " << name << ", " << (int) type << ", " << stream_source << std::endl;
 
@@ -862,7 +862,9 @@ bool SpikeDetector::alreadyLoaded(String name, SpikeChannel::Type type, int stre
 
             //std::cout << "LOCAL" << std::endl;
 
-            if (ch->getName() == name && ch->getChannelType() == type && getDataStream(ch->getStreamId())->getSourceNodeId() == stream_source)
+            if (ch->getName() == name && ch->getChannelType() == type
+                && getDataStream(ch->getStreamId())->getSourceNodeId() == stream_source
+                && getDataStream(ch->getStreamId())->getName() == stream_name)
             {
                 //std::cout << "found match." << std::endl;
                 return true;

Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetector.h

@@ -258,7 +258,7 @@ class SpikeDetector : public GenericProcessor
 
     /** Checks whether a spike channel has been loaded, to prevent double-loading
         when there is a Merger in the signal chain */
-    bool alreadyLoaded(String name, SpikeChannel::Type type, int stream_source);
+    bool alreadyLoaded(String name, SpikeChannel::Type type, int stream_source, String stream_name);
 
     StreamSettings<SpikeDetectorSettings> settings;
 

Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikePlots.cpp

@@ -364,7 +364,6 @@ float SpikePlot::getDisplayThresholdForChannel(int i)
 
 void SpikePlot::setDisplayThresholdForChannel(int i, float thresh)
 {
-    //std::cout << "Setting threshold to " << thresh << std::endl;
     waveAxes[i]->setDisplayThreshold(thresh);
 }