plot tabs tot sediments done with limit effect

src/View/Results/TableAdisTS.py

@@ -63,9 +63,6 @@ class TableModel(PamhyrTableModel):
             tmp_list.insert(len(tmp_list), "total_sediment")
             self._lst = tmp_list
             ###print("=====table pollutants: ", self._lst)
-        elif self._opt_data == "phys_var":
-            self._lst = self._data.phys_var_list
-            #print("=====table pollutants: ", self._lst)
 
     def __init__(self, **kwargs):
         self._timestamp = 0.0
@@ -86,10 +83,6 @@ class TableModel(PamhyrTableModel):
             if self._headers[column] == "name":
                 v = self._lst[row]
                 return str(v)
-        elif self._opt_data == "phys_var":
-            if self._headers[column] == "name":
-                v = self._lst[row]
-                return str(v)
         elif self._opt_data == "profile":
             if self._headers[column] == "name":
                 v = self._lst[row].name

src/View/Results/WindowAdisTS.py

@@ -128,7 +128,7 @@ class ResultsWindowAdisTS(PamhyrWindow):
         print("results study river: ", self._results.study.river)
         print("*********files names resultats from Results Window: ", self._results.pollutants_list)
         self._table = {}
-        for t in ["reach", "profile", "pollutants", "phys_var"]:#, "raw_data"]:
+        for t in ["reach", "profile", "pollutants"]:#, "raw_data"]:
             print("t: ", t)
             table = self.find(QTableView, f"tableView_{t}")
             self._table[t] = TableModel(
@@ -205,7 +205,7 @@ class ResultsWindowAdisTS(PamhyrWindow):
         )
         self.plot_layout_2 = self.find(
             QVBoxLayout, "verticalLayout_tot_c")
-        #self.plot_layout_2.addWidget(self.toolbar_2)
+        self.plot_layout_2.addWidget(self.toolbar_2)
         self.plot_layout_2.addWidget(self.canvas_2)
 
         self.plot_tot_c = PlotTotSedC(
@@ -215,7 +215,7 @@ class ResultsWindowAdisTS(PamhyrWindow):
             profile_id=0,
             pol_id=self._results.pollutants_list.index("total_sediment"),
             trad=self._trad,
-            #toolbar=self.toolbar_2
+            toolbar=self.toolbar_2
         )
 
         self.plot_tot_c.draw()
@@ -230,7 +230,7 @@ class ResultsWindowAdisTS(PamhyrWindow):
         )
         self.plot_layout_1 = self.find(
             QVBoxLayout, "verticalLayout_tot_left_2")
-        # self.plot_layout_1.addWidget(self.toolbar_1)
+        self.plot_layout_1.addWidget(self.toolbar_1)
         self.plot_layout_1.addWidget(self.canvas_1)
 
         self.plot_tot_eg = PlotTotSedEG(
@@ -240,7 +240,7 @@ class ResultsWindowAdisTS(PamhyrWindow):
             profile_id=0,
             pol_id=self._results.pollutants_list.index("total_sediment"),
             trad=self._trad,
-            #toolbar=self.toolbar_1
+            toolbar=self.toolbar_1
         )
 
         self.plot_tot_eg.draw()
@@ -255,7 +255,7 @@ class ResultsWindowAdisTS(PamhyrWindow):
         )
         self.plot_layout_0 = self.find(
             QVBoxLayout, "verticalLayout_tot_minor")
-        # self.plot_layout_0.addWidget(self.toolbar_0)
+        self.plot_layout_0.addWidget(self.toolbar_0)
         self.plot_layout_0.addWidget(self.canvas_0)
 
         self.plot_tot_em = PlotTotSedEM(
@@ -265,7 +265,7 @@ class ResultsWindowAdisTS(PamhyrWindow):
             profile_id=0,
             pol_id=self._results.pollutants_list.index("total_sediment"),
             trad=self._trad,
-            # toolbar=self.toolbar_0
+            toolbar=self.toolbar_0
         )
 
         self.plot_tot_em.draw()
@@ -280,8 +280,10 @@ class ResultsWindowAdisTS(PamhyrWindow):
         )
         self.plot_layout_5 = self.find(
             QVBoxLayout, "verticalLayout_tot_right")
-        # self.plot_layout_5.addWidget(self.toolbar_5)
+        self.plot_layout_5.addWidget(self.toolbar_5)
+        print("///***---+++///+++add toolbar correct")
         self.plot_layout_5.addWidget(self.canvas_5)
+        print("///***---+++///+++add canvas correct")
 
         self.plot_tot_ed = PlotTotSedED(
             canvas=self.canvas_5,
@@ -290,7 +292,7 @@ class ResultsWindowAdisTS(PamhyrWindow):
             profile_id=0,
             pol_id=self._results.pollutants_list.index("total_sediment"),
             trad=self._trad,
-            # toolbar=self.toolbar_0
+            toolbar=self.toolbar_5
         )
 
         self.plot_tot_ed.draw()

src/View/ui/ResultsAdisTS.ui

@@ -46,9 +46,6 @@
          <item>
           <widget class="QTableView" name="tableView_pollutants"/>
          </item>
-         <item>
-          <widget class="QTableView" name="tableView_phys_var"/>
-         </item>
          <item>
           <layout class="QVBoxLayout" name="verticalLayout_tot_left"/>
          </item>
@@ -108,11 +105,11 @@
            </attribute>
            <layout class="QGridLayout" name="gridLayout_6">
             <item row="0" column="0">
-             <layout class="QVBoxLayout" name="verticalLayout_total">
+             <layout class="QVBoxLayout" name="verticalLayout_tot">
               <item>
                <widget class="QTabWidget" name="tabWidget_2">
                 <property name="currentIndex">
-                 <number>1</number>
+                 <number>4</number>
                 </property>
                 <widget class="QWidget" name="tab">
                  <attribute name="title">
@@ -154,6 +151,11 @@
                   </item>
                  </layout>
                 </widget>
+                <widget class="QWidget" name="tab_9">
+                 <attribute name="title">
+                  <string>Page</string>
+                 </attribute>
+                </widget>
                </widget>
               </item>
              </layout>