diff options
| -rw-r--r-- | DockWidgets/DockWidgetDistillationColumn.py | 11 | ||||
| -rw-r--r-- | DockWidgets/DockWidgetDistillationColumn.ui | 381 | ||||
| -rw-r--r-- | DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc | bin | 5219 -> 5603 bytes | |||
| -rw-r--r-- | DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc | bin | 8254 -> 8254 bytes | |||
| -rw-r--r-- | Undo.dat | bin | 0 -> 1788 bytes |
5 files changed, 207 insertions, 185 deletions
diff --git a/DockWidgets/DockWidgetDistillationColumn.py b/DockWidgets/DockWidgetDistillationColumn.py index dea2391..e93ed47 100644 --- a/DockWidgets/DockWidgetDistillationColumn.py +++ b/DockWidgets/DockWidgetDistillationColumn.py @@ -102,6 +102,13 @@ class DockWidgetDistillationColumn(QDockWidget,ui_dialog): self.input_dict.append(self.cb4) self.input_dict.append(self.le8) + self.lines = [line.rstrip('\n') for line in open('thermopackage.txt')] + for j in self.lines: + self.cbTP.addItem(str(j)) + self.cbTP.setCurrentText(self.obj.variables['thermo_package']['value']) + + self.input_dict.append(self.cbTP) + # self.input_dict = [self.le1, self.le2, self.le3, self.cb5, self.le5, self.cb1, self.cb2, self.le6, self.le7, self.cb3, self.cb4, self.le8] except Exception as e: @@ -154,7 +161,9 @@ class DockWidgetDistillationColumn(QDockWidget,ui_dialog): print(temp+8) self.dict.append(int(self.input_dict[temp+9].text())) print(temp+9) - + self.dict.append(self.input_dict[temp+10].currentText()) + print(temp + 10) + print("param ", self.dict) self.obj.param_setter(self.dict) self.hide() diff --git a/DockWidgets/DockWidgetDistillationColumn.ui b/DockWidgets/DockWidgetDistillationColumn.ui index 7e63254..95f258b 100644 --- a/DockWidgets/DockWidgetDistillationColumn.ui +++ b/DockWidgets/DockWidgetDistillationColumn.ui @@ -9,7 +9,7 @@ <rect> <x>0</x> <y>0</y> - <width>392</width> + <width>382</width> <height>700</height> </rect> </property> @@ -31,10 +31,10 @@ <widget class="QTabWidget" name="tabWidget"> <property name="geometry"> <rect> - <x>10</x> + <x>0</x> <y>30</y> - <width>361</width> - <height>621</height> + <width>351</width> + <height>451</height> </rect> </property> <property name="autoFillBackground"> @@ -47,194 +47,207 @@ <attribute name="title"> <string>Input Data</string> </attribute> - <widget class="QGroupBox" name="groupBox_2"> - <property name="geometry"> - <rect> - <x>10</x> - <y>10</y> - <width>331</width> - <height>204</height> - </rect> - </property> - <property name="title"> - <string>Parameter Selection</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_10"> - <property name="sizeConstraint"> - <enum>QLayout::SetFixedSize</enum> - </property> - <item> - <widget class="QTabWidget" name="tabWidget_5"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Parameter Selection</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="sizeConstraint"> + <enum>QLayout::SetFixedSize</enum> </property> - <property name="currentIndex"> - <number>0</number> - </property> - <widget class="QWidget" name="tab1"> - <attribute name="title"> - <string>General</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_6"> - <item> - <layout class="QGridLayout" name="lay1"> - <property name="sizeConstraint"> - <enum>QLayout::SetDefaultConstraint</enum> - </property> - <property name="verticalSpacing"> - <number>0</number> - </property> - </layout> - </item> - </layout> - </widget> - <widget class="QWidget" name="tab2"> - <attribute name="title"> - <string>Condenser</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_5"> - <item> - <layout class="QGridLayout" name="lay2"> - <item row="3" column="0"> - <widget class="QLabel" name="l7"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="l4"> - <property name="text"> - <string>TextLabel</string> + <item> + <widget class="QTabWidget" name="tabWidget_5"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="currentIndex"> + <number>0</number> + </property> + <widget class="QWidget" name="tab1"> + <attribute name="title"> + <string>General</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_6"> + <item> + <layout class="QGridLayout" name="lay1"> + <property name="sizeConstraint"> + <enum>QLayout::SetDefaultConstraint</enum> </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="l5"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="QComboBox" name="cb1"/> - </item> - <item row="1" column="2"> - <widget class="QLineEdit" name="le5"/> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="l6"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <item row="3" column="2"> - <widget class="QComboBox" name="cb2"> - <property name="enabled"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="0" column="3"> - <widget class="QLabel" name="u1"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="QLabel" name="u2"> - <property name="text"> - <string>TextLabel</string> + <property name="verticalSpacing"> + <number>0</number> </property> - </widget> - </item> - <item row="4" column="2"> - <widget class="QLineEdit" name="le6"/> - </item> - <item row="0" column="2"> - <widget class="QComboBox" name="cb5"/> + </layout> </item> </layout> - </item> - </layout> - </widget> - <widget class="QWidget" name="tab3"> - <attribute name="title"> - <string>Reboiler</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_7"> - <item> - <layout class="QGridLayout" name="lay3"> - <item row="4" column="0"> - <widget class="QLabel" name="l9"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="l8"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <item row="5" column="0"> - <widget class="QLabel" name="l10"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> + </widget> + <widget class="QWidget" name="tab2"> + <attribute name="title"> + <string>Condenser</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <item> + <layout class="QGridLayout" name="lay2"> + <item row="3" column="0"> + <widget class="QLabel" name="l7"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="l4"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="l5"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QComboBox" name="cb1"/> + </item> + <item row="1" column="2"> + <widget class="QLineEdit" name="le5"/> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="l6"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item row="3" column="2"> + <widget class="QComboBox" name="cb2"> + <property name="enabled"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="QLabel" name="u1"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="QLabel" name="u2"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item row="4" column="2"> + <widget class="QLineEdit" name="le6"/> + </item> + <item row="0" column="2"> + <widget class="QComboBox" name="cb5"/> + </item> + </layout> </item> - <item row="5" column="2"> - <widget class="QComboBox" name="cb4"> - <property name="enabled"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="3" column="2"> - <widget class="QLineEdit" name="le7"/> - </item> - <item row="4" column="2"> - <widget class="QComboBox" name="cb3"/> - </item> - <item row="6" column="2"> - <widget class="QLineEdit" name="le8"/> - </item> - <item row="3" column="3"> - <widget class="QLabel" name="u3"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> + </layout> + </widget> + <widget class="QWidget" name="tab3"> + <attribute name="title"> + <string>Reboiler</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_7"> + <item> + <layout class="QGridLayout" name="lay3"> + <item row="4" column="0"> + <widget class="QLabel" name="l9"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="l8"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="l10"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item row="5" column="2"> + <widget class="QComboBox" name="cb4"> + <property name="enabled"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="3" column="2"> + <widget class="QLineEdit" name="le7"/> + </item> + <item row="4" column="2"> + <widget class="QComboBox" name="cb3"/> + </item> + <item row="6" column="2"> + <widget class="QLineEdit" name="le8"/> + </item> + <item row="3" column="3"> + <widget class="QLabel" name="u3"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + </layout> </item> </layout> - </item> - </layout> - </widget> - </widget> - </item> - </layout> - </widget> - <widget class="QPushButton" name="pushButton_2"> - <property name="geometry"> - <rect> - <x>10</x> - <y>270</y> - <width>331</width> - <height>21</height> - </rect> - </property> - <property name="text"> - <string>Submit</string> - </property> - </widget> + </widget> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string/> + </property> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Thermo Package</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="cbTP"/> + </item> + </layout> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_2"> + <property name="text"> + <string>Submit</string> + </property> + </widget> + </item> + </layout> </widget> <widget class="QWidget" name="tab_2"> <attribute name="title"> diff --git a/DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc Binary files differindex af05fb7..900b9c6 100644 --- a/DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc +++ b/DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc diff --git a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc Binary files differBinary files differindex f2c5b98..395ced6 100644 --- a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc +++ b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc |