From 98453e6ed35268278096228a545c72d2aebad755 Mon Sep 17 00:00:00 2001
From: pravindalve
Date: Tue, 20 Oct 2020 00:00:55 +0530
Subject: Material Stream Dockwidget allignment issue fixed
---
DockWidgets/DockWidgetMaterialStream.py | 5 +-
DockWidgets/DockWidgetMaterialStream.ui | 223 ++++++++++-----------
.../DockWidgetMaterialStream.cpython-37.pyc | Bin 8326 -> 8382 bytes
3 files changed, 108 insertions(+), 120 deletions(-)
(limited to 'DockWidgets')
diff --git a/DockWidgets/DockWidgetMaterialStream.py b/DockWidgets/DockWidgetMaterialStream.py
index de223c3..937aa65 100644
--- a/DockWidgets/DockWidgetMaterialStream.py
+++ b/DockWidgets/DockWidgetMaterialStream.py
@@ -30,7 +30,7 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog):
header = QTreeWidgetItem(['Compound','Value','Unit'])
self.mTreeWidget.setHeaderItem(header)
self.lTreeWidget.setHeaderItem(header)
- self.vTreeWidget.setHeaderItem(header)
+ self.vTreeWidget.setHeaderItem(header)
# input data tab
def modes(self):
@@ -68,9 +68,10 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog):
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(QLabel(str(compound_selected[j])+":"),j,0, alignment= Qt.AlignLeft)
lay.addWidget(l,j,1, alignment=Qt.AlignCenter)
self.x_pclist.append(l)
+ lay.setSizeConstraint(QLayout.SetFixedSize)
gp.setLayout(lay)
self.formLayout.addRow(gp)
else:
diff --git a/DockWidgets/DockWidgetMaterialStream.ui b/DockWidgets/DockWidgetMaterialStream.ui
index a442eee..15807ca 100644
--- a/DockWidgets/DockWidgetMaterialStream.ui
+++ b/DockWidgets/DockWidgetMaterialStream.ui
@@ -47,127 +47,114 @@
Input Data
-
-
-
- 9
- 9
- 331
- 71
-
+
+
+ QLayout::SetFixedSize
-
- Mode Selection
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
- Mode :
-
-
-
+ -
+
+
+ Mode Selection
+
+
-
-
-
- true
-
-
-
- 0
- 0
-
-
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Mode :
+
+
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+
+
-
-
-
-
-
-
- 10
- 100
- 331
- 221
-
-
-
- Parameter Selection
-
-
- -
-
-
-
-
-
-
-
- 10
- 390
- 331
- 21
-
-
-
- Submit
-
-
-
-
-
- 10
- 330
- 331
- 51
-
-
-
-
-
-
- -
-
+
+
+ -
+
+
+ Parameter Selection
+
+
+
+ QLayout::SetFixedSize
+
-
-
-
-
- 0
- 0
-
-
-
- Thermo Package
-
-
+
+
+
+
+ -
+
+
+
+
+
+
+ QLayout::SetDefaultConstraint
+
-
-
-
- true
-
-
-
- 0
- 0
-
-
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Thermo Package
+
+
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+
+
-
-
-
+
+
+ -
+
+
+ Submit
+
+
+
+
@@ -205,8 +192,8 @@
0
0
- 335
- 494
+ 341
+ 518
@@ -318,8 +305,8 @@
0
0
- 151
- 128
+ 137
+ 96
@@ -407,8 +394,8 @@
0
0
- 151
- 128
+ 137
+ 96
diff --git a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc
index 4f5c2cd..550aab7 100644
Binary files a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc and b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc differ
--
cgit
From 9a52d596501a5f75eae84476455bdb1693aef6e4 Mon Sep 17 00:00:00 2001
From: pravindalve
Date: Tue, 3 Nov 2020 21:20:54 +0530
Subject: Result Fetching error in Material Stream Fixed
---
DockWidgets/DockWidgetMaterialStream.py | 64 +++++++++------------
.../DockWidgetMaterialStream.cpython-37.pyc | Bin 8382 -> 8132 bytes
2 files changed, 28 insertions(+), 36 deletions(-)
(limited to 'DockWidgets')
diff --git a/DockWidgets/DockWidgetMaterialStream.py b/DockWidgets/DockWidgetMaterialStream.py
index 937aa65..d272933 100644
--- a/DockWidgets/DockWidgetMaterialStream.py
+++ b/DockWidgets/DockWidgetMaterialStream.py
@@ -156,7 +156,6 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog):
# result data tab
def results_category(self,name):
- flag = True
try:
print("Under result category name ", name)
result=self.container.result
@@ -182,9 +181,13 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog):
print(ll)
j = 0
- t = 0
- namee = klst[j]
+ namee = 'none'
print("namee ", namee)
+ #initialization for treewidgets
+ lroot = 1
+ mroot = 1
+ vroot = 1
+
for i,k in enumerate(ll):
ind = result[0].index(k)
@@ -194,40 +197,29 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog):
print("######Resultsfetch####",resultval)
print(k[k.find(".")+1:k.find("[")])
obj.variables[k.split('.')[1]]['value'] = resultval
- if namee in k:
- if i%3 == 0:
- if(flag):
- mroot = QTreeWidgetItem(self.mTreeWidget, [lst[j]])
- child = QTreeWidgetItem(mroot, [compound_selected[t], str(resultval),obj.variables[k.split('.')[1]]['unit']])
- elif i%3 == 1:
- if(flag):
- lroot = QTreeWidgetItem(self.lTreeWidget, [lst[j]])
- child = QTreeWidgetItem(lroot, [compound_selected[t], str(resultval),obj.variables[k.split('.')[1]]['unit']])
- elif i%3 == 2:
- if (flag):
- vroot = QTreeWidgetItem(self.vTreeWidget, [lst[j]])
- child = QTreeWidgetItem(vroot, [compound_selected[t], str(resultval),obj.variables[k.split('.')[1]]['unit']])
- t += 1
- flag = False
- else:
- j += 1
- t = 0
+
+ if namee not in k:
+ mroot = QTreeWidgetItem(self.mTreeWidget, [lst[j]])
+ lroot = QTreeWidgetItem(self.lTreeWidget, [lst[j]])
+ vroot = QTreeWidgetItem(self.vTreeWidget, [lst[j]])
namee = klst[j]
- flag = True
- if i%3 == 0:
- if (flag):
- mroot = QTreeWidgetItem(self.mTreeWidget, [lst[j]])
- child = QTreeWidgetItem(mroot, [compound_selected[t], str(resultval),obj.variables[k.split('.')[1]]['unit']])
- elif i%3 == 1:
- if (flag):
- lroot = QTreeWidgetItem(self.lTreeWidget, [lst[j]])
- child = QTreeWidgetItem(lroot, [compound_selected[t], str(resultval),obj.variables[k.split('.')[1]]['unit']])
- elif i%3 == 2:
- if (flag):
- vroot = QTreeWidgetItem(self.vTreeWidget, [lst[j]])
- child = QTreeWidgetItem(vroot, [compound_selected[t], str(resultval),obj.variables[k.split('.')[1]]['unit']])
- t += 1
- flag = False
+
+ phase_no = int(k[k.index(',') - 1]) # phase no is from modelica list
+ 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),
+ obj.variables[k.split('.')[1]]['unit']])
+ elif phase_no == 2:
+ child = QTreeWidgetItem(lroot, [compound_selected[compound_no], str(resultval),
+ obj.variables[k.split('.')[1]]['unit']])
+ elif phase_no == 3:
+ child = QTreeWidgetItem(vroot, [compound_selected[compound_no], str(resultval),
+ obj.variables[k.split('.')[1]]['unit']])
+ if (compound_no + 1) == len(compound_selected):
+ j += 1
+
+
# Phase Properties Tab
phaseResLst = []
diff --git a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc
index 550aab7..f3850cf 100644
Binary files a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc and b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc differ
--
cgit