summaryrefslogtreecommitdiff
path: root/DockWidgets/DockWidgetShortcutColumn.py
diff options
context:
space:
mode:
authorpravindalve2020-08-11 19:08:57 +0530
committerGitHub2020-08-11 19:08:57 +0530
commitb31cf75d9362412e755fce76f61d73eab1e7da14 (patch)
tree0ab99a88893f8b0a7c18138c0eec0c806654cf1a /DockWidgets/DockWidgetShortcutColumn.py
parentd3bed1ef7150f8e493ebaed3b841b1fe781e974d (diff)
parent4cffaf3d0d29ee1f2d31601dd1571c7de40a8c5f (diff)
downloadChemical-Simulator-GUI-b31cf75d9362412e755fce76f61d73eab1e7da14.tar.gz
Chemical-Simulator-GUI-b31cf75d9362412e755fce76f61d73eab1e7da14.tar.bz2
Chemical-Simulator-GUI-b31cf75d9362412e755fce76f61d73eab1e7da14.zip
Merge pull request #4 from pravindalve/master
Updates and Bug Fixes
Diffstat (limited to 'DockWidgets/DockWidgetShortcutColumn.py')
-rw-r--r--DockWidgets/DockWidgetShortcutColumn.py64
1 files changed, 44 insertions, 20 deletions
diff --git a/DockWidgets/DockWidgetShortcutColumn.py b/DockWidgets/DockWidgetShortcutColumn.py
index af81441..2b7dfae 100644
--- a/DockWidgets/DockWidgetShortcutColumn.py
+++ b/DockWidgets/DockWidgetShortcutColumn.py
@@ -2,10 +2,7 @@ from PyQt5.QtCore import *
from PyQt5.QtWidgets import *
from PyQt5.QtGui import *
from PyQt5.uic import loadUiType
-import pandas as pd
-from functools import partial
from ComponentSelector import *
-from collections import defaultdict
from Graphics import *
ui_dialog,_ = loadUiType('DockWidgets/DockWidgetShortcutColumn.ui')
@@ -20,7 +17,6 @@ class DockWidgetShortcutColumn(QDockWidget,ui_dialog):
self.obj=obj
self.type = comptype
self.input_dict = []
- print("constructor ", self.input_dict)
self.input_params_list()
self.btn.clicked.connect(self.param)
self.dict = []
@@ -30,17 +26,15 @@ class DockWidgetShortcutColumn(QDockWidget,ui_dialog):
# input data tab
def input_params_list(self):
- try:
- print("input_params_list ", self.input_dict)
-
+ try:
self.l1.setText(self.obj.variables['HKey']['name']+":")
+ self.l2.setText(self.obj.variables['LKey']['name']+":")
+
print(self.obj.compounds)
for i in self.obj.compounds:
self.cb1.addItem(str(i))
self.cb2.addItem(str(i))
- self.l2.setText(self.obj.variables['LKey']['name']+":")
-
self.l3.setText(self.obj.variables['HKey_x_pc']['name']+":")
self.le3.setText(str(self.obj.variables['HKey_x_pc']['value']))
self.u3.setText(self.obj.variables['HKey_x_pc']['unit'])
@@ -62,7 +56,13 @@ class DockWidgetShortcutColumn(QDockWidget,ui_dialog):
self.l8.setText(self.obj.variables['RR']['name']+":")
self.le8.setText(str(self.obj.variables['RR']['value']))
- self.input_dict = [self.cb1, self.cb2, self.le3, self.le4, self.cb5, self.le6, self.le7, self.le8]
+ self.l9.setText("Thermo Package :")
+
+ self.lines = [line.rstrip('\n') for line in open('thermopackage.txt')]
+ for j in self.lines:
+ self.cb6.addItem(str(j))
+
+ self.input_dict = [self.cb1, self.cb2, self.le3, self.le4, self.cb5, self.le6, self.le7, self.le8, self.cb6]
except Exception as e:
print(e)
@@ -73,25 +73,49 @@ class DockWidgetShortcutColumn(QDockWidget,ui_dialog):
def param(self):
try:
self.dict=[]
- print("param.input_dict ", self.input_dict)
self.dict = [self.input_dict[0].currentText(),self.input_dict[1].currentText(),float(self.input_dict[2].text()), float(self.input_dict[3].text()),
- self.input_dict[4].currentText(), float(self.input_dict[5].text()), float(self.input_dict[6].text()), float(self.input_dict[7].text())]
-
- print("param ", self.dict)
+ self.input_dict[4].currentText(), float(self.input_dict[5].text()), float(self.input_dict[6].text()), float(self.input_dict[7].text()),
+ self.input_dict[8].currentText()]
self.obj.param_setter(self.dict)
self.hide()
except Exception as e:
print(e)
-
@staticmethod
def show_result(lst):
- #DockWidget1.flag = True
for i in lst:
- i.resultsCategory(i.name)
- #i.show()
-
+ try:
+ i.results_category(i.name)
+ except AttributeError:
+ pass
+
+ def clear_results(self):
+ self.tableWidget.setRowCount(0)
+
# result data tab
def results_category(self,name):
- pass \ No newline at end of file
+ flag = True
+ try:
+ print("Under result category name ", name)
+ result=self.container.result
+ obj = self.container.fetch_object(name)
+ self.tableWidget.setRowCount(0)
+ variKeys = obj.result_parameters
+ print(variKeys)
+ for i, val in enumerate(variKeys):
+ propertyname = name + '.' + val
+ print(i,val, propertyname)
+ if propertyname in result[0]:
+ ind = result[0].index(propertyname)
+ resultval = str(result[-1][ind])
+ obj.variables[val]['value']= result[-1][ind]
+ print("######Resultsfetch####",val,resultval)
+ rowPosition = self.tableWidget.rowCount()
+ self.tableWidget.insertRow(rowPosition)
+ self.tableWidget.setItem(rowPosition , 0, QTableWidgetItem(obj.variables[val]['name']))
+ self.tableWidget.setItem(rowPosition , 1, QTableWidgetItem(resultval))
+ self.tableWidget.setItem(rowPosition , 2, QTableWidgetItem(obj.variables[val]['unit']))
+ self.tableWidget.resizeColumnsToContents()
+ except Exception as e:
+ print(e) \ No newline at end of file