ChannelSelector:removed listener. Changed channelChanged() signature.

sept-en · sept-en · commit 10a567fc4a08 · 2016-03-22T20:46:36.000+03:00
diff --git a/Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetectorEditor.cpp b/Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetectorEditor.cpp
@@ -383,7 +383,7 @@ void SpikeDetectorEditor::buttonEvent(Button* button)
 
 }
 
-void SpikeDetectorEditor::channelChanged(int chan)
+void SpikeDetectorEditor::channelChanged (int channel, bool /*newState*/)
 {
 
     if (electrodeEditorButtons[0]->getToggleState()) // editing is active
@@ -394,13 +394,13 @@ void SpikeDetectorEditor::channelChanged(int chan)
         {
             if (electrodeButtons[i]->getToggleState())
             {
-                electrodeButtons[i]->setChannelNum(chan);
+                electrodeButtons[i]->setChannelNum (channel);
                 electrodeButtons[i]->repaint();
 
                 SpikeDetector* processor = (SpikeDetector*) getProcessor();
                 processor->setChannel(electrodeList->getSelectedItemIndex(),
                                       i,
-                                      chan-1);
+                                      channel - 1);
             }
         }
     }
diff --git a/Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetectorEditor.h b/Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetectorEditor.h
@@ -58,7 +58,7 @@ class SpikeDetectorEditor : public GenericEditor,
     void comboBoxChanged(ComboBox* comboBox);
     void sliderEvent(Slider* slider);
 
-    void channelChanged(int chan);
+    void channelChanged (int channel, bool newState) override;
 
     bool addElectrode(int nChans, int electrodeID = 0);
     void removeElectrode(int index);
diff --git a/Source/Plugins/CAR/CAREditor.cpp b/Source/Plugins/CAR/CAREditor.cpp
@@ -68,7 +68,6 @@ CAREditor::CAREditor (GenericProcessor* parentProcessor, bool useDefaultParamete
     addAndMakeVisible (m_gainSlider);
 
     channelSelector->paramButtonsToggledByDefault (false);
-    channelSelector->addListener (this);
 
     setDesiredWidth (280);
 }
@@ -126,7 +125,7 @@ void CAREditor::buttonClicked (Button* buttonThatWasClicked)
 }
 
 
-void CAREditor::channelSelectionChanged (int channel, bool newState)
+void CAREditor::channelChanged (int channel, bool newState)
 {
     auto processor = static_cast<CAR*> (getProcessor());
     if (m_currentChannelsView == REFERENCE_CHANNELS)
diff --git a/Source/Plugins/CAR/CAREditor.h b/Source/Plugins/CAR/CAREditor.h
@@ -35,7 +35,6 @@ class ParameterSlider;
    @see CAR
 */
 class CAREditor : public GenericEditor
-                , private ChannelSelector::Listener
 {
 public:
     CAREditor (GenericProcessor* parentProcessor, bool useDefaultParameterEditors);
@@ -49,14 +48,11 @@ class CAREditor : public GenericEditor
     // ==========================================================
     void buttonClicked (Button* buttonThatWasClicked) override;
 
-    // ChannelSelector::Listener methods
-    // =========================================================
-    void channelSelectionChanged (int channel, bool newState) override;
-
     // GenericEditor methods
     // =========================================================
     /** This methods is called when any sliders that we are listen for change their values */
     void sliderEvent (Slider* sliderWhichValueHasChanged) override;
+    void channelChanged (int channel, bool newState) override;
 
 
 private:
diff --git a/Source/Plugins/ChannelMappingNode/ChannelMappingEditor.cpp b/Source/Plugins/ChannelMappingNode/ChannelMappingEditor.cpp
@@ -612,14 +612,14 @@ void ChannelMappingEditor::setChannelReference(ElectrodeButton* button)
 
 }
 
-void ChannelMappingEditor::channelChanged(int chan)
+void ChannelMappingEditor::channelChanged (int channel, bool /*newState*/)
 {
-    if (!reorderActive)
+    if (! reorderActive)
     {
-        setConfigured(true);
-        getProcessor()->setCurrentChannel(chan-1);
-        getProcessor()->setParameter(2,selectedReference);
-        referenceChannels.set(selectedReference,chan-1);
+        setConfigured (true);
+        getProcessor()->setCurrentChannel (channel - 1);
+        getProcessor()->setParameter (2, selectedReference);
+        referenceChannels.set (selectedReference, channel - 1);
     }
 }
 
diff --git a/Source/Plugins/ChannelMappingNode/ChannelMappingEditor.h b/Source/Plugins/ChannelMappingNode/ChannelMappingEditor.h
@@ -55,7 +55,7 @@ class ChannelMappingEditor : public GenericEditor,
     void saveCustomParameters(XmlElement* xml);
     void loadCustomParameters(XmlElement* xml);
 
-    void channelChanged(int chan);
+    void channelChanged (int channel, bool newState) override;
 
     void mouseDrag(const MouseEvent& e);
 
diff --git a/Source/Plugins/FilterNode/FilterEditor.cpp b/Source/Plugins/FilterNode/FilterEditor.cpp
@@ -162,13 +162,13 @@ void FilterEditor::labelTextChanged(Label* label)
 
 }
 
