diff options
| -rw-r--r-- | DockWidgets/DockWidgetMaterialStream.py | 19 | ||||
| -rw-r--r-- | DockWidgets/__pycache__/DockWidget.cpython-37.pyc | bin | 4323 -> 4341 bytes | |||
| -rw-r--r-- | DockWidgets/__pycache__/DockWidgetCompoundSeparator.cpython-37.pyc | bin | 3047 -> 3065 bytes | |||
| -rw-r--r-- | DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc | bin | 4893 -> 4911 bytes | |||
| -rw-r--r-- | DockWidgets/__pycache__/DockWidgetFlash.cpython-37.pyc | bin | 2719 -> 2737 bytes | |||
| -rw-r--r-- | DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc | bin | 8308 -> 8326 bytes | |||
| -rw-r--r-- | DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc | bin | 1983 -> 2001 bytes | |||
| -rw-r--r-- | DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc | bin | 4417 -> 4435 bytes | |||
| -rw-r--r-- | DockWidgets/__pycache__/DockWidgetSplitter.cpython-37.pyc | bin | 2501 -> 2519 bytes | |||
| -rw-r--r-- | OMChem/ConvReactor.py | 3 | ||||
| -rw-r--r-- | OMChem/setup.py | 2 | ||||
| -rw-r--r-- | Streams.py | 4 | ||||
| -rw-r--r-- | requirements.txt | 4 |
13 files changed, 19 insertions, 13 deletions
diff --git a/DockWidgets/DockWidgetMaterialStream.py b/DockWidgets/DockWidgetMaterialStream.py index a661362..de223c3 100644 --- a/DockWidgets/DockWidgetMaterialStream.py +++ b/DockWidgets/DockWidgetMaterialStream.py @@ -52,33 +52,33 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog): self.input_params_list() def input_params_list(self): - try: + try: for c,i in enumerate(self.input_dict): if(i=="x_pc"): noc = len(compound_selected) print(noc) self.x_pclist.clear() - + gp = QGroupBox("Mole Fractions") lay = QGridLayout() for j in range(noc): - l = QLineEdit() + l = QLineEdit() if self.input_dict[i] != '': l.setText(str(self.obj.variables['x_pc']['value'][j])) print('l = ', str(self.obj.variables['x_pc']['value'][j])) - + self.input_dict[i] = "x_pc" lay.addWidget(QLabel(str(compound_selected[j])+":"),j,0, alignment=Qt.AlignLeft) lay.addWidget(l,j,1, alignment=Qt.AlignCenter) - self.x_pclist.append(l) + self.x_pclist.append(l) gp.setLayout(lay) - self.formLayout.addRow(gp) + self.formLayout.addRow(gp) else: print("elseloop") l = QLineEdit() if self.input_dict[i] != None: l.setText(str(self.input_dict[i])) - + lay = QGridLayout() lay.addWidget(QLabel(i+":"),0,0, alignment=Qt.AlignLeft) lay.addWidget(l,0,1, alignment=Qt.AlignCenter) @@ -87,13 +87,13 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog): else: lay.addWidget(QLabel("mol/s"),0,2, alignment=Qt.AlignCenter) self.formLayout.addRow(lay) - self.input_dict[i] = l + self.input_dict[i] = l self.lines = [line.rstrip('\n') for line in open('thermopackage.txt')] for j in self.lines: self.cbTP.addItem(str(j)) self.input_dict['Thermo Package'] = self.cbTP - + except Exception as e: print(e) @@ -133,6 +133,7 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog): break print("param ", self.dict) + self.obj.param_setter(self.dict) self.hide() diff --git a/DockWidgets/__pycache__/DockWidget.cpython-37.pyc b/DockWidgets/__pycache__/DockWidget.cpython-37.pyc Binary files differindex 86045c1..61691e2 100644 --- a/DockWidgets/__pycache__/DockWidget.cpython-37.pyc +++ b/DockWidgets/__pycache__/DockWidget.cpython-37.pyc diff --git a/DockWidgets/__pycache__/DockWidgetCompoundSeparator.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetCompoundSeparator.cpython-37.pyc Binary files differindex 08716b1..03ba8d4 100644 --- a/DockWidgets/__pycache__/DockWidgetCompoundSeparator.cpython-37.pyc +++ b/DockWidgets/__pycache__/DockWidgetCompoundSeparator.cpython-37.pyc diff --git a/DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc Binary files differindex 55be9b4..f538f77 100644 --- a/DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc +++ b/DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc diff --git a/DockWidgets/__pycache__/DockWidgetFlash.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetFlash.cpython-37.pyc Binary files differindex 6828ab1..d8eaa0b 100644 --- a/DockWidgets/__pycache__/DockWidgetFlash.cpython-37.pyc +++ b/DockWidgets/__pycache__/DockWidgetFlash.cpython-37.pyc diff --git a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc Binary files differindex a8c9f80..4f5c2cd 100644 --- a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc +++ b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc diff --git a/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc Binary files differindex 460aa1b..939df5f 100644 --- a/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc +++ b/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc diff --git a/DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc Binary files differindex 13f8328..d057db2 100644 --- a/DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc +++ b/DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc diff --git a/DockWidgets/__pycache__/DockWidgetSplitter.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetSplitter.cpython-37.pyc Binary files differindex fea33a2..7cc065b 100644 --- a/DockWidgets/__pycache__/DockWidgetSplitter.cpython-37.pyc +++ b/DockWidgets/__pycache__/DockWidgetSplitter.cpython-37.pyc diff --git a/OMChem/ConvReactor.py b/OMChem/ConvReactor.py index 9061294..ccdf524 100644 --- a/OMChem/ConvReactor.py +++ b/OMChem/ConvReactor.py @@ -12,7 +12,8 @@ class ConvReactor(): self.OM_data_eqn = '' self.OM_data_init = '' self.InputStms = [] - self.OutputStms = [] self.Tdef = str(Tdef) + self.OutputStms = [] + self.Tdef = str(Tdef) self.type = 'ConvReactor' self.EngStms = EngStms(name="EngStm") diff --git a/OMChem/setup.py b/OMChem/setup.py index 765aa04..037da1c 100644 --- a/OMChem/setup.py +++ b/OMChem/setup.py @@ -31,7 +31,7 @@ def generateIDL(): warningOrError(errorOnFailure, "Path not found: %s" % idl) return - if 0<>call(["omniidl","-bpython","-Wbglobal=_OMCIDL","-Wbpackage=OMPythonIDL",idl]): + if 0 is not call(["omniidl","-bpython","-Wbglobal=_OMCIDL","-Wbpackage=OMPythonIDL",idl]): warningOrError(errorOnFailure, "omniidl command failed") return print("Generated OMPythonIDL files") @@ -114,9 +114,9 @@ class MaterialStream(): return dict def param_setter(self,dict): - self.variables['x_pc']['value'] = dict['x_pc'].split(",") - self.thermo_package = dict['Thermo package'] + print('xpc is :' + str(self.variables['x_pc']['value'])) + self.thermo_package = dict['Thermo Package'] self.variables['F_p[1]']['value'] = dict['MolFlow'] self.variables[self.mode1]['value'] = dict[self.mode1] self.variables[self.mode2]['value'] = dict[self.mode2] diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..14e451a --- /dev/null +++ b/requirements.txt @@ -0,0 +1,4 @@ +pyqtgraph==0.10.0 +pandas==1.0.1 +numpy==1.17.3 +PyQt5==5.15.1 |