Fixes for issue #16

8 files changed, 11 insertions, 15 deletions

diff --git a/Graphics.py b/Graphics.py
index 950b1fc..a9a6d23 100644
--- a/Graphics.py
+++ b/Graphics.py
@@ -538,7 +538,7 @@ class NodeItem(QtWidgets.QGraphicsItem):
             input = [NodeSocket(QtCore.QRect(3.5, (self.rect.height()*x/(self.nin+1))-2,4,4), self, 'in', x) for x in range(1,self.nin+1) ]
             output = [NodeSocket(QtCore.QRect(self.rect.width()-8.0,(self.rect.height()*x/(self.nop+1))-2,4,4), self, 'op', x) for x in range(1,self.nop+1)]
             return input,output
-        elif(self.type=="Pump"):
+        elif(self.type=="CentrifugalPump"):
             input = [NodeSocket(QtCore.QRect(-2.5,(self.rect.height()*x/(self.nin+1))-7, 4,4), self, 'in', x) for x in range(1,self.nin+1) ]
             output = [NodeSocket(QtCore.QRect(self.rect.width()-2.5,-1.5,4,4), self, 'op', x) for x in range(1,self.nop+1)]
             return input,output
diff --git a/Undo.dat b/Undo.dat
index 314d594..bf52137 100644
--- a/Undo.dat
+++ b/Undo.dat
diff --git a/UnitOperations.py b/UnitOperations.py
index ba7a763..ddac8b1 100644
--- a/UnitOperations.py
+++ b/UnitOperations.py
@@ -487,9 +487,7 @@ class Flash(UnitOperation):
         self.extra = ['Flash']
         self.for_naming = ['Flash']
         self.no_of_inputs = 1 
-        self.no_of_outputs = 2  
-        self.input_stms = []
-        self.output_stms = []
+        self.no_of_outputs = 2
         self.count = Flash.counter
         self.thermo_pack_req = True
         self.parameters = ['BTdef', 'Tdef', 'BPdef', 'Pdef']
@@ -523,13 +521,11 @@ class Flash(UnitOperation):
 
         return self.OM_data_eqn
 
-class Pump(UnitOperation):
-    def __init__(self,name='Pump'):
+class CentrifugalPump(UnitOperation):
+    def __init__(self,name='CentrifugalPump'):
         UnitOperation.__init__(self)
-        self.name = name + str(Pump.counter) 
-        self.type = 'Pump'
-        self.input_stms = None
-        self.output_stms = None
+        self.name = name + str(CentrifugalPump.counter)
+        self.type = 'CentrifugalPump'
         self.modes_list = ['Pdel', 'Pout', 'Q']     #"enFlo"
         self.parameters = ['Eff']
 
diff --git a/icon/Pump.png b/icon/CentrifugalPump.png
index daf804b..daf804b 100644
--- a/icon/Pump.png
+++ b/icon/CentrifugalPump.png
diff --git a/icons/Pump.png b/icons/CentrifugalPump.png
index a2d3e8e..a2d3e8e 100644
--- a/icons/Pump.png
+++ b/icons/CentrifugalPump.png
diff --git a/main.ui b/main.ui
index 06367ea..b671aa5 100644
--- a/main.ui
+++ b/main.ui
@@ -148,7 +148,7 @@
      <x>0</x>
      <y>0</y>
      <width>1068</width>
-     <height>21</height>
+     <height>18</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -274,8 +274,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>221</width>
-          <height>956</height>
+          <width>225</width>
+          <height>914</height>
          </rect>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -1736,7 +1736,7 @@
            </property>
            <property name="icon">
             <iconset>
-             <normaloff>icons/Pump.png</normaloff>icons/Pump.png</iconset>
+             <normaloff>icons/CentrifugalPump.png</normaloff>icons/CentrifugalPump.png</iconset>
            </property>
            <property name="iconSize">
             <size>
diff --git a/mainApp.py b/mainApp.py
index 29db874..1d8262c 100644
--- a/mainApp.py
+++ b/mainApp.py
@@ -99,7 +99,7 @@ class MainApp(QMainWindow,ui):
     def button_handler(self):
         self.pushButton.clicked.connect(partial(self.component,'MaterialStream'))
         self.pushButton_7.clicked.connect(partial(self.component,'Mixer'))
-        self.pushButton_14.clicked.connect(partial(self.component,'Pump'))
+        self.pushButton_14.clicked.connect(partial(self.component,'CentrifugalPump'))
         self.pushButton_26.clicked.connect(partial(self.component,'DistillationColumn'))
         self.pushButton_18.clicked.connect(partial(self.component,'ShortcutColumn'))
         self.pushButton_11.clicked.connect(partial(self.component,'Heater'))
diff --git a/svg/Centrifugal Pump.svg b/svg/CentrifugalPump.svg
index 5b60256..5b60256 100644
--- a/svg/Centrifugal Pump.svg
+++ b/svg/CentrifugalPump.svg