Change to filtering using desc. where desc. is the channel index

Author: admunkucsd

Plugins/LfpDisplayNode/DisplayBuffer.cpp

@@ -41,7 +41,6 @@ DisplayBuffer::DisplayBuffer(int id_, String name_, float sampleRate_) :
     }
 
     ttlState = 0;
-    filteredChannels = StringArray();
 }
 
 DisplayBuffer::~DisplayBuffer()
@@ -65,7 +64,8 @@ void DisplayBuffer::addChannel(
     ContinuousChannel::Type type, 
     bool isRecorded,
     int group, 
-    float ypos, 
+    float ypos,
+    String description,
     String structure)
 {
     ChannelMetadata metadata = ChannelMetadata();
@@ -76,6 +76,7 @@ void DisplayBuffer::addChannel(
     metadata.structure = structure;
     metadata.type = type;
     metadata.isRecorded = isRecorded;
+    metadata.description = description;
 
     channelMetadata.add(metadata);
     channelMap[channelNum] = numChannels;

Plugins/LfpDisplayNode/DisplayBuffer.h

@@ -60,7 +60,8 @@ namespace LfpViewer {
                         ContinuousChannel::Type channelType, 
                         bool isRecorded,
                         int group = 0, 
-                        float ypos = 0, 
+                        float ypos = 0,
+                        String description = "",
                         String structure = "None");
 
         /** Initializes the event channel at the start of each buffer */
@@ -87,11 +88,12 @@ namespace LfpViewer {
             String structure = "None";
             ContinuousChannel::Type type;
             bool isRecorded = false;
+            String description = "";
         };
 
         Array<ChannelMetadata> channelMetadata;
 
-        void setFilteredChannels(StringArray channels) {filteredChannels = channels;}
+        void setFilteredChannels(Array<int> channels) {filteredChannels = channels;}
 
         String name;
         int id;
@@ -126,7 +128,7 @@ namespace LfpViewer {
 
         Array<int> displays;
 
-        StringArray filteredChannels;
+        Array<int> filteredChannels;
 
     };
 };

Plugins/LfpDisplayNode/LfpDisplay.cpp

@@ -981,17 +981,20 @@ void LfpDisplay::rebuildDrawableChannelsList()
     removeAllChildren(); // start with clean slate
 
     Array<LfpChannelTrack> channelsToDraw; // all visible channels will be added to this array
-    StringArray filteredChannels;
+    Array<int> filteredChannels;
     if(canvasSplit -> displayBuffer) {
         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 = 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])) {
+        int channelNumber = filteredChannels.size() ? canvasSplit->displayBuffer->channelMetadata[i].description.getIntValue(): -1;
+        //the filter list can have channels that aren't selected for acqusition; this skips those filtered channels
+        while(filterChannelIndex < filteredChannels.size() && channelNumber > filteredChannels[filterChannelIndex]){
+            filterChannelIndex++;
+        }
+        if(filteredChannels.size() == 0 || (filterChannelIndex < filteredChannels.size() && channelNumber == filteredChannels[filterChannelIndex])) {
             if (displaySkipAmt == 0 || ((filteredChannels.size() ? filterChannelIndex : i) % displaySkipAmt == 0)) // no skips, add all channels
             {
 

Plugins/LfpDisplayNode/LfpDisplayNode.cpp

@@ -91,13 +91,14 @@ void LfpDisplayNode::updateSettings()
             displayBufferMap[streamId]->sampleRate = channel->getSampleRate();
             displayBufferMap[streamId]->name = name;
         }
-
+//
         displayBufferMap[streamId]->addChannel(channel->getName(), // name
             ch, // index
             channel->getChannelType(), // type
             channel->isRecorded,
             0, // group
-            channel->position.y // ypos
+            channel->position.y, // ypos
+            channel-> getDescription()
             );
 }
 
@@ -347,10 +348,10 @@ void LfpDisplayNode::handleBroadcastMessage(String msg) {
         if(streamID < 0 || start < 0 || rows < 0 || cols < 0 || colsPerRow < 0){
             return;
         }
-        StringArray channelNames;
+        Array<int> channelNames;
         for(int row = 0; row < rows; row++) {
             for(int col = 0; col < cols; col++) {
-                channelNames.add("CH"+String(start + col + row*colsPerRow));
+                channelNames.add(start + col + row*colsPerRow);
             }
         }
         displayBufferMap[streamID] -> setFilteredChannels(channelNames);