From c6321d3dbdd5cebf66fe8470d9c0a58ed63e4721 Mon Sep 17 00:00:00 2001
From: pravindalve
Date: Sun, 18 Apr 2021 21:09:36 +0530
Subject: Fixes for issue #16

---
 Graphics.py               |   2 +-
 Undo.dat                  | Bin 55552 -> 56752 bytes
 UnitOperations.py         |  14 +++----
 icon/CentrifugalPump.png  | Bin 0 -> 1348 bytes
 icon/Pump.png             | Bin 1348 -> 0 bytes
 icons/CentrifugalPump.png | Bin 0 -> 1620 bytes
 icons/Pump.png            | Bin 1620 -> 0 bytes
 main.ui                   |   8 ++--
 mainApp.py                |   2 +-
 svg/Centrifugal Pump.svg  | 104 ----------------------------------------------
 svg/CentrifugalPump.svg   | 104 ++++++++++++++++++++++++++++++++++++++++++++++
 11 files changed, 115 insertions(+), 119 deletions(-)
 create mode 100644 icon/CentrifugalPump.png
 delete mode 100644 icon/Pump.png
 create mode 100644 icons/CentrifugalPump.png
 delete mode 100644 icons/Pump.png
 delete mode 100644 svg/Centrifugal Pump.svg
 create mode 100644 svg/CentrifugalPump.svg

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
Binary files a/Undo.dat and b/Undo.dat differ
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/CentrifugalPump.png b/icon/CentrifugalPump.png
new file mode 100644
index 0000000..daf804b
Binary files /dev/null and b/icon/CentrifugalPump.png differ
diff --git a/icon/Pump.png b/icon/Pump.png
deleted file mode 100644
index daf804b..0000000
Binary files a/icon/Pump.png and /dev/null differ
diff --git a/icons/CentrifugalPump.png b/icons/CentrifugalPump.png
new file mode 100644
index 0000000..a2d3e8e
Binary files /dev/null and b/icons/CentrifugalPump.png differ
diff --git a/icons/Pump.png b/icons/Pump.png
deleted file mode 100644
index a2d3e8e..0000000
Binary files a/icons/Pump.png and /dev/null differ
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/Centrifugal Pump.svg
deleted file mode 100644
index 5b60256..0000000
--- a/svg/Centrifugal Pump.svg	
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="5.8764515mm"
-   height="5.1060538mm"
-   viewBox="0 0 5.8764515 5.1060538"
-   version="1.1"
-   id="svg919"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="Centrifugal Pump.svg">
-  <defs
-     id="defs913" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="11.105106"
-     inkscape:cy="9.6492281"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1304"
-     inkscape:window-height="745"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata916">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-102.89511,-146.2803)">
-    <g
-       id="use23667"
-       transform="matrix(0.26458333,0,0,0.26458333,87.26164,148.76091)">
-      <desc
-         id="desc937">Centrifugal pump</desc>
-      <title
-         id="title939">Centrifugal pump</title>
-      <path
-         d="m 63.461437,0.93302941 c 0,-4.83160421 3.917761,-8.74995261 8.751431,-8.74995261 4.831585,0 8.749327,3.9183484 8.749327,8.74995261 0,4.83440929 -3.917742,8.75275769 -8.749327,8.75275769 -4.83367,0 -8.751431,-3.9183484 -8.751431,-8.75275769 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.66862381"
-         id="path941"
-         inkscape:connector-curvature="0" />
-      <g
-         style="stroke-width:0.96060389"
-         id="g945"
-         transform="matrix(0.69599386,0,0,0.6960967,-60.599463,-916.20963)">
-        <path
-           d="m 178.25,1317.551 c 0,-6.942 5.629,-12.571 12.574,-12.571 6.942,0 12.571,5.629 12.571,12.571 0,6.945 -5.629,12.574 -12.571,12.574 -6.945,0 -12.574,-5.629 -12.574,-12.574 z m -6.285,0 h 18.859 m 0,-12.571 h 12.571"
-           style="fill:none;stroke:#000000;stroke-width:0.68082803;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           id="path943"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         style="stroke-width:0.96060389"
-         id="g949"
-         transform="matrix(0.69599386,0,0,0.6960967,-60.599463,-916.20963)">
-        <path
-           d="m 189.406,1316.133 1.418,1.418 -1.418,1.418 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.68082803;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           id="path947"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         style="stroke-width:0.96060389"
-         id="g953"
-         transform="matrix(0.69599386,0,0,0.6960967,-60.599463,-916.20963)">
-        <path
-           d="m 201.977,1303.563 1.418,1.417 -1.418,1.418 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.68082803;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           id="path951"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/svg/CentrifugalPump.svg b/svg/CentrifugalPump.svg
new file mode 100644
index 0000000..5b60256
--- /dev/null
+++ b/svg/CentrifugalPump.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="5.8764515mm"
+   height="5.1060538mm"
+   viewBox="0 0 5.8764515 5.1060538"
+   version="1.1"
+   id="svg919"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="Centrifugal Pump.svg">
+  <defs
+     id="defs913" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="11.105106"
+     inkscape:cy="9.6492281"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1304"
+     inkscape:window-height="745"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata916">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-102.89511,-146.2803)">
+    <g
+       id="use23667"
+       transform="matrix(0.26458333,0,0,0.26458333,87.26164,148.76091)">
+      <desc
+         id="desc937">Centrifugal pump</desc>
+      <title
+         id="title939">Centrifugal pump</title>
+      <path
+         d="m 63.461437,0.93302941 c 0,-4.83160421 3.917761,-8.74995261 8.751431,-8.74995261 4.831585,0 8.749327,3.9183484 8.749327,8.74995261 0,4.83440929 -3.917742,8.75275769 -8.749327,8.75275769 -4.83367,0 -8.751431,-3.9183484 -8.751431,-8.75275769 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.66862381"
+         id="path941"
+         inkscape:connector-curvature="0" />
+      <g
+         style="stroke-width:0.96060389"
+         id="g945"
+         transform="matrix(0.69599386,0,0,0.6960967,-60.599463,-916.20963)">
+        <path
+           d="m 178.25,1317.551 c 0,-6.942 5.629,-12.571 12.574,-12.571 6.942,0 12.571,5.629 12.571,12.571 0,6.945 -5.629,12.574 -12.571,12.574 -6.945,0 -12.574,-5.629 -12.574,-12.574 z m -6.285,0 h 18.859 m 0,-12.571 h 12.571"
+           style="fill:none;stroke:#000000;stroke-width:0.68082803;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+           id="path943"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="stroke-width:0.96060389"
+         id="g949"
+         transform="matrix(0.69599386,0,0,0.6960967,-60.599463,-916.20963)">
+        <path
+           d="m 189.406,1316.133 1.418,1.418 -1.418,1.418 z"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.68082803;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+           id="path947"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="stroke-width:0.96060389"
+         id="g953"
+         transform="matrix(0.69599386,0,0,0.6960967,-60.599463,-916.20963)">
+        <path
+           d="m 201.977,1303.563 1.418,1.417 -1.418,1.418 z"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.68082803;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+           id="path951"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
-- 
cgit