-void FilterEditor::channelChanged(int chan)
+void FilterEditor::channelChanged (int channel, bool /*newState*/)
 {
     FilterNode* fn = (FilterNode*) getProcessor();
 
-    highCutValue->setText(String(fn->getHighCutValueForChannel(chan)), dontSendNotification);
-    lowCutValue->setText(String(fn->getLowCutValueForChannel(chan)), dontSendNotification);
-    applyFilterOnChan->setToggleState(fn->getBypassStatusForChannel(chan), dontSendNotification);
+    highCutValue->setText (String (fn->getHighCutValueForChannel (channel)), dontSendNotification);
+    lowCutValue->setText  (String (fn->getLowCutValueForChannel  (channel)), dontSendNotification);
+    applyFilterOnChan->setToggleState (fn->getBypassStatusForChannel (channel), dontSendNotification);
 
 }
 
diff --git a/Source/Plugins/FilterNode/FilterEditor.h b/Source/Plugins/FilterNode/FilterEditor.h
@@ -52,7 +52,7 @@ class FilterEditor : public GenericEditor,
 
     void setDefaults(double lowCut, double highCut);
 
-    void channelChanged(int chan);
+    void channelChanged (int chan, bool newState);
 
 private:
 
diff --git a/Source/Plugins/SpikeSorter/SpikeSorterEditor.cpp b/Source/Plugins/SpikeSorter/SpikeSorterEditor.cpp
@@ -494,42 +494,43 @@ void SpikeSorterEditor::setThresholdValue(int channel, double threshold)
     repaint();
 }
 
-void SpikeSorterEditor::channelChanged(int chan)
+void SpikeSorterEditor::channelChanged (int channel, bool newState)
 {
     //std::cout << "New channel: " << chan << std::endl;
-    if (chan <=0)
+    if (channel <= 0)
         return;
 
-    for (int i = 0; i < electrodeButtons.size(); i++)
+    const int numElectrodeButtons = electrodeButtons.size();
+    for (int i = 0; i < numElectrodeButtons; ++i)
     {
         if (electrodeButtons[i]->getToggleState())
         {
-            electrodeButtons[i]->setChannelNum(chan);
+            electrodeButtons[i]->setChannelNum (channel);
             electrodeButtons[i]->repaint();
+
             Array<int> a;
-            a.add(chan-1);
-            channelSelector->setActiveChannels(a);
+            a.add (channel - 1);
+            channelSelector->setActiveChannels (a);
+
             SpikeSorter* processor = (SpikeSorter*) getProcessor();
             processor->setChannel(electrodeList->getSelectedItemIndex(),
                                   i,
-                                  chan-1);
+                                  channel - 1);
 
             // if DAC is selected, update the mapping.
-            int dacchannel = dacCombo->getSelectedId()-2;
+            int dacchannel = dacCombo->getSelectedId() - 2;
             if (dacchannel >=0)
             {
-                processor->assignDACtoChannel(dacchannel, chan-1);
+                processor->assignDACtoChannel (dacchannel, channel - 1);
             }
             if (processor->getAutoDacAssignmentStatus())
             {
-                processor->assignDACtoChannel(0,chan-1);
-                processor->assignDACtoChannel(1,chan-1);
+                processor->assignDACtoChannel (0, channel - 1);
+                processor->assignDACtoChannel (1, channel - 1);
                 break;
             }
-
         }
     }
-
 }
 
 int SpikeSorterEditor::getSelectedElectrode()
