Added DockWidgetCompressorExpander

6 files changed, 14 insertions, 7 deletions

diff --git a/DockWidgets/DockWidget.ui b/DockWidgets/DockWidget.ui
index 5851d71..ba6dc52 100644
--- a/DockWidgets/DockWidget.ui
+++ b/DockWidgets/DockWidget.ui
@@ -101,7 +101,7 @@
        <x>10</x>
        <y>100</y>
        <width>331</width>
-       <height>321</height>
+       <height>271</height>
       </rect>
      </property>
      <property name="title">
@@ -117,7 +117,7 @@
      <property name="geometry">
       <rect>
        <x>10</x>
-       <y>430</y>
+       <y>380</y>
        <width>331</width>
        <height>21</height>
       </rect>
diff --git a/DockWidgets/DockWidgetMaterialStream.py b/DockWidgets/DockWidgetMaterialStream.py
index 915bea3..ee57902 100644
--- a/DockWidgets/DockWidgetMaterialStream.py
+++ b/DockWidgets/DockWidgetMaterialStream.py
@@ -36,9 +36,9 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog):
         self.lTreeWidget.setHeaderItem(header)
         self.vTreeWidget.setHeaderItem(header)       
 
-        self.mTreeWidget.itemClicked.connect(lambda : self.printer(self.mTreeWidget.currentItem()))
-        self.lTreeWidget.itemClicked.connect(lambda : self.printer(self.lTreeWidget.currentItem()))
-        self.vTreeWidget.itemClicked.connect(lambda : self.printer(self.vTreeWidget.currentItem()))
+        # self.mTreeWidget.itemClicked.connect(lambda : self.printer(self.mTreeWidget.currentItem()))
+        # self.lTreeWidget.itemClicked.connect(lambda : self.printer(self.lTreeWidget.currentItem()))
+        # self.vTreeWidget.itemClicked.connect(lambda : self.printer(self.vTreeWidget.currentItem()))
 
     # input data tab
     def modes(self):
diff --git a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc
index 16511b3..ddd011b 100644
--- a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc
+++ b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc
diff --git a/Graphics.py b/Graphics.py
index 4b5a3e8..ba034fb 100644
--- a/Graphics.py
+++ b/Graphics.py
@@ -23,6 +23,7 @@ from DockWidgets.DockWidgetMixer import *
 from DockWidgets.DockWidgetSplitter import *
 from DockWidgets.DockWidgetFlash import *
 from DockWidgets.DockWidgetCompoundSeparator import *
+from DockWidgets.DockWidgetCompressorExpander import *
 
 import datetime
 
@@ -478,6 +479,8 @@ class NodeItem(QtWidgets.QGraphicsItem):
             self.dock_widget = eval("DockWidget"+self.obj.type)(self.obj.name,self.obj.type,self.obj,self.container)
         elif self.obj.type in stm:
             self.dock_widget = eval("DockWidget"+self.obj.type)(self.obj.name,self.obj.type,self.obj,self.container)
+        elif self.obj.type == "AdiabaticCompressor" or self.obj.type == "AdiabaticExpander":
+            self.dock_widget = eval("DockWidgetCompressorExpander")(self.obj.name,self.obj.type,self.obj,self.container)
         else:
             self.dock_widget = DockWidget(self.obj.name,self.obj.type,self.obj,self.container)
         dock_widget_lst.append(self.dock_widget)
diff --git a/Undo.dat b/Undo.dat
index 7d03ca8..b05cceb 100644
--- a/Undo.dat
+++ b/Undo.dat
diff --git a/UnitOperations.py b/UnitOperations.py
index 4d3a92d..1c98f86 100644
--- a/UnitOperations.py
+++ b/UnitOperations.py
@@ -55,7 +55,11 @@ class UnitOperation():
     def param_setter(self,params):
         print("param_setter ", params)
         for k,v in params.items():
-            if k != self.mode:
+            print(k, v)
+            if k == 'Thermo Package':
+                self.thermo_package = v
+                print('haha')
+            elif k != self.mode:
                 self.k = v
                 self.variables[k]['value'] = v
             else:
@@ -577,7 +581,7 @@ class AdiabaticCompressor(UnitOperation):
         self.parameters = ['Eff']
         type(self).counter += 1
         self.variables = {
-            'Pdel'  : {'name':'Pressure Drop',          'value':0,       'unit':'Pa'},
+            'Pdel'  : {'name':'Pressure Increase',          'value':0,       'unit':'Pa'},
             'Tdel'  : {'name':'Temperature Increase',   'value':0,       'unit':'K'},
             'Pout'  : {'name':'Outlet Pressure',        'value':101325,  'unit':'Pa'},
             'Tout'  : {'name':'Outlet Temperature',     'value':298.15,  'unit':'K'},