diff options
Diffstat (limited to 'DockWidgets')
| -rw-r--r-- | DockWidgets/DockWidget.py | 16 | ||||
| -rw-r--r-- | DockWidgets/DockWidgetMaterialStream.py | 19 | ||||
| -rw-r--r-- | DockWidgets/__pycache__/DockWidget.cpython-37.pyc | bin | 4932 -> 4724 bytes | |||
| -rw-r--r-- | DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc | bin | 9254 -> 9411 bytes |
4 files changed, 19 insertions, 16 deletions
diff --git a/DockWidgets/DockWidget.py b/DockWidgets/DockWidget.py index 71e9624..bb8ddf5 100644 --- a/DockWidgets/DockWidget.py +++ b/DockWidgets/DockWidget.py @@ -57,7 +57,7 @@ class DockWidget(QDockWidget,ui_dialog): try: print("input_params_list ", self.input_dict) for c,i in enumerate(self.input_dict): - print(i) + #print(i) if i == None: continue l = QLineEdit(str(self.obj.variables[i]['value'])) @@ -77,16 +77,16 @@ class DockWidget(QDockWidget,ui_dialog): def param(self): try: self.dict = {} - print("param.input_dict ", self.input_dict) + #print("param.input_dict ", self.input_dict) for i in self.input_dict: if (self.input_dict[i] == None): continue else: - print(self.input_dict[i], i, self.obj.type) + #print(self.input_dict[i], i, self.obj.type) if (self.input_dict[i].text()): self.dict[i] = self.input_dict[i].text() else: - print(self.input_dict[i].text()) + #print(self.input_dict[i].text()) self.show_error() break @@ -121,19 +121,19 @@ class DockWidget(QDockWidget,ui_dialog): def results_category(self,name): flag = True try: - print("Under result category name ", name) + #print("Under result category name ", name) result=self.container.result obj = self.container.fetch_object(name) self.tableWidget.setRowCount(0) variKeys = list(obj.variables.keys()) - print(variKeys) + #print(variKeys) for i, val in enumerate(variKeys): propertyname = name + '.' + val - print(i,val, propertyname) + #print(i,val, propertyname) if propertyname in result[0]: ind = result[0].index(propertyname) resultval = str(result[-1][ind]) - print("######Resultsfetch####",val,resultval) + #print("######Resultsfetch####",val,resultval) rowPosition = self.tableWidget.rowCount() self.tableWidget.insertRow(rowPosition) self.tableWidget.setItem(rowPosition , 0, QTableWidgetItem(obj.variables[val]['name'])) diff --git a/DockWidgets/DockWidgetMaterialStream.py b/DockWidgets/DockWidgetMaterialStream.py index a6396ef..422119e 100644 --- a/DockWidgets/DockWidgetMaterialStream.py +++ b/DockWidgets/DockWidgetMaterialStream.py @@ -95,7 +95,10 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog): l.setText(str(self.input_dict[i])) lay = QGridLayout() - lay.addWidget(QLabel(i+":"),0,0, alignment=Qt.AlignLeft) + if i !='MolFlow': + lay.addWidget(QLabel(self.obj.variables[i]['name']+":"),0,0, alignment=Qt.AlignLeft) + else: + lay.addWidget(QLabel(i+":"),0,0, alignment=Qt.AlignLeft) lay.addWidget(l,0,1, alignment=Qt.AlignCenter) if(i != 'MolFlow'): lay.addWidget(QLabel(self.obj.variables[i]['unit']),0,2, alignment=Qt.AlignCenter) @@ -252,13 +255,13 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog): compound_no = int(k[k.index(',') + 1]) - 1 # compound is from python list if phase_no == 1: - child = QTreeWidgetItem(mroot, [compound_selected[compound_no], str(resultval), + child = QTreeWidgetItem(mroot, [compound_selected[compound_no], str(round(float(resultval),4)), obj.variables[k.split('.')[1]]['unit']]) elif phase_no == 2: - child = QTreeWidgetItem(lroot, [compound_selected[compound_no], str(resultval), + child = QTreeWidgetItem(lroot, [compound_selected[compound_no], str(round(float(resultval),4)), obj.variables[k.split('.')[1]]['unit']]) elif phase_no == 3: - child = QTreeWidgetItem(vroot, [compound_selected[compound_no], str(resultval), + child = QTreeWidgetItem(vroot, [compound_selected[compound_no], str(round(float(resultval),4)), obj.variables[k.split('.')[1]]['unit']]) if (compound_no + 1) == len(compound_selected): j += 1 @@ -296,7 +299,7 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog): mrowPosition = self.mTableWidget.rowCount() self.mTableWidget.insertRow(mrowPosition) self.mTableWidget.setItem(mrowPosition , 0, QTableWidgetItem(obj.variables[val.split('.')[1]]['name'])) - self.mTableWidget.setItem(mrowPosition , 1, QTableWidgetItem(resultval)) + self.mTableWidget.setItem(mrowPosition , 1, QTableWidgetItem(str(round(float(resultval),4)))) self.mTableWidget.setItem(mrowPosition , 2, QTableWidgetItem(obj.variables[val.split('.')[1]]['unit'])) self.mTableWidget.resizeColumnsToContents() @@ -304,14 +307,14 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog): lrowPosition = self.lTableWidget.rowCount() self.lTableWidget.insertRow(lrowPosition) self.lTableWidget.setItem(lrowPosition , 0, QTableWidgetItem(obj.variables[val.split('.')[1]]['name'])) - self.lTableWidget.setItem(lrowPosition , 1, QTableWidgetItem(resultval)) + self.lTableWidget.setItem(lrowPosition , 1, QTableWidgetItem(str(round(float(resultval),4)))) self.lTableWidget.setItem(lrowPosition , 2, QTableWidgetItem(obj.variables[val.split('.')[1]]['unit'])) self.lTableWidget.resizeColumnsToContents() if '3' in val.split('.')[1]: vrowPosition = self.vTableWidget.rowCount() self.vTableWidget.insertRow(vrowPosition) self.vTableWidget.setItem(vrowPosition , 0, QTableWidgetItem(obj.variables[val.split('.')[1]]['name'])) - self.vTableWidget.setItem(vrowPosition , 1, QTableWidgetItem(resultval)) + self.vTableWidget.setItem(vrowPosition , 1, QTableWidgetItem(str(round(float(resultval),4)))) self.vTableWidget.setItem(vrowPosition , 2, QTableWidgetItem(obj.variables[val.split('.')[1]]['unit'])) self.vTableWidget.resizeColumnsToContents() if not '[' in val: @@ -319,7 +322,7 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog): mrowPosition = self.mTableWidget.rowCount() self.mTableWidget.insertRow(mrowPosition) self.mTableWidget.setItem(mrowPosition , 0, QTableWidgetItem(obj.variables[val.split('.')[1]]['name'])) - self.mTableWidget.setItem(mrowPosition , 1, QTableWidgetItem(resultval)) + self.mTableWidget.setItem(mrowPosition , 1, QTableWidgetItem(str(round(float(resultval),4)))) self.mTableWidget.setItem(mrowPosition , 2, QTableWidgetItem(obj.variables[val.split('.')[1]]['unit'])) self.mTableWidget.resizeColumnsToContents() diff --git a/DockWidgets/__pycache__/DockWidget.cpython-37.pyc b/DockWidgets/__pycache__/DockWidget.cpython-37.pyc Binary files differindex 51ca871..bb3ffa1 100644 --- a/DockWidgets/__pycache__/DockWidget.cpython-37.pyc +++ b/DockWidgets/__pycache__/DockWidget.cpython-37.pyc diff --git a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc Binary files differindex 193f8e9..1830c79 100644 --- a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc +++ b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc |