Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure

src/Model/Friction/Friction.py

@@ -16,10 +16,13 @@
 
 # -*- coding: utf-8 -*-
 
+import logging
+
 from tools import trace, timer
 
 from Model.Tools.PamhyrDB import SQLSubModel
 
+logger = logging.getLogger()
 
 class Friction(SQLSubModel):
     def __init__(self, name: str = "", status=None):
@@ -60,7 +63,10 @@ class Friction(SQLSubModel):
     @classmethod
     def _db_load(cls, execute, data=None):
         new = []
-        reach = data["parent"]  # Reach object
+
+        logger.info(data)
+
+        reach = data["reach"]
         status = data["status"]
         stricklers = data["stricklers"].stricklers
 
@@ -69,9 +75,6 @@ class Friction(SQLSubModel):
             f"FROM friction WHERE reach = {reach.id}"
         )
 
-        for _ in table:
-            new.append(None)
-
         for row in table:
             ind = row[0]
             # Get stricklers
@@ -86,7 +89,11 @@ class Friction(SQLSubModel):
             sec.begin_strickler = bs
             sec.end_strickler = es
 
-            yield ind, sec
+            new.append((ind, sec))
+
+        logger.info(new)
+
+        return new
 
     def _db_save(self, execute, data=None):
         ind = data["ind"]
@@ -116,6 +123,10 @@ class Friction(SQLSubModel):
     def edge(self):
         return self._edge
 
+    @property
+    def reach(self):
+        return self._edge
+
     @edge.setter
     def edge(self, edge):
         self._edge = edge

src/Model/Friction/FrictionList.py

@@ -50,10 +50,12 @@ class FrictionList(PamhyrModelList):
     def _db_load(cls, execute, data=None):
         new = cls(status=data['status'])
 
-        new._lst = Friction._db_load(
+        ilst = Friction._db_load(
             execute, data
         )
 
+        new._lst = list(map(lambda x: x[1], sorted(ilst)))
+
         return new
 
     def _db_save(self, execute, data=None):

src/Model/Geometry/PointXYZ.py

@@ -116,7 +116,7 @@ class PointXYZ(Point, SQLSubModel):
         sl = self._sl.id if self._sl is not None else -1
 
         sql = (
-            "INSERT OR REPLACE INTO " +
+            "INSERT INTO " +
             "geometry_pointXYZ(ind, name, x, y, z, profile, sl) " +
             "VALUES (" +
             f"{ind}, '{self._db_format(self._name)}', " +

src/Model/Geometry/ProfileXYZ.py

@@ -115,9 +115,6 @@ class ProfileXYZ(Profile, SQLSubModel):
             f"WHERE reach = {reach.id}"
         )
 
-        for _ in table:
-            profiles.append(None)
-
         for row in table:
             id = row[0]
             ind = row[1]
@@ -132,7 +129,7 @@ class ProfileXYZ(Profile, SQLSubModel):
                 id=id, num=num,
                 name=name, kp=kp,
                 code1=code1, code2=code2,
-                reach=data["parent"],
+                reach=reach,
                 status=status
             )
 
@@ -151,10 +148,6 @@ class ProfileXYZ(Profile, SQLSubModel):
 
             yield ind, new
 
-        #     profiles[ind] = new
-
-        # return profiles
-
     def _db_save(self, execute, data=None):
         ok = True
         ind = data["ind"]

src/Model/Geometry/Reach.py

@@ -61,7 +61,7 @@ class Reach(SQLSubModel):
 
     @classmethod
     def _db_load(cls, execute, data=None):