diff --git a/Source/Plugins/SpikeSorter/SpikeSorterEditor.h b/Source/Plugins/SpikeSorter/SpikeSorterEditor.h
@@ -54,7 +54,7 @@ class SpikeSorterEditor : public VisualizerEditor,
     void comboBoxChanged(ComboBox* comboBox);
     void sliderEvent(Slider* slider);
 
-    void channelChanged(int chan);
+    void channelChanged (int chan, bool newState) override;
 
     Visualizer* createNewCanvas();
     void checkSettings();
diff --git a/Source/Processors/DataThreads/RhythmNode/RHD2000Editor.cpp b/Source/Processors/DataThreads/RhythmNode/RHD2000Editor.cpp
@@ -867,16 +867,15 @@ void RHD2000Editor::buttonEvent(Button* button)
 
 }
 
-void RHD2000Editor::channelChanged(int chan)
+void RHD2000Editor::channelChanged (int channel, bool /*newState*/)
 {
     for (int i = 0; i < 2; i++)
     {
         if (electrodeButtons[i]->getToggleState())
         {
-            electrodeButtons[i]->setChannelNum(chan);
+            electrodeButtons[i]->setChannelNum (channel);
             electrodeButtons[i]->repaint();
-            board->setDACchannel(i, chan);
-
+            board->setDACchannel (i, channel);
         }
     }
 }
diff --git a/Source/Processors/DataThreads/RhythmNode/RHD2000Editor.h b/Source/Processors/DataThreads/RhythmNode/RHD2000Editor.h
@@ -176,7 +176,7 @@ class RHD2000Editor : public VisualizerEditor, public ComboBox::Listener, public
     void startAcquisition();
     void stopAcquisition();
 
-    void channelChanged(int chan);
+    void channelChanged (int channel, bool newState) override;
 
     void saveCustomParameters(XmlElement* xml);
     void loadCustomParameters(XmlElement* xml);
diff --git a/Source/Processors/Editors/ChannelSelector.cpp b/Source/Processors/Editors/ChannelSelector.cpp
@@ -610,7 +610,7 @@ void ChannelSelector::buttonClicked(Button* button)
         {
             // send a message to parent
             GenericEditor* editor = (GenericEditor*) getParentComponent();
-            editor->channelChanged(-1);
+            editor->channelChanged (-1, false);
         }
     }
     else
@@ -668,18 +668,15 @@ void ChannelSelector::buttonClicked(Button* button)
         else // parameter type
         {
             GenericEditor* editor = (GenericEditor*) getParentComponent();
-            editor->channelChanged(b->getChannel()-1);
+            editor->channelChanged (b->getChannel() - 1, b->getToggleState());
 
             // do nothing
             if (radioStatus) // if radio buttons are active
             {
                 // send a message to parent
                 GenericEditor* editor = (GenericEditor*) getParentComponent();
-                editor->channelChanged(b->getChannel());
+                editor->channelChanged (b->getChannel(), b->getToggleState());
             }
-
-            m_listeners.call (&ChannelSelector::Listener::channelSelectionChanged,
-                              b->getChannel() - 1, b->getToggleState());
         }
     }
     refreshParameterColors();
