summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DockWidgets/__pycache__/DockWidget.cpython-37.pycbin0 -> 6104 bytes
-rw-r--r--DockWidgets/__pycache__/DockWidgetCompoundSeparator.cpython-37.pycbin0 -> 3166 bytes
-rw-r--r--DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pycbin0 -> 4183 bytes
-rw-r--r--DockWidgets/__pycache__/DockWidgetFlash.cpython-37.pycbin0 -> 2892 bytes
-rw-r--r--DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pycbin0 -> 8736 bytes
-rw-r--r--DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pycbin0 -> 2209 bytes
-rw-r--r--DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pycbin0 -> 3361 bytes
-rw-r--r--DockWidgets/__pycache__/DockWidgetSplitter.cpython-37.pycbin0 -> 2743 bytes
-rw-r--r--Graphics.py22
-rw-r--r--Streams.py2
-rw-r--r--Undo.datbin4784 -> 21115 bytes
-rw-r--r--container.py21
-rw-r--r--mainApp.py4
13 files changed, 27 insertions, 22 deletions
diff --git a/DockWidgets/__pycache__/DockWidget.cpython-37.pyc b/DockWidgets/__pycache__/DockWidget.cpython-37.pyc
new file mode 100644
index 0000000..a1b0bee
--- /dev/null
+++ b/DockWidgets/__pycache__/DockWidget.cpython-37.pyc
Binary files differ
diff --git a/DockWidgets/__pycache__/DockWidgetCompoundSeparator.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetCompoundSeparator.cpython-37.pyc
new file mode 100644
index 0000000..6051144
--- /dev/null
+++ b/DockWidgets/__pycache__/DockWidgetCompoundSeparator.cpython-37.pyc
Binary files differ
diff --git a/DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc
new file mode 100644
index 0000000..556cad1
--- /dev/null
+++ b/DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc
Binary files differ
diff --git a/DockWidgets/__pycache__/DockWidgetFlash.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetFlash.cpython-37.pyc
new file mode 100644
index 0000000..ce04405
--- /dev/null
+++ b/DockWidgets/__pycache__/DockWidgetFlash.cpython-37.pyc
Binary files differ
diff --git a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc
new file mode 100644
index 0000000..613d414
--- /dev/null
+++ b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc
Binary files differ
diff --git a/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc
new file mode 100644
index 0000000..84a11a1
--- /dev/null
+++ b/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc
Binary files differ
diff --git a/DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc
new file mode 100644
index 0000000..2d498d6
--- /dev/null
+++ b/DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc
Binary files differ
diff --git a/DockWidgets/__pycache__/DockWidgetSplitter.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetSplitter.cpython-37.pyc
new file mode 100644
index 0000000..1bf5c63
--- /dev/null
+++ b/DockWidgets/__pycache__/DockWidgetSplitter.cpython-37.pyc
Binary files differ
diff --git a/Graphics.py b/Graphics.py
index 861b2f0..9a8c575 100644
--- a/Graphics.py
+++ b/Graphics.py
@@ -141,7 +141,7 @@ class NodeLine(QtWidgets.QGraphicsPathItem):
self.setBrush(QtGui.QColor(0,70,70,120))
self.pen = QtGui.QPen()
self.pen.setStyle(QtCore.Qt.SolidLine)
- self.pen.setWidth(1)
+ self.pen.setWidth(2)
self.pen.setColor(QtGui.QColor(0,70,70,220))
self.setPen(self.pen)
@@ -158,8 +158,8 @@ class NodeLine(QtWidgets.QGraphicsPathItem):
path.cubicTo(ctrl1_1, ctrl2_1, pt1)
if abs(self.pointB.x()-midptx) > 150:
- ctrl1_2 = QtCore.QPointF(midptx, self.pointB.y())
- ctrl2_2 = QtCore.QPointF(midptx, self.pointB.y())
+ ctrl1_2 = QtCore.QPointF(midptx, self.pointA.y())
+ ctrl2_2 = QtCore.QPointF(midptx, self.pointA.y())
pt2 = QtCore.QPointF(midptx , self.pointA.y()+100)
path.cubicTo(ctrl1_2, ctrl2_2, pt2)
path.moveTo(pt2)
@@ -170,8 +170,8 @@ class NodeLine(QtWidgets.QGraphicsPathItem):
path.cubicTo(ctrl1_3, ctrl2_3, pt3)
path.moveTo(pt3)
- ctrl1_4 = QtCore.QPointF(self.pointB.x()-13, max(self.pointB.y(), self.pointA.y())-(abs(self.pointA.y()-self.pointB.y())/2))
- ctrl2_4 = QtCore.QPointF(self.pointB.x()-13, max(self.pointB.y(), self.pointA.y())-(abs(self.pointA.y()-self.pointB.y())/2))
+ ctrl1_4 = QtCore.QPointF(self.pointB.x()-13, self.pointA.y()+100)
+ ctrl2_4 = QtCore.QPointF(self.pointB.x()-13, self.pointA.y()+100)
pt4 = QtCore.QPointF(self.pointB.x()-13, self.pointB.y())
path.cubicTo(ctrl1_4, ctrl2_4, pt4)
path.moveTo(pt4)
@@ -185,8 +185,8 @@ class NodeLine(QtWidgets.QGraphicsPathItem):
self.setPath(path)
return
else:
- ctrl1_2 = QtCore.QPointF(midptx, self.pointB.y())
- ctrl2_2 = QtCore.QPointF(midptx, self.pointB.y())
+ ctrl1_2 = QtCore.QPointF(midptx, self.pointA.y())
+ ctrl2_2 = QtCore.QPointF(midptx, self.pointA.y())
pt2 = QtCore.QPointF(midptx , max(self.pointB.y(), self.pointA.y())-(abs(self.pointA.y()-self.pointB.y())/2))
path.cubicTo(ctrl1_2, ctrl2_2, pt2)
path.moveTo(pt2)
@@ -222,8 +222,8 @@ class NodeLine(QtWidgets.QGraphicsPathItem):
path.cubicTo(ctrl1_1, ctrl2_1, pt1)
path.moveTo(pt1)
- ctrl1_2 = QtCore.QPointF(midptx, self.pointB.y())
- ctrl2_2 = QtCore.QPointF(midptx, self.pointB.y())
+ ctrl1_2 = QtCore.QPointF(midptx, self.pointA.y())
+ ctrl2_2 = QtCore.QPointF(midptx, self.pointA.y())
pt2 = QtCore.QPointF(midptx , self.pointB.y())
path.cubicTo(ctrl1_2, ctrl2_2, pt2)
path.moveTo(pt2)
@@ -544,8 +544,8 @@ class NodeItem(QtWidgets.QGraphicsItem):
painter.drawRect(QtCore.QRectF(self.rect))
else:
painter.setPen(self.pen)
- # painter.drawPixmap(self.rect,self.pic)
- painter.drawPixmap(self.rect, self.pic.pixmap(QSize(1000,1000)))
+ painter.drawPixmap(self.rect,self.pic)
+ # painter.drawPixmap(self.rect, self.pic.pixmap(QSize(1000,1000)))
def initialize_sockets(self,type):
print("inside initialization")
diff --git a/Streams.py b/Streams.py
index 835abe5..81586f1 100644
--- a/Streams.py
+++ b/Streams.py
@@ -1,4 +1,4 @@
-from OMPython import OMCSession
+# from OMPython import OMCSession
from PyQt5.QtCore import *
import json
import sys
diff --git a/Undo.dat b/Undo.dat
index f20d64d..e0d669c 100644
--- a/Undo.dat
+++ b/Undo.dat
Binary files differ
diff --git a/container.py b/container.py
index 14e3bf0..8030ebf 100644
--- a/container.py
+++ b/container.py
@@ -93,6 +93,7 @@ class Container():
'''
def delete(self,l):
for item in l:
+ print('deleted objects ', item)
self.scene.removeItem(item)
for i in dock_widget_lst:
if i.name == item.name:
@@ -102,22 +103,26 @@ class Container():
for i in dock_widget_lst:
print(i.name)
print("delete ", dock_widget_lst)
- if hasattr(item,'Input'):
+ if hasattr(item,'input'):
+ print("In input ")
+ print(item.input)
for x in item.input:
if x.new_line:
self.scene.removeItem(x.new_line)
del x.new_line
- if x.otherLine:
- self.scene.removeItem(x.otherLine)
- del x.otherLine
- if hasattr(item,'Output'):
+ if x.other_line:
+ self.scene.removeItem(x.other_line)
+ del x.other_line
+ if hasattr(item,'output'):
+ print("in output ")
+ print(item.output)
for x in item.output:
if x.new_line:
self.scene.removeItem(x.new_line)
del x.new_line
- if x.otherLine:
- self.scene.removeItem(x.otherLine)
- del x.otherLine
+ if x.other_line:
+ self.scene.removeItem(x.other_line)
+ del x.other_line
if hasattr(item,'obj'):
self.unit_operations.remove(item.obj)
for k in list(self.conn):
diff --git a/mainApp.py b/mainApp.py
index 5de9baa..e49d4e2 100644
--- a/mainApp.py
+++ b/mainApp.py
@@ -238,8 +238,8 @@ class MainApp(QMainWindow,ui):
try:
if event.key() == QtCore.Qt.Key_Delete:
l=self.scene.selectedItems()
- for i in l:
- eval(i.type).counter -= 1
+ # for i in l:
+ # eval(i.type).counter -= 1
self.container.delete(l)
except Exception as e:
print(e)
generated by cgit (git 2.34.1) at 2024-12-19 18:20:20 +0000