Add switch to splitter used to update channel list after filter message

Author: admunkucsd

Plugins/LfpDisplayNode/LfpDisplay.cpp

@@ -381,6 +381,10 @@ void LfpDisplay::refresh()
     if (numChans == 0)
         return;
 
+    if(canvasSplit -> shouldRebuildChannelList) {
+        canvasSplit -> shouldRebuildChannelList = false;
+        rebuildDrawableChannelsList();
+    }
     // Ensure the lfpChannelBitmap has been initialized
     if (lfpChannelBitmap.isNull() || lfpChannelBitmap.getWidth() < getWidth() - canvasSplit->leftmargin)
     {
@@ -982,14 +986,17 @@ void LfpDisplay::rebuildDrawableChannelsList()
     removeAllChildren(); // start with clean slate
 
     Array<LfpChannelTrack> channelsToDraw; // all visible channels will be added to this array
-    
-    int filteredChannelsSize = canvasSplit -> displayBuffer -> hasFilter ? canvasSplit -> displayBuffer -> filteredChannels.size() : 0;
-    const StringArray& filteredChannels = canvasSplit -> displayBuffer -> filteredChannels;
+    int filteredChannelsSize = 0;
+    StringArray filteredChannels;
+    if(canvasSplit -> displayBuffer) {
+        filteredChannelsSize = canvasSplit -> displayBuffer -> hasFilter ? canvasSplit -> displayBuffer -> filteredChannels.size() : 0;
+        filteredChannels = canvasSplit -> displayBuffer -> filteredChannels;
+    }
     // iterate over all channels and select drawable ones
     for (int i = 0, drawableChannelNum = 0, filterChannelIndex = 0; i < channels.size(); i++)
     {
 		//std::cout << "Checking for hidden channels" << std::endl;
-        String channelName = canvasSplit->displayBuffer->channelMetadata[i].name;
+        String channelName = filteredChannelsSize ? canvasSplit->displayBuffer->channelMetadata[i].name: "";
         if(filteredChannelsSize == 0 || (filterChannelIndex < filteredChannelsSize && channelName == filteredChannels[filterChannelIndex])) {
             if (displaySkipAmt == 0 || ((filteredChannelsSize ? filterChannelIndex : i) % displaySkipAmt == 0)) // no skips, add all channels
             {

Plugins/LfpDisplayNode/LfpDisplayCanvas.h

@@ -340,6 +340,8 @@ class LfpDisplaySplitter : public Component,
     uint16 selectedStreamId;
 
     void refreshScreenBuffer();
+    
+    bool shouldRebuildChannelList = false;
 
 private:
 

Plugins/LfpDisplayNode/LfpDisplayNode.cpp

@@ -341,6 +341,9 @@ void LfpDisplayNode::handleBroadcastMessage(String msg) {
     int streamID = parts[2].getIntValue();
     parts.removeRange(0, 3);
     displayBufferMap[streamID] -> setFilteredChannels(parts);
+    for(auto split : splitDisplays) {
+        split -> shouldRebuildChannelList = true;
+    }
 
 }
 

Plugins/LfpDisplayNode/LfpDisplayOptions.cpp

@@ -431,13 +431,6 @@ LfpDisplayOptions::LfpDisplayOptions(LfpDisplayCanvas* canvas_, LfpDisplaySplitt
     lfpDisplay->setRange(voltageRanges[ContinuousChannel::Type::AUX][selectedVoltageRange[ContinuousChannel::Type::AUX] - 1].getFloatValue()
         *rangeGain[ContinuousChannel::Type::AUX]
         , ContinuousChannel::Type::AUX);
-    
-    refreshButton = new UtilityButton("Refresh", Font("Default", "Plain", 15));
-    refreshButton->setRadius(5.0f);
-    refreshButton->setEnabledState(true);
-    refreshButton->setCorners(true, true, true, true);
-    refreshButton->addListener(this);
-    addAndMakeVisible(refreshButton.get());
 
 }
 
@@ -472,10 +465,7 @@ void LfpDisplayOptions::resized()
 
     pauseButton->setBounds(680, getHeight() - 40, 70, 30);
 
-    refreshButton->setBounds(765, getHeight() - 40, 70, 30);
-
-    
-    colourSchemeOptionSelection->setBounds(refreshButton->getRight() + 30,
+    colourSchemeOptionSelection->setBounds(pauseButton->getRight() + 30,
         getHeight() - 30,
         180,
         height);
@@ -940,12 +930,6 @@ void LfpDisplayOptions::buttonClicked(Button* b)
         timescale->setPausedState(b->getToggleState());
         return;
     }
-    
-    if (b == refreshButton.get())
-    {
-        lfpDisplay->rebuildDrawableChannelsList();
-        return;
-    }
 
     if (b == showHideOptionsButton.get())
     {

Plugins/LfpDisplayNode/LfpDisplayOptions.h

@@ -185,8 +185,6 @@ class LfpDisplayOptions :
     std::unique_ptr<ComboBox> rangeSelection;
     OwnedArray<UtilityButton> typeButtons;
 
-    ScopedPointer<UtilityButton> refreshButton;
-    
     std::unique_ptr<ComboBox> overlapSelection; // what do we do with this?
 
     OwnedArray<EventDisplayInterface> eventDisplayInterfaces;