Merge branch 'jsiegle-graph-viewer-fix' into development

Author: anjaldoshi

Source/Processors/GenericProcessor/GenericProcessor.cpp

@@ -176,30 +176,30 @@ void GenericProcessor::setSourceNode(GenericProcessor* sn)
 		{
 			//	std::cout << " The source is not blank." << std::endl;
 
-			if (!sn->isSink())
-			{
+			//if (!sn->isSink())
+			//{
 				//		std::cout << " The source is not a sink." << std::endl;
-				if (sourceNode != sn)
-				{
-					//			std::cout << " The source is new and named " << sn->getName() << std::endl;
+            if (sourceNode != sn)
+            {
+                //			std::cout << " The source is new and named " << sn->getName() << std::endl;
 
-					if (this->isMerger())
-						setMergerSourceNode(sn);
-					else
-						sourceNode = sn;
+                if (this->isMerger())
+                    setMergerSourceNode(sn);
+                else
+                    sourceNode = sn;
 
-					sn->setDestNode(this);
-				}
-				else
-				{
-					//			std::cout << "  The source node is not new." << std::endl;
-				}
-			}
-			else
-			{
+                sn->setDestNode(this);
+            }
+            //else
+            //{
+                //			std::cout << "  The source node is not new." << std::endl;
+            //}
+			//}
+			//else
+			//{
 				//		std::cout << " The source is a sink." << std::endl;
-				sourceNode = 0;
-			}
+			//	sourceNode = 0;
+			//}
 
 		}
 		else
@@ -222,8 +222,8 @@ void GenericProcessor::setDestNode(GenericProcessor* dn)
 {
 	//	std::cout << "My name is " << getName() << ". Setting dest node." << std::endl;
 
-	if (!isSink())
-	{
+	//if (!isSink())
+	//{
 		//	std::cout << "  I am not a sink." << std::endl;
 
 		if (dn != 0)
@@ -262,13 +262,13 @@ void GenericProcessor::setDestNode(GenericProcessor* dn)
 
 			destNode = 0;
 		}
-	}
-	else
-	{
+	//}
+	//else
+	//{
 		//std::cout << "  I am a sink, I can't have a dest node." << std::endl;
 		//if (dn != 0)
 		//	dn->setSourceNode(this);
-	}
+	//}
 }
 
 
@@ -381,10 +381,10 @@ void GenericProcessor::update()
 	createSpikeChannels();
 	createConfigurationObjects();
 
-	if (this->isSink())
-	{
-		settings.numOutputs = 0;
-	}
+	//if (this->isSink())
+	//{
+	//	settings.numOutputs = 0;
+	//}
 
 	updateSettings(); // allow processors to change custom settings
 

Source/Processors/Merger/Merger.cpp

@@ -64,8 +64,8 @@ void Merger::setMergerSourceNode(GenericProcessor* sn)
     }
     else
     {
-        sourceNodeB = sn;
         std::cout << "Setting source node B." << std::endl;
+        sourceNodeB = sn;
     }
 
     if (sn != nullptr)
@@ -225,30 +225,23 @@ void Merger::updateSettings()
     {
         std::cout << "   Merger source A found." << std::endl;
         addSettingsFromSourceNode(sourceNodeA);
+    } else {
+        mergeEventsA = true;
+        mergeContinuousA = true;
     }
 
     if (sourceNodeB != 0)
     {
         std::cout << "   Merger source B found." << std::endl;
         addSettingsFromSourceNode(sourceNodeB);
+    } else {
+        mergeEventsB = true;
+        mergeContinuousB = true;
     }
 
     if (sourceNodeA == 0 && sourceNodeB == 0)
     {
-
-
 		settings.numOutputs = getNumOutputs();
-
-    /*    for (int i = 0; i < getNumOutputs(); i++)
-        {
-            Channel* ch = new Channel(this, i, HEADSTAGE_CHANNEL);
-            ch->sampleRate = getDefaultSampleRate();
-            ch->bitVolts = getDefaultBitVolts();
-
-            channels.add(ch);
-        }*/
-
-        //generateDefaultChannelNames(settings.outputChannelNames);
     }
 
     std::cout << "Number of merger outputs: " << getNumInputs() << std::endl;
@@ -345,4 +338,4 @@ void Merger::loadCustomParametersFromXml()
 // 	else
 // 		tabB = t;
 
-// }
+// }

Source/Processors/Merger/Merger.h

@@ -77,11 +77,11 @@ class Merger : public GenericProcessor
 
     bool mergeEventsA, mergeContinuousA, mergeEventsB, mergeContinuousB;
 
-private:
-
     GenericProcessor* sourceNodeA;
     GenericProcessor* sourceNodeB;
 
+private:
+
     int activePath;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(Merger);