Revamped and merged Input/Results DockWidgets, Added new "variables" dictionary for each object

4 files changed, 0 insertions, 16 deletions

diff --git a/Graphics.py b/Graphics.py
index 4704142..467b628 100644
--- a/Graphics.py
+++ b/Graphics.py
@@ -340,12 +340,7 @@ class NodeSocket(QtWidgets.QGraphicsItem):
             if self.newLine.source.parent.obj.type not in stm:
                 self.newLine.source.parent.obj.add_connection(0,self.newLine.target.parent.obj)
             if self.newLine.target.parent.obj.type not in stm:
-<<<<<<< HEAD
                 self.newLine.target.parent.obj.add_connection(1,self.newLine.source.parent.obj) # Input stream if flag is 1
-=======
-                self.newLine.target.parent.obj.add_connection(1,self.newLine.source.parent.obj)
-
->>>>>>> 190966e010e321e4df56d40104ec80467a870e53
         elif (self.type =='in') and (item.type == 'op'):
             self.newLine.source = item
             self.newLine.target = self
diff --git a/Undo.dat b/Undo.dat
index 1b7facc..a236cae 100644
--- a/Undo.dat
+++ b/Undo.dat
diff --git a/UnitOperations.py b/UnitOperations.py
index 6da8d1b..92d6f07 100644
--- a/UnitOperations.py
+++ b/UnitOperations.py
@@ -47,14 +47,8 @@ class UnitOperation():
             self.mode = self.modeslist[0]
         else:
             self.mode = mode
-<<<<<<< HEAD
-        # print("Hello hello ", self.mode)
-        #params = self.parameters.copy()
         for i in self.parameters:
             params[i] = self.variables[i]['value']
-=======
-        params = self.parameters.copy()
->>>>>>> 190966e010e321e4df56d40104ec80467a870e53
         params[self.mode] = None
         return params
         
diff --git a/container.py b/container.py
index 17f1b87..6b4bcbe 100644
--- a/container.py
+++ b/container.py
@@ -72,13 +72,8 @@ class Container():
     def addUnitOp(self,obj):
         box = None
         self.obj = obj
-<<<<<<< HEAD
         self.scene = self.graphics.getScene()
         box  = self.graphics.createNodeItem(self.obj, self)
-=======
-        # self.scene = self.graphics.getScene()
-        box  = self.graphics.createNodeItem(self.obj)
->>>>>>> 190966e010e321e4df56d40104ec80467a870e53
         self.scene.addItem(box)
         box.setPos(2500-30, 2500-30)