diff --git a/Source/Processors/Editors/ChannelSelector.h b/Source/Processors/Editors/ChannelSelector.h
@@ -52,19 +52,9 @@ class PLUGIN_API ChannelSelector : public Component
                                  , public Timer
 {
 public:
-    class PLUGIN_API Listener
-    {
-    public:
-        virtual ~Listener() { }
-        virtual void channelSelectionChanged (int channel, bool newState) = 0;
-    };
-
     ChannelSelector(bool createButtons, Font& titleFont);
     ~ChannelSelector();
 
-    void addListener    (Listener* listener) { m_listeners.add (listener); }
-    void removeListener (Listener* listener) { m_listeners.remove (listener); }
-
     /** button callback */
     void buttonClicked(Button* button);
     
@@ -158,8 +148,6 @@ class PLUGIN_API ChannelSelector : public Component
      will be written to disk when the record button is pressed. */
     Array<ChannelSelectorButton*> recordButtons;
 
-    ListenerList<Listener> m_listeners;
-
     bool paramsToggled;
     bool paramsActive;
     bool recActive;
diff --git a/Source/Processors/Editors/GenericEditor.cpp b/Source/Processors/Editors/GenericEditor.cpp
@@ -1158,7 +1158,7 @@ void GenericEditor::updateSettings() {}
 
 void GenericEditor::updateVisualizer() {}
 
-void GenericEditor::channelChanged(int chan) {}
+void GenericEditor::channelChanged (int channel, bool newState) {}
 
 void GenericEditor::saveCustomParameters(XmlElement* xml) { }
 
diff --git a/Source/Processors/Editors/GenericEditor.h b/Source/Processors/Editors/GenericEditor.h
@@ -234,7 +234,7 @@ class PLUGIN_API GenericEditor : public AudioProcessorEditor,
     virtual void updateVisualizer();
 
     /** Used by SpikeDetectorEditor. */
-    virtual void channelChanged(int chan);
+    virtual void channelChanged (int channel, bool newState);
 
     /** Returns all selected channels from the ChannelSelector. */
     Array<int> getActiveChannels();

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ void SpikeDetectorEditor::buttonEvent(Button* button)`
`383`	`383`
`384`	`384`	`}`
`385`	`385`
`386`		`-void SpikeDetectorEditor::channelChanged(int chan)`
	`386`	`+void SpikeDetectorEditor::channelChanged (int channel, bool /newState/)`
`387`	`387`	`{`
`388`	`388`
`389`	`389`	`if (electrodeEditorButtons[0]->getToggleState()) // editing is active`
`@@ -394,13 +394,13 @@ void SpikeDetectorEditor::channelChanged(int chan)`
`394`	`394`	`{`
`395`	`395`	`if (electrodeButtons[i]->getToggleState())`
`396`	`396`	`{`
`397`		`- electrodeButtons[i]->setChannelNum(chan);`
	`397`	`+ electrodeButtons[i]->setChannelNum (channel);`
`398`	`398`	`electrodeButtons[i]->repaint();`
`399`	`399`
`400`	`400`	`SpikeDetector* processor = (SpikeDetector*) getProcessor();`
`401`	`401`	`processor->setChannel(electrodeList->getSelectedItemIndex(),`
`402`	`402`	`i,`
`403`		`- chan-1);`
	`403`	`+ channel - 1);`
`404`	`404`	`}`
`405`	`405`	`}`
`406`	`406`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ CAREditor::CAREditor (GenericProcessor* parentProcessor, bool useDefaultParamete`
`68`	`68`	`addAndMakeVisible (m_gainSlider);`
`69`	`69`
`70`	`70`	`channelSelector->paramButtonsToggledByDefault (false);`
`71`		`- channelSelector->addListener (this);`
`72`	`71`
`73`	`72`	`setDesiredWidth (280);`
`74`	`73`	`}`
`@@ -126,7 +125,7 @@ void CAREditor::buttonClicked (Button* buttonThatWasClicked)`
`126`	`125`	`}`
`127`	`126`
`128`	`127`
`129`		`-void CAREditor::channelSelectionChanged (int channel, bool newState)`
	`128`	`+void CAREditor::channelChanged (int channel, bool newState)`
`130`	`129`	`{`
`131`	`130`	`auto processor = static_cast<CAR*> (getProcessor());`
`132`	`131`	`if (m_currentChannelsView == REFERENCE_CHANNELS)`
Original file line number	Diff line number	Diff line change
`@@ -612,14 +612,14 @@ void ChannelMappingEditor::setChannelReference(ElectrodeButton* button)`
`612`	`612`
`613`	`613`	`}`
`614`	`614`
`615`		`-void ChannelMappingEditor::channelChanged(int chan)`
	`615`	`+void ChannelMappingEditor::channelChanged (int channel, bool /newState/)`
`616`	`616`	`{`
`617`		`- if (!reorderActive)`
	`617`	`+ if (! reorderActive)`
`618`	`618`	`{`
`619`		`- setConfigured(true);`
`620`		`- getProcessor()->setCurrentChannel(chan-1);`
`621`		`- getProcessor()->setParameter(2,selectedReference);`
`622`		`- referenceChannels.set(selectedReference,chan-1);`
	`619`	`+ setConfigured (true);`
	`620`	`+ getProcessor()->setCurrentChannel (channel - 1);`
	`621`	`+ getProcessor()->setParameter (2, selectedReference);`
	`622`	`+ referenceChannels.set (selectedReference, channel - 1);`
`623`	`623`	`}`
`624`	`624`	`}`
`625`	`625`
Original file line number	Diff line number	Diff line change
`@@ -162,13 +162,13 @@ void FilterEditor::labelTextChanged(Label* label)`
`162`	`162`
`163`	`163`	`}`
`164`	`164`
`165`		`-void FilterEditor::channelChanged(int chan)`
	`165`	`+void FilterEditor::channelChanged (int channel, bool /newState/)`
`166`	`166`	`{`
`167`	`167`	`FilterNode* fn = (FilterNode*) getProcessor();`
`168`	`168`
`169`		`- highCutValue->setText(String(fn->getHighCutValueForChannel(chan)), dontSendNotification);`
`170`		`- lowCutValue->setText(String(fn->getLowCutValueForChannel(chan)), dontSendNotification);`
`171`		`- applyFilterOnChan->setToggleState(fn->getBypassStatusForChannel(chan), dontSendNotification);`
	`169`	`+ highCutValue->setText (String (fn->getHighCutValueForChannel (channel)), dontSendNotification);`
	`170`	`+ lowCutValue->setText (String (fn->getLowCutValueForChannel (channel)), dontSendNotification);`
	`171`	`+ applyFilterOnChan->setToggleState (fn->getBypassStatusForChannel (channel), dontSendNotification);`
`172`	`172`
`173`	`173`	`}`
`174`	`174`
Original file line number	Diff line number	Diff line change
`@@ -494,42 +494,43 @@ void SpikeSorterEditor::setThresholdValue(int channel, double threshold)`
`494`	`494`	`repaint();`
`495`	`495`	`}`
`496`	`496`
`497`		`-void SpikeSorterEditor::channelChanged(int chan)`
	`497`	`+void SpikeSorterEditor::channelChanged (int channel, bool newState)`
`498`	`498`	`{`
`499`	`499`	`//std::cout << "New channel: " << chan << std::endl;`
`500`		`- if (chan <=0)`
	`500`	`+ if (channel <= 0)`
`501`	`501`	`return;`
`502`	`502`
`503`		`- for (int i = 0; i < electrodeButtons.size(); i++)`
	`503`	`+ const int numElectrodeButtons = electrodeButtons.size();`
	`504`	`+ for (int i = 0; i < numElectrodeButtons; ++i)`
`504`	`505`	`{`
`505`	`506`	`if (electrodeButtons[i]->getToggleState())`
`506`	`507`	`{`
`507`		`- electrodeButtons[i]->setChannelNum(chan);`
	`508`	`+ electrodeButtons[i]->setChannelNum (channel);`
`508`	`509`	`electrodeButtons[i]->repaint();`
	`510`	`+`
`509`	`511`	`Array<int> a;`
`510`		`- a.add(chan-1);`
`511`		`- channelSelector->setActiveChannels(a);`
	`512`	`+ a.add (channel - 1);`
	`513`	`+ channelSelector->setActiveChannels (a);`
	`514`	`+`
`512`	`515`	`SpikeSorter* processor = (SpikeSorter*) getProcessor();`
`513`	`516`	`processor->setChannel(electrodeList->getSelectedItemIndex(),`
`514`	`517`	`i,`
`515`		`- chan-1);`
	`518`	`+ channel - 1);`
`516`	`519`
`517`	`520`	`// if DAC is selected, update the mapping.`
`518`		`- int dacchannel = dacCombo->getSelectedId()-2;`
	`521`	`+ int dacchannel = dacCombo->getSelectedId() - 2;`
`519`	`522`	`if (dacchannel >=0)`
`520`	`523`	`{`
`521`		`- processor->assignDACtoChannel(dacchannel, chan-1);`
	`524`	`+ processor->assignDACtoChannel (dacchannel, channel - 1);`
`522`	`525`	`}`
`523`	`526`	`if (processor->getAutoDacAssignmentStatus())`
`524`	`527`	`{`
`525`		`- processor->assignDACtoChannel(0,chan-1);`
`526`		`- processor->assignDACtoChannel(1,chan-1);`
	`528`	`+ processor->assignDACtoChannel (0, channel - 1);`
	`529`	`+ processor->assignDACtoChannel (1, channel - 1);`
`527`	`530`	`break;`
`528`	`531`	`}`
`529`		`-`
`530`	`532`	`}`
`531`	`533`	`}`
`532`		`-`
`533`	`534`	`}`
`534`	`535`
`535`	`536`	`int SpikeSorterEditor::getSelectedElectrode()`