diff options
Diffstat (limited to 'UnitOperations.py')
| -rw-r--r-- | UnitOperations.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/UnitOperations.py b/UnitOperations.py index b57ded5..6da8d1b 100644 --- a/UnitOperations.py +++ b/UnitOperations.py @@ -10,6 +10,7 @@ from PyQt5.QtGui import * import PyQt5.QtCore as QtCore import PyQt5.QtWidgets as QtWidgets from component_selector import * +from container import * class UnitOperation(): counter = 1 @@ -46,10 +47,14 @@ 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 @@ -66,8 +71,8 @@ class UnitOperation(): def add_connection(self,flag,UnitOpr): if flag==1: # Input stream if flag is 1 - self.InputStms.append(UnitOpr) print("INPUT CONNECTION") + self.InputStms.append(UnitOpr) else : print("OUTPUT CONNECTION") self.OutputStms.append(UnitOpr) @@ -80,7 +85,7 @@ class UnitOperation(): if(self.ThermoPackReq): if len(self.extra)>1: - for i in range(self.extra): + for i in range(len(self.extra)): latest = '' for j in range(self.extra[i]): if self.extra[i][j]!='.': |