-        new = cls(status=data["status"], parent=data["parent"])
+        new = cls(status=data["status"], parent=data["reach"])
 
         new._profiles = ProfileXYZ._db_load(
             execute,

src/Model/HydraulicStructures/HydraulicStructures.py

@@ -61,8 +61,8 @@ class HydraulicStructure(SQLSubModel):
             id INTEGER NOT NULL PRIMARY KEY,
             name TEXT NOT NULL,
             enabled BOOLEAN NOT NULL,
-            input_kp INTEGER,
-            output_kp INTEGER,
+            input_kp REAL NOT NULL,
+            output_kp REAL NOT NULL,
             input_reach INTEGER,
             output_reach INTEGER,
             FOREIGN KEY(input_reach) REFERENCES river_reach(id),
@@ -140,6 +140,14 @@ class HydraulicStructure(SQLSubModel):
         if self._output_reach is not None:
             output_reach_id = self._output_reach.id
 
+        input_kp = -1
+        if self.input_kp is not None:
+            input_kp = self.input_kp
+
+        output_kp = -1
+        if self.output_kp is not None:
+            output_kp = self.output_kp
+
         sql = (
             "INSERT INTO " +
             "hydraulic_structures(" +
@@ -149,7 +157,7 @@ class HydraulicStructure(SQLSubModel):
             "VALUES (" +
             f"{self.id}, '{self._db_format(self._name)}', " +
             f"{self._db_format(self.enabled)}, " +
-            f"{self.input_kp}, {self.input_kp}, " +
+            f"{input_kp}, {output_kp}, " +
             f"{input_reach_id}, {output_reach_id}" +
             ")"
         )

src/Model/River.py

@@ -157,7 +157,9 @@ class RiverReach(Edge, SQLSubModel):
             data = {}
 
         table = execute(
-            "SELECT id, name, enable, node1, node2 FROM river_reach")
+            "SELECT id, name, enable, node1, node2 FROM river_reach"
+        )
+
         for row in table:
             # Update id counter
             cls._id_cnt = max(cls._id_cnt, row[0])
@@ -172,10 +174,9 @@ class RiverReach(Edge, SQLSubModel):
             new = cls(id, name, node1, node2, status=data["status"])
             new.enable(enable=enable)
 
-            data["reach"] = id
-            data["parent"] = new
-            new._reach = Reach._db_load(execute, data)
+            data["reach"] = new
 
+            new._reach = Reach._db_load(execute, data)
             new._frictions = FrictionList._db_load(execute, data)
 
             reachs.append(new)

src/View/LateralContribution/Window.py

@@ -107,7 +107,7 @@ class LateralContributionWindow(PamhyrWindow):
             self._table[t] = TableModel(
                 table_view=table,
                 table_headers=self._trad.get_dict("table_headers"),
-                editable_headers=True,
+                editable_headers=self._trad.get_dict("table_headers"),
                 delegates={
                     "type": self._delegate_type,
                     "edge": self._delegate_edge,

src/View/Study/Window.py

@@ -101,4 +101,5 @@ class NewStudyWindow(PamhyrDialog):
                 self._study.use_date(date)
             else:
                 self._study.use_time()
+
         self.done(True)

src/View/Tools/ListedSubWindow.py

@@ -55,11 +55,12 @@ class ListedSubWindow(object):
         logger.info(f"Close window: ({h}) {self.sub_win_cnt}")
 
     def _sub_win_exists(self, h):
-        return reduce(
+        res = reduce(
             lambda acc, el: (acc or (h == (el[1].hash()))),
             self.sub_win_list,
             False
         )
+        return res
 
     def sub_win_exists(self, h):
         return self._sub_win_exists(h)

src/View/Tools/PamhyrTable.py

@@ -119,8 +119,7 @@ class PamhyrTableModel(QAbstractTableModel):
 
         options = Qt.ItemIsEnabled | Qt.ItemIsSelectable
 
-        if (self._editable_headers or
-                self._headers[column] in self._editable_headers):
+        if self._headers[column] in self._editable_headers:
             options |= Qt.ItemIsEditable
 
         return options

src/View/Tools/PamhyrWindow.py

@@ -186,3 +186,8 @@ class PamhyrDialog(ASubWindow, ListedSubWindow, PamhyrWindowTools):
         self._hash_data.append(self._config)
 
         self._set_title()
+
+    def done(self, result):
+        if self.parent is not None:
+            self.parent.sub_win_del(self.hash())
+        super(PamhyrDialog, self).done(result)

src/View/ui/GeometryReach.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>868</width>
+    <width>1280</width>
     <height>720</height>
    </rect>
   </property>
@@ -101,7 +101,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>868</width>
+     <width>1280</width>
      <height>22</height>
     </rect>
    </property>