Merge pull request #9 from pravindalve/master

Fixed issue #5 and issue #7

3 files changed, 136 insertions, 156 deletions

diff --git a/DockWidgets/DockWidgetMaterialStream.py b/DockWidgets/DockWidgetMaterialStream.py
index de223c3..d272933 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:
@@ -155,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
@@ -181,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)
@@ -193,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/DockWidgetMaterialStream.ui b/DockWidgets/DockWidgetMaterialStream.ui
index a442eee..15807ca 100644
--- a/DockWidgets/DockWidgetMaterialStream.ui
+++ b/DockWidgets/DockWidgetMaterialStream.ui
@@ -47,127 +47,114 @@
     <attribute name="title">
      <string>Input Data</string>
     </attribute>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="geometry">
-      <rect>
-       <x>9</x>
-       <y>9</y>
-       <width>331</width>
-       <height>71</height>
-      </rect>
+    <layout class="QVBoxLayout" name="verticalLayout_5">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetFixedSize</enum>
      </property>
-     <property name="title">
-      <string>Mode Selection</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QLabel" name="label">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Mode : </string>
-          </property>
-         </widget>
-        </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox">
+       <property name="title">
+        <string>Mode Selection</string>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
-         <widget class="QComboBox" name="comboBox">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QLabel" name="label">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Mode : </string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="comboBox">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </item>
        </layout>
-      </item>
-     </layout>
-    </widget>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="geometry">
-      <rect>
-       <x>10</x>
-       <y>100</y>
-       <width>331</width>
-       <height>221</height>
-      </rect>
-     </property>
-     <property name="title">
-      <string>Parameter Selection</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <layout class="QFormLayout" name="formLayout"/>
-      </item>
-     </layout>
-    </widget>
-    <widget class="QPushButton" name="pushButton_2">
-     <property name="geometry">
-      <rect>
-       <x>10</x>
-       <y>390</y>
-       <width>331</width>
-       <height>21</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string>Submit</string>
-     </property>
-    </widget>
-    <widget class="QGroupBox" name="groupBox_3">
-     <property name="geometry">
-      <rect>
-       <x>10</x>
-       <y>330</y>
-       <width>331</width>
-       <height>51</height>
-      </rect>
-     </property>
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_10">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_11">
+      </widget>
+     </item>
+     <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>
         <item>
-         <widget class="QLabel" name="label_2">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Thermo Package</string>
-          </property>
-         </widget>
+         <layout class="QFormLayout" name="formLayout"/>
         </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox_3">
+       <property name="title">
+        <string/>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout_10">
+        <property name="sizeConstraint">
+         <enum>QLayout::SetDefaultConstraint</enum>
+        </property>
         <item>
-         <widget class="QComboBox" name="cbTP">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
+         <layout class="QHBoxLayout" name="horizontalLayout_11">
+          <item>
+           <widget class="QLabel" name="label_2">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Thermo Package</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="cbTP">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </item>
        </layout>
-      </item>
-     </layout>
-    </widget>
+      </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">
@@ -205,8 +192,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>335</width>
-          <height>494</height>
+          <width>341</width>
+          <height>518</height>
          </rect>
         </property>
         <property name="styleSheet">
@@ -318,8 +305,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>151</width>
-          <height>128</height>
+          <width>137</width>
+          <height>96</height>
          </rect>
         </property>
         <property name="styleSheet">
@@ -407,8 +394,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>151</width>
-          <height>128</height>
+          <width>137</width>
+          <height>96</height>
          </rect>
         </property>
         <property name="styleSheet">
diff --git a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc
index 4f5c2cd..f3850cf 100644
--- a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc
+++ b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc