Change filter message parsing to expect rectangular selection params

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), hasFilter(false)
+    id(id_), name(name_), sampleRate(sampleRate_), isNeeded(true)
 {
     previousSize = 0;
     numChannels = 0;

Plugins/LfpDisplayNode/DisplayBuffer.h

@@ -91,7 +91,7 @@ namespace LfpViewer {
 
         Array<ChannelMetadata> channelMetadata;
 
-        void setFilteredChannels(StringArray channels) {filteredChannels = channels;hasFilter = true;}
+        void setFilteredChannels(StringArray channels) {filteredChannels = channels;}
 
         String name;
         int id;
@@ -127,8 +127,6 @@ namespace LfpViewer {
         Array<int> displays;
 
         StringArray filteredChannels;
-        
-        bool hasFilter;
 
     };
 };

Plugins/LfpDisplayNode/LfpDisplay.cpp

@@ -50,7 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <math.h>
 #include <numeric>
-#include <vector>
 
 using namespace LfpViewer;
 
@@ -982,21 +981,19 @@ void LfpDisplay::rebuildDrawableChannelsList()
     removeAllChildren(); // start with clean slate
 
     Array<LfpChannelTrack> channelsToDraw; // all visible channels will be added to this array
-    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 = 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
+        String channelName = filteredChannels.size() ? canvasSplit->displayBuffer->channelMetadata[i].name: "";
+        //check if no filter list is used or if the current channel has the same name as the current filtered channel in the list
+        if(filteredChannels.size() == 0 || (filterChannelIndex < filteredChannels.size() && channelName == filteredChannels[filterChannelIndex])) {
+            if (displaySkipAmt == 0 || ((filteredChannels.size() ? filterChannelIndex : i) % displaySkipAmt == 0)) // no skips, add all channels
             {
-                //std::cout << canvasSplit->displayBuffer->channelMetadata[i].name << std::endl;
 
                 channels[i]->setHidden(false);
                 channelInfo[i]->setHidden(false);

Plugins/LfpDisplayNode/LfpDisplayNode.cpp

@@ -328,14 +328,8 @@ 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) {
     DynamicObject::Ptr jsonMessage = JSON::parse(msg).getDynamicObject();
-    std::cout<< msg<< std::endl;
-    StringArray parts = StringArray::fromTokens(msg, ";", "");
     String pluginName= jsonMessage -> getProperty("plugin");
     if(pluginName != "LFPViewer") {
         return;
@@ -346,17 +340,22 @@ void LfpDisplayNode::handleBroadcastMessage(String msg) {
         if(payload.get() == nullptr)
             return;
         int streamID = payload -> getProperty("streamID");
-        var indexes = payload -> getProperty("indexes");
-        if(streamID < 0 || indexes.size() == 0 ){
+        int start = payload -> getProperty("start");
+        int rows = payload -> getProperty("rows");
+        int cols = payload -> getProperty("cols");
+        int colsPerRow = payload -> getProperty("colsPerRow");
+        if(streamID < 0 || start < 0 || rows < 0 || cols < 0 || colsPerRow < 0){
             return;
         }
         StringArray channelNames;
-        for(int i = 0; i < indexes.size(); i++) {
-            channelNames.add("CH"+String(indexes[i]));
+        for(int row = 0; row < rows; row++) {
+            for(int col = 0; col < cols; col++) {
+                channelNames.add("CH"+String(start + col + row*colsPerRow));
+            }
         }
         displayBufferMap[streamID] -> setFilteredChannels(channelNames);
         for(auto split : splitDisplays) {
-            split -> shouldRebuildChannelList = true;
+            split -> shouldRebuildChannelList = split->displayBuffer->id == streamID;
         }
 
     }

Plugins/LfpDisplayNode/LfpDisplayNode.h

@@ -99,10 +99,8 @@ 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;
-    
+
+    /** Handles messages from other processors during acquisition*/
     void handleBroadcastMessage(String msg) override;
 
 private: