Channels filtering with refresh button; crashing on Grid clear

Author: admunkucsd

Plugins/LfpDisplayNode/DisplayBuffer.cpp

@@ -28,7 +28,7 @@ namespace LfpViewer {
 #define BUFFER_LENGTH_S 1.0f
 
 DisplayBuffer::DisplayBuffer(int id_, String name_, float sampleRate_) : 
-    id(id_), name(name_), sampleRate(sampleRate_), isNeeded(true)
+    id(id_), name(name_), sampleRate(sampleRate_), isNeeded(true), hasFilter(false)
 {
     previousSize = 0;
     numChannels = 0;
@@ -41,6 +41,7 @@ DisplayBuffer::DisplayBuffer(int id_, String name_, float sampleRate_) :
     }
 
     ttlState = 0;
+    filteredChannels = StringArray();
 }
 
 DisplayBuffer::~DisplayBuffer()

Plugins/LfpDisplayNode/DisplayBuffer.h

@@ -90,6 +90,8 @@ namespace LfpViewer {
         };
 
         Array<ChannelMetadata> channelMetadata;
+        
+        void setFilteredChannels(StringArray channels) {filteredChannels = channels;hasFilter = true;}
 
         String name;
         int id;
@@ -123,9 +125,13 @@ namespace LfpViewer {
         void removeDisplay(int splitID);
 
         Array<int> displays;
+        
+        StringArray filteredChannels;
+        
+        bool hasFilter;
 
     };
 };
 
 
-#endif //__DISPLAYBUFFER_H__
+#endif //__DISPLAYBUFFER_H__

Plugins/LfpDisplayNode/LfpDisplay.cpp

@@ -982,20 +982,19 @@ void LfpDisplay::rebuildDrawableChannelsList()
     removeAllChildren(); // start with clean slate
 
     Array<LfpChannelTrack> channelsToDraw; // all visible channels will be added to this array
-    std::vector<int> filteredChannels;
-    for(int i = 0 ; i < 64; i++) {
-        filteredChannels.push_back(i + 32 + (64 * (i/16)));
-    }
-    int filteredChannelsSize = filteredChannels.size();
+    
+    int filteredChannelsSize = canvasSplit -> displayBuffer -> hasFilter ? canvasSplit -> displayBuffer -> filteredChannels.size() : 0;
+    const StringArray& 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;
-        if(filteredChannelsSize == 0 || (filterChannelIndex < filteredChannelsSize && i == filteredChannels[filterChannelIndex])) {
+        String channelName = 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
             {
-                filterChannelIndex++;
+                //std::cout << canvasSplit->displayBuffer->channelMetadata[i].name << std::endl;
+
                 channels[i]->setHidden(false);
                 channelInfo[i]->setHidden(false);
 
@@ -1010,6 +1009,7 @@ void LfpDisplay::rebuildDrawableChannelsList()
                 addAndMakeVisible(channels[i]);
                 addAndMakeVisible(channelInfo[i]);
             }
+            filterChannelIndex++;
         }
         else // skip some channels
         {

Plugins/LfpDisplayNode/LfpDisplayNode.cpp

@@ -327,3 +327,20 @@ void LfpDisplayNode::acknowledgeTrigger(int id)
 {
     latestTrigger.set(id, -1);
 }
+
+String LfpDisplayNode::handleConfigMessage(String msg) {
+    std::cout << "in lfp config: " << msg <<std::endl;
+}
+
+void LfpDisplayNode::handleBroadcastMessage(String msg) {
+    std::cout<< msg<< std::endl;
+    StringArray parts = StringArray::fromTokens(msg, ";", "");
+    if(parts.size() < 3 || (parts[0] != "LFPViewer" && parts[1] != "FILTER")) {
+        return;
+    }
+    int streamID = parts[2].getIntValue();
+    parts.removeRange(0, 3);
+    displayBufferMap[streamID] -> setFilteredChannels(parts);
+
+}
+

Plugins/LfpDisplayNode/LfpDisplayNode.h

@@ -99,6 +99,11 @@ class LfpDisplayNode :  public GenericProcessor
 
     /** Acknowledges receipt of a trigger for a given split display*/
     void acknowledgeTrigger(int splitId);
+    
+    /** Handles a configuration message sent to this processor, while acquisition is not active*/
+    String handleConfigMessage(String msg) override;
+    
+    void handleBroadcastMessage(String msg) override;
 
 private:
 

Plugins/LfpDisplayNode/LfpDisplayOptions.cpp

@@ -431,6 +431,13 @@ 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());
 
 }
 
@@ -465,7 +472,10 @@ void LfpDisplayOptions::resized()
 
     pauseButton->setBounds(680, getHeight() - 40, 70, 30);
 
-    colourSchemeOptionSelection->setBounds(pauseButton->getRight() + 30,
+    refreshButton->setBounds(765, getHeight() - 40, 70, 30);
+
+    
+    colourSchemeOptionSelection->setBounds(refreshButton->getRight() + 30,
         getHeight() - 30,
         180,
         height);
@@ -930,6 +940,12 @@ 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,6 +185,8 @@ 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;