Change broadcast messaging to handle JSON formatting

Author: admunkucsd

Plugins/LfpDisplayNode/LfpDisplay.cpp

@@ -381,10 +381,6 @@ 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)
     {

Plugins/LfpDisplayNode/LfpDisplayCanvas.cpp

@@ -1661,8 +1661,13 @@ void LfpDisplaySplitter::visibleAreaChanged()
 void LfpDisplaySplitter::refresh()
 {
     updateScreenBuffer();
-
-    lfpDisplay->refresh(); // redraws only the new part of the screen buffer, unless fullredraw is set to true
+    if(shouldRebuildChannelList) {
+        shouldRebuildChannelList = false;
+        lfpDisplay->rebuildDrawableChannelsList(); // calls resized()/refresh() after rebuilding list
+    }
+    else {
+        lfpDisplay->refresh(); // redraws only the new part of the screen buffer, unless fullredraw is set to true
+    }
 }
 
 void LfpDisplaySplitter::comboBoxChanged(juce::ComboBox *comboBox)

Plugins/LfpDisplayNode/LfpDisplayNode.cpp

@@ -333,17 +333,34 @@ String LfpDisplayNode::handleConfigMessage(String msg) {
 }
 
 void LfpDisplayNode::handleBroadcastMessage(String msg) {
+    DynamicObject::Ptr jsonMessage = JSON::parse(msg).getDynamicObject();
     std::cout<< msg<< std::endl;
     StringArray parts = StringArray::fromTokens(msg, ";", "");
-    if(parts.size() < 3 || (parts[0] != "LFPViewer" && parts[1] != "FILTER")) {
+    String pluginName= jsonMessage -> getProperty("plugin");
+    if(pluginName != "LFPViewer") {
         return;
     }
-    int streamID = parts[2].getIntValue();
-    parts.removeRange(0, 3);
-    displayBufferMap[streamID] -> setFilteredChannels(parts);
-    for(auto split : splitDisplays) {
-        split -> shouldRebuildChannelList = true;
+    String command = jsonMessage -> getProperty("command");
+    DynamicObject::Ptr payload = jsonMessage -> getProperty("payload").getDynamicObject();
+    if(command == "filter") {
+        if(payload.get() == nullptr)
+            return;
+        int streamID = payload -> getProperty("streamID");
+        var indexes = payload -> getProperty("indexes");
+        if(streamID < 0 || indexes.size() == 0 ){
+            return;
+        }
+        StringArray channelNames;
+        for(int i = 0; i < indexes.size(); i++) {
+            channelNames.add("CH"+String(indexes[i]));
+        }
+        displayBufferMap[streamID] -> setFilteredChannels(channelNames);
+        for(auto split : splitDisplays) {
+            split -> shouldRebuildChannelList = true;
+        }
+        
     }
+    
 
 }