Fix various EmptyProcessor issues in ProcessorGraph and EditorViewport

open-ephys · Nov 10, 2023 · 284acda · 284acda
1 parent d4bc31d
commit 284acda
Show file tree

Hide file tree

Showing 8 changed files with 305 additions and 162 deletions.
diff --git a/Source/Processors/Merger/Merger.cpp b/Source/Processors/Merger/Merger.cpp
@@ -69,7 +69,10 @@ void Merger::setMergerSourceNode(GenericProcessor* sn)
 void Merger::switchIO(int sourceNum)
 {
 
-    static_cast<MergerEditor*>(getEditor())->switchSource(sourceNum, false);
+    LOGDD("Merger switching source path to ", sourceNum);
+
+    if (!headlessMode)
+        static_cast<MergerEditor*>(getEditor())->switchSource(sourceNum, false);
 
     activePath = sourceNum;
 
@@ -143,7 +146,7 @@ bool Merger::stillHasSource() const
 void Merger::switchIO()
 {
 
-    LOGDD("Merger switching source.");
+    LOGDD("Merger switching source. New path: ", 1 - activePath);
 
     if (activePath == 0)
     {
@@ -347,11 +350,6 @@ void Merger::restoreConnections()
                     ProcessorGraph* gr = AccessClass::getProcessorGraph();
                     Array<GenericProcessor*> p = gr->getListOfProcessors();
 
-                    sourceNode = nullptr;
-                    sourceNodeA = nullptr;
-                    sourceNodeB = nullptr;
-
-
                     for (int k = 0; k < p.size(); k++)
                     {
                         if (p[k]->getNodeId() == nodeIdA)

diff --git a/Source/Processors/Merger/MergerEditor.cpp b/Source/Processors/Merger/MergerEditor.cpp
@@ -159,7 +159,7 @@ void MergerEditor::mouseDown(const MouseEvent& e)
 
         Array<GenericProcessor*> selectableProcessors = getSelectableProcessors();
 
-        if (merger->sourceNodeA != 0)
+        if (merger->sourceNodeA != 0 && !merger->sourceNodeA->isEmpty())
         {
             menu.addItem(++menuItemIndex, // index
             "Input A: ", // message
@@ -198,7 +198,7 @@ void MergerEditor::mouseDown(const MouseEvent& e)
                      " ",
                      false);
 
-        if (merger->sourceNodeB != 0)
+        if (merger->sourceNodeB != 0 && !merger->sourceNodeB->isEmpty())
         {
             menu.addItem(++menuItemIndex, // index
                         "Input B: ", // message
@@ -262,11 +262,11 @@ void MergerEditor::mouseDown(const MouseEvent& e)
             if (result >= inputSelectionIndexA
                     && result < inputSelectionIndexA + selectableProcessors.size())
             {
-                switchSource(0);
-                merger->setMergerSourceNode(selectableProcessors[result - inputSelectionIndexA]);
-                selectableProcessors[result-inputSelectionIndexA]->setDestNode(merger);
+                // switchSource(0);
+                // merger->setMergerSourceNode(selectableProcessors[result - inputSelectionIndexA]);
+                // selectableProcessors[result-inputSelectionIndexA]->setDestNode(merger);
 
-                AccessClass::getProcessorGraph()->updateSettings(getProcessor());
+                AccessClass::getProcessorGraph()->connectMergerSource(getProcessor(), selectableProcessors[result - inputSelectionIndexA], 0);
                 return;
             }
         }
@@ -276,11 +276,11 @@ void MergerEditor::mouseDown(const MouseEvent& e)
             if (result >= inputSelectionIndexB
                     && result < inputSelectionIndexB + selectableProcessors.size())
             {
-                switchSource(1);
-                merger->setMergerSourceNode(selectableProcessors[result - inputSelectionIndexB]);
-                selectableProcessors[result-inputSelectionIndexB]->setDestNode(merger);
+                // switchSource(1);
+                // merger->setMergerSourceNode(selectableProcessors[result - inputSelectionIndexB]);
+                // selectableProcessors[result-inputSelectionIndexB]->setDestNode(merger);
 
-                AccessClass::getProcessorGraph()->updateSettings(getProcessor());
+                AccessClass::getProcessorGraph()->connectMergerSource(getProcessor(), selectableProcessors[result - inputSelectionIndexB], 1);
                 return;
             }
         }