Dismiss PopupChannelSelector if channel count changes

Author: anjaldoshi

Plugins/SpikeDetector/PopupConfigurationWindow.h

@@ -103,6 +103,12 @@ class ChannelSelectorCustomComponent : public PopupChannelSelector::Listener,
         channels->setNextValue (newArray);
     }
 
+    /** Get the number of channels */
+    int getChannelCount() override
+    {
+        return channels->getChannelCount();
+    }
+
     /** Sets row and column */
     void setRowAndColumn (const int newRow, const int newColumn);
 
@@ -409,6 +415,9 @@ class SpikeChannelGenerator : public Component,
     /** Responds to changes in the PopupChannelSelector*/
     void channelStateChanged (Array<int> selectedChannels);
 
+    /** Get the number of channels */
+    int getChannelCount() { return channelCount; }
+
     /** Responds to button clicks*/
     void buttonClicked (Button* button);
 

Source/Processors/Editors/PopupChannelSelector.cpp

@@ -268,6 +268,12 @@ void PopupChannelSelector::paint (Graphics& g)
 
 void PopupChannelSelector::updatePopup()
 {
+    if (nChannels != listener->getChannelCount())
+    {
+        findParentComponentOfClass<CallOutBox>()->exitModalState (0);
+        return;
+    }
+
     Array<int> selectedChannels = listener->getSelectedChannels();
     for (auto* btn : channelButtons)
     {

Source/Processors/Editors/PopupChannelSelector.h

@@ -127,6 +127,7 @@ class PLUGIN_API PopupChannelSelector : public PopupComponent,
         virtual ~Listener() {}
         virtual Array<int> getSelectedChannels() = 0;
         virtual void channelStateChanged (Array<int> selectedChannels) = 0;
+        virtual int getChannelCount() = 0;
     };
 
     /** Constructor */

Source/Processors/Parameter/Parameter.h

@@ -736,6 +736,9 @@ class PLUGIN_API SelectedChannelsParameter : public Parameter
     /** Sets the total number of available channels in this stream*/
     void setChannelCount (int count);
 
+    /** Returns the total number of available channels in this stream*/
+    int getChannelCount() { return channelCount; }
+
     /** Saves the parameter to an XML Element*/
     virtual void toXml (XmlElement*) override;
 
@@ -787,6 +790,9 @@ class PLUGIN_API MaskChannelsParameter : public Parameter
     /** Gets the value change description */
     virtual String getChangeDescription() override;
 
+    /** Returns the total number of available channels in this stream*/
+    int getChannelCount() { return channelCount; }
+
     /** Sets the total number of available channels in this stream*/
     void setChannelCount (int count);
 

Source/Processors/Parameter/ParameterEditor.cpp

@@ -586,6 +586,11 @@ Array<int> SelectedChannelsParameterEditor::getSelectedChannels()
     return ((SelectedChannelsParameter*) param)->getArrayValue();
 }
 
+int SelectedChannelsParameterEditor::getChannelCount()
+{
+    return ((SelectedChannelsParameter*) param)->getChannelCount();
+}
+
 void SelectedChannelsParameterEditor::channelStateChanged (Array<int> newChannels)
 {
     Array<var> newArray;
@@ -691,6 +696,11 @@ Array<int> MaskChannelsParameterEditor::getSelectedChannels()
     return ((MaskChannelsParameter*) param)->getArrayValue();
 }
 
+int MaskChannelsParameterEditor::getChannelCount()
+{
+    return ((MaskChannelsParameter*) param)->getChannelCount();
+}
+
 void MaskChannelsParameterEditor::channelStateChanged (Array<int> newChannels)
 {
     Array<var> newArray;

Source/Processors/Parameter/ParameterEditor.h

@@ -399,6 +399,9 @@ class PLUGIN_API SelectedChannelsParameterEditor : public ParameterEditor,
     /** Responds to changes in the PopupChannelSelector*/
     void channelStateChanged (Array<int> selectedChannels) override;
 
+    /** Get the number of channels */
+    int getChannelCount() override;
+
     /** Sets sub-component locations */
     virtual void resized() override;
 
@@ -459,6 +462,9 @@ class PLUGIN_API MaskChannelsParameterEditor : public ParameterEditor,
     /** Responds to changes in the PopupChannelSelector*/
     void channelStateChanged (Array<int> selectedChannels) override;
 
+    /** Get the number of channels */
+    int getChannelCount() override;
+
     /** Sets sub-component locations */
     virtual void resized() override;
 

Source/Processors/RecordNode/RecordNodeEditor.cpp

@@ -257,6 +257,11 @@ void RecordChannelsParameterEditor::channelStateChanged (Array<int> newChannels)
     updateView();
 }
 
+int RecordChannelsParameterEditor::getChannelCount()
+{
+    return ((MaskChannelsParameter*) param)->getChannelCount();
+}
+
 Array<int> RecordChannelsParameterEditor::getSelectedChannels()
 {
     MaskChannelsParameter* p = (MaskChannelsParameter*) param;

Source/Processors/RecordNode/RecordNodeEditor.h

@@ -118,8 +118,6 @@ class SyncStartTimeMonitor : public SyncMonitor
     void paint (Graphics& g);
 };
 
-
-
 class StreamMonitor : public LevelMonitor
 {
 public:
@@ -144,7 +142,6 @@ class StreamMonitor : public LevelMonitor
     int totalChannels;
 };
 
-
 class DiskMonitor : public LevelMonitor, public DiskSpaceListener
 {
 public:
@@ -197,6 +194,9 @@ class RecordChannelsParameterEditor : public ParameterEditor,
     /** Responds to changes in the PopupChannelSelector*/
     void channelStateChanged (Array<int> selectedChannels) override;
 
+    /** Get the number of channels */
+    int getChannelCount() override;
+
     /** Sets sub-component locations */
     virtual void resized() override;
 
@@ -314,7 +314,7 @@ class RecordNodeEditor : public GenericEditor,
     /** Set the time of latest sync pulse */
     void setLastSyncEvent (uint16 streamId, bool isSynchronized, float syncTimeSeconds);
 
-     /** Set the synchronization accuracy metric for a particular stream */
+    /** Set the synchronization accuracy metric for a particular stream */
     void setSyncAccuracy (uint16 streamId, bool isSynchronized, float expectedMinusActual);
 
     std::unique_ptr<FifoDrawerButton> fifoDrawerButton;