Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr

.gitignore

@@ -9,8 +9,6 @@
 *.class
 
 tmp
-mage8
-adists
 
 *.tar
 *.tar.*

.gitlab-ci.yml

@@ -29,7 +29,7 @@ stages:
 #############
 
 variables:
-  MAGE_8_VERSION: "v8.3.5"
+  MAGE_8_VERSION: "v8.3.6"
 
 dl-mage8-doc:
   stage: downloads
@@ -262,6 +262,11 @@ build-linux:
     - cp -v ../mage8-linux/* pamhyr/mage8/
     # Copy Pamhyr
     - cp -r dist/pamhyr/* pamhyr/
+    # Pamhyr script to force x11
+    - echo '#!/usr/bin/env bash' > pamhyr/pamhyr-x11
+    - echo "" >> pamhyr/pamhyr-x11
+    - echo "GDK_BACKEND=x11 ./pamhyr $@" >> pamhyr/pamhyr-x11
+    - chmod +x pamhyr/pamhyr-x11
     # Copy Pamhyr resources
     - mkdir -p pamhyr/_internal/View
     - mkdir -p pamhyr/_internal/View/ui
@@ -333,7 +338,7 @@ build-windows:
     - python -m pip install -U -r ..\requirements.txt
     # Run Pyinstaller
     # - pyinstaller --noconsole -y ..\src\pamhyr.py
-    - pyinstaller --hide-console hide-early -y ..\src\pamhyr.py
+    - pyinstaller -i ../src/View/ui/ressources/icon.ico --hide-console hide-early -y ..\src\pamhyr.py
     # Create directory
     - mkdir pamhyr
     - dir

.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>

.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Black">
-    <option name="sdkName" value="Python 3.10 (pamhyr)" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (pamhyr)" project-jdk-type="Python SDK" />
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/pamhyr.iml" filepath="$PROJECT_DIR$/.idea/pamhyr.iml" />
-    </modules>
-  </component>
-</project>

.idea/pamhyr.iml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/venv" />
-    </content>
-    <orderEntry type="jdk" jdkName="Python 3.10 (pamhyr)" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="PyDocumentationSettings">
-    <option name="format" value="PLAIN" />
-    <option name="myDocStringFormat" value="Plain" />
-  </component>
-</module>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

doc/tools/PamhyrDoc.cls

@@ -11,7 +11,8 @@
 \usepackage[absolute]{textpos}
 \usepackage{titlesec}
 \usepackage{amssymb}
-\usepackage{tcolorbox}
+\usepackage[minted,xparse,breakable]{tcolorbox}
+\usepackage{pmboxdraw}
 
 \usepackage{enumitem}
 \setlist[enumerate]{itemsep=-0.5em}
@@ -140,7 +141,7 @@
 \setminted[llvm]{breaklines,fontsize=\footnotesize,encoding=utf8}
 
 %% Add box arrond of minted
-\BeforeBeginEnvironment{minted}{\begin{tcolorbox}[boxsep=0pt, left=0.1cm, right=0.1cm, arc=0pt, boxrule=0.5pt, colback=white]}%
+\BeforeBeginEnvironment{minted}{\begin{tcolorbox}[breakable, boxsep=0pt, left=0.1cm, right=0.1cm, arc=0pt, boxrule=0.5pt, colback=white]}%
 \AfterEndEnvironment{minted}{\end{tcolorbox}}%
 
 \makeatletter

packages/pamhyr.nsi

@@ -3,6 +3,7 @@
 !define LIC_NAME "LICENSE"
 !define APP_NAME "PAMHYR"
 
+Icon "pamhyr\_internal\View\ui\ressources\icon.ico"
 Name "Pamhyr2"
 OutFile "pamhyr-windows.exe"
 LicenseData "pamhyr\_internal\LICENSE"

src/Checker/Mage.py

@@ -206,11 +206,11 @@ class MageGeometryGuideLineChecker(StudyGeometryChecker):
     def __init__(self, version="mage8"):
         super(MageGeometryGuideLineChecker, self).__init__()
 
-        self._name = _translate("Checker", "Mage geometry guide line checker")
+        self._name = _translate("Checker", "Mage geometry guideline checker")
         self._description = _translate(
             "Checker",
-            "Check if exists geometry guide line is correctly defined \
-for each reaches of the study"
+            "Check if exists geometry guidelines are correctly defined \
+for each reach"
         )
         self._solver = version
         self._modules = Modules.GEOMETRY
@@ -241,7 +241,7 @@ for each reaches of the study"
             for profile in profiles:
                 if not profile.has_standard_named_points():
                     self._status = STATUS.WARNING
-                    self._summary = "no_standard_guileline_defined"
+                    self._summary = "no_standard_guideline_defined"
                     return False
 
         for gl in gls[1:]:

src/Checker/Study.py

@@ -34,9 +34,9 @@ class StudyNetworkReachChecker(AbstractModelChecker):
     def __init__(self):
         super(StudyNetworkReachChecker, self).__init__()
 
-        self._name = _translate("Checker", "Study network reach checker")
+        self._name = _translate("Checker", "Study reach network checker")
         self._description = _translate(
-            "Checker", "Check if exists at least one reach for study"
+            "Checker", "Check if exists at least one reach exists"
         )
         self._modules = Modules.NETWORK
 
@@ -63,7 +63,7 @@ class StudyGeometryChecker(AbstractModelChecker):
 
         self._name = _translate("Checker", "Study geometry checker")
         self._description = _translate(
-            "Checker", "Check if exists geometry for each reach of study"
+            "Checker", "Check if the geometry of each reach exists"
         )
         self._modules = Modules.GEOMETRY
 

src/Meshing/Mage.py

@@ -363,7 +363,7 @@ class MeshingWithMageMailleurTT(AMeshingTool):
             self.import_m_file(reach, m_file)
             return reach
 
-    def update_kp(self, reach,
+    def update_rk(self, reach,
                   step: float = 50,
                   limites=[-1, -1],
                   origin=0,
@@ -371,7 +371,8 @@ class MeshingWithMageMailleurTT(AMeshingTool):
                   lplan: bool = False,
                   lm: int = 3,
                   linear: bool = False,
-                  origin_value=0.0):
+                  origin_value=0.0,
+                  orientation=0):
         if reach is None or len(reach.profiles) == 0:
             return reach
 
@@ -396,11 +397,11 @@ class MeshingWithMageMailleurTT(AMeshingTool):
             logger.info(
                 f"! {self._exe_path()} " +
                 f"{st_file} {m_file} " +
-                f"update_kp " +
+                f"update_rk " +
                 f"{str(step)} " +
                 f"{limites[0]} {limites[1]} " +
                 f"{directrices[0]} {directrices[1]} " +
-                f"{lplan} {lm} {linear} " +
+                f"{orientation} {lm} {linear} " +
                 f"{origin} "
             )
             proc.start(
@@ -410,10 +411,10 @@ class MeshingWithMageMailleurTT(AMeshingTool):
                         str,
                         [
                             st_file, m_file,
-                            "update_kp", step,
+                            "update_rk", step,
                             limites[0], limites[1],
                             directrices[0], directrices[1],
-                            lplan, lm, linear, origin, origin_value
+                            orientation, lm, linear, origin, origin_value
                         ]
                     )
                 )

src/Model/BoundaryCondition/BoundaryCondition.py

@@ -315,6 +315,9 @@ class BoundaryCondition(SQLSubModel):
             self._data.sort(reverse=_reverse, key=key)
         self._status.modified()
 
+    def index(self, bc):
+        self._data.index(bc)
+
     def get_i(self, index):
         return self.data[index]
 

src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py

@@ -1,221 +0,0 @@
-# BoundaryConditionsAdisTS.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-
-from tools import (
-    trace, timer,
-    old_pamhyr_date_to_timestamp,
-    date_iso_to_timestamp,
-    date_dmy_to_timestamp,
-)
-
-from Model.Tools.PamhyrDB import SQLSubModel
-from Model.Except import NotImplementedMethodeError
-
-logger = logging.getLogger()
-
-
-class BoundaryConditionAdisTS(SQLSubModel):
-    _sub_classes = []
-    _id_cnt = 0
-
-    def __init__(self, id: int = -1,
-                 pollutant: int = -1, status=None):
-        super(BoundaryConditionAdisTS, self).__init__()
-
-        self._status = status
-
-        if id == -1:
-            self.id = BoundaryConditionAdisTS._id_cnt
-        else:
-            self.id = id
-
-        self._type = ""
-        self._node = None
-        self._pollutant = pollutant
-        self._data = []
-        self._header = []
-        self._types = [self.time_convert, float]
-
-        BoundaryConditionAdisTS._id_cnt = max(BoundaryConditionAdisTS._id_cnt + 1, self.id)
-
-    @classmethod
-    def _db_create(cls, execute):
-        execute("""
-          CREATE TABLE boundary_condition_adists(
-            id INTEGER NOT NULL PRIMARY KEY,
-            pollutant INTEGER NOT NULL,
-            type TEXT NOT NULL,
-            node INTEGER,
-            FOREIGN KEY(pollutant) REFERENCES Pollutants(id),
-            FOREIGN KEY(node) REFERENCES river_node(id)
-          )
-        """)
-
-        execute("""
-          CREATE TABLE boundary_condition_data_adists(
-            id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-            data0 TEXT NOT NULL,
-            data1 TEXT NOT NULL,
-            bc INTEGER,
-            FOREIGN KEY(bc) REFERENCES boundary_condition_adists(id)
-          )
-        """)
-
-        return cls._create_submodel(execute)
-
-    @classmethod
-    def _db_update(cls, execute, version):
-        return True
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = []
-
-        table = execute(
-            "SELECT id, pollutant, type, node " +
-            "FROM boundary_condition_adists"
-        )
-
-        if table is not None:
-            for row in table:
-                bc = cls(
-                    id=row[0],
-                    pollutant=row[1],
-                    status=data['status']
-                )
-
-                bc.type = row[2]
-
-                bc.node = None
-                if row[3] != -1:
-                    bc.node = next(filter(lambda n: n.id == row[3], data["nodes"])).id
-
-                values = execute(
-                    "SELECT data0, data1 FROM boundary_condition_data_adists " +
-                    f"WHERE bc = '{bc.id}'"
-                )
-
-                # Write data
-                for v in values:
-                    data0 = bc._types[0](v[0])
-                    data1 = bc._types[1](v[1])
-                    # Replace data at pos ind
-                    bc._data.append((data0, data1))
-
-                new.append(bc)
-
-        return new
-
-    def _db_save(self, execute, data=None):
-
-        execute(f"DELETE FROM boundary_condition_adists WHERE id = {self.id}")
-        execute(f"DELETE FROM boundary_condition_data_adists WHERE bc = {self.id}")
-
-        node = -1
-        if self._node is not None:
-            node = self._node
-
-        sql = (
-            "INSERT INTO " +
-            "boundary_condition_adists(id, pollutant, type, node) " +
-            "VALUES (" +
-            f"{self.id}, {self._pollutant}, " +
-            f"'{self._db_format(self._type)}', {node}" +
-            ")"
-        )
-        execute(sql)
-
-        for d in self._data:
-            data0 = self._db_format(str(d[0]))
-            data1 = self._db_format(str(d[1]))
-
-            sql = (
-                "INSERT INTO " +
-                "boundary_condition_data_adists(data0, data1, bc) " +
-                f"VALUES ('{data0}', {data1}, {self.id})"
-            )
-            execute(sql)
-
-        return True
-
-    def __len__(self):
-        return len(self._data)
-
-    @classmethod
-    def time_convert(cls, data):
-        if type(data) is str:
-            if data.count("-") == 2:
-                return date_iso_to_timestamp(data)
-            if data.count("/") == 2:
-                return date_dmy_to_timestamp(data)
-            if data.count(":") == 3:
-                return old_pamhyr_date_to_timestamp(data)
-            if data.count(":") == 2:
-                return old_pamhyr_date_to_timestamp("00:" + data)
-            if data.count(".") == 1:
-                return round(float(data))
-
-        return int(data)
-
-    @property
-    def node(self):
-        return self._node
-
-    @node.setter
-    def node(self, node):
-        self._node = node
-        self._status.modified()
-
-    @property
-    def header(self):
-        return self._header.copy()
-
-    @header.setter
-    def header(self, header):
-        self._header = header
-        self._status.modified()
-
-    @property
-    def pollutant(self):
-        return self._pollutant
-
-    @property
-    def type(self):
-        return self._type
-
-    @type.setter
-    def type(self, type):
-        self._type = type
-        self._status.modified()
-
-    @property
-    def data(self):
-        return self._data.copy()
-
-
-
-
-
-
-
-
-
-
-

src/Model/BoundaryConditionsAdisTS/BoundaryConditionsAdisTSList.py

@@ -1,68 +0,0 @@
-# BoundaryConditionsAdisTSList.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-from copy import copy
-from tools import trace, timer
-
-from Model.Tools.PamhyrList import PamhyrModelList
-from Model.Except import NotImplementedMethodeError
-
-from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS import BoundaryConditionAdisTS
-
-class BoundaryConditionsAdisTSList(PamhyrModelList):
-    _sub_classes = [
-        BoundaryConditionAdisTS,
-    ]
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = cls(status=data['status'])
-
-        if data is None:
-            data = {}
-
-        new._lst = BoundaryConditionAdisTS._db_load(
-            execute, data
-        )
-
-        return new
-
-    def _db_save(self, execute, data=None):
-        execute("DELETE FROM boundary_condition_adists")
-        execute("DELETE FROM boundary_condition_data_adists")
-
-        if data is None:
-            data = {}
-
-        for bc in self._lst:
-            bc._db_save(execute, data=data)
-
-        return True
-
-    def new(self, index, pollutant):
-        n = BoundaryConditionAdisTS(pollutant=pollutant, status=self._status)
-        self._lst.insert(index, n)
-        self._status.modified()
-        return n
-
-    @property
-    def BCs_AdisTS_List(self):
-        return self.lst
-
-
-

src/Model/D90AdisTS/D90AdisTS.py

@@ -1,201 +0,0 @@
-# D90AdisTS.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-from functools import reduce
-
-from tools import trace, timer, old_pamhyr_date_to_timestamp
-
-from Model.Tools.PamhyrDB import SQLSubModel
-from Model.Except import NotImplementedMethodeError
-
-from Model.D90AdisTS.D90AdisTSSpec import D90AdisTSSpec
-
-logger = logging.getLogger()
-
-class D90AdisTS(SQLSubModel):
-    _sub_classes = [
-        D90AdisTSSpec,
-    ]
-    _id_cnt = 0
-
-    def __init__(self, id: int = -1, name: str = "default",
-                 status=None):
-        super(D90AdisTS, self).__init__()
-
-        self._status = status
-
-        if id == -1:
-            self.id = D90AdisTS._id_cnt
-        else:
-            self.id = id
-
-        self._name = name
-        self._d90 = None
-        self._enabled = True
-        self._data = []
-
-        D90AdisTS._id_cnt = max(
-            D90AdisTS._id_cnt + 1,
-            self.id
-        )
-
-    @classmethod
-    def _db_create(cls, execute):
-        execute("""
-                  CREATE TABLE d90_adists(
-                    id INTEGER NOT NULL PRIMARY KEY,
-                    name TEXT NOT NULL,
-                    d90 REAL NOT NULL,
-                    enabled BOOLEAN NOT NULL
-                  )
-                """)
-
-        return cls._create_submodel(execute)
-
-    @classmethod
-    def _db_update(cls, execute, version):
-        major, minor, release = version.strip().split(".")
-        if major == minor == "0":
-            if int(release) < 6:
-                cls._db_create(execute)
-
-        return True
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = []
-
-        table = execute(
-            "SELECT id, name, d90, enabled " +
-            "FROM d90_adists"
-        )
-
-        if table is not None:
-            for row in table:
-                d90_id = row[0]
-                name = row[1]
-                d90 = row[2]
-                enabled = (row[3] == 1)
-
-                D90 = cls(
-                    id=d90_id,
-                    name=name,
-                    status=data['status']
-                )
-
-                D90.d90 = d90
-                D90.enabled = enabled
-
-                data['d90_default_id'] = d90_id
-                D90._data = D90AdisTSSpec._db_load(execute, data)
-
-                new.append(D90)
-
-        return new
-
-    def _db_save(self, execute, data=None):
-        execute(f"DELETE FROM d90_adists WHERE id = {self.id}")
-
-        d90 = -1.
-        if self.d90 is not None:
-            d90 = self.d90
-
-        sql = (
-            "INSERT INTO " +
-            "d90_adists(" +
-            "id, name, d90, enabled" +
-            ") " +
-            "VALUES (" +
-            f"{self.id}, '{self._db_format(self._name)}', " +
-            f"{d90}, {self._enabled}" +
-            ")"
-        )
-
-        execute(sql)
-
-        data['d90_default_id'] = self.id
-        execute(
-            "DELETE FROM d90_spec " +
-            f"WHERE d90_default = {self.id}"
-        )
-
-        for d90_spec in self._data:
-            d90_spec._db_save(execute, data)
-
-        return True
-
-    def __len__(self):
-        return len(self._data)
-
-    @property
-    def name(self):
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        self._name = name
-        self._status.modified()
-
-    @property
-    def d90(self):
-        return self._d90
-
-    @d90.setter
-    def d90(self, d90):
-        self._d90 = d90
-        self._status.modified()
-
-    @property
-    def enabled(self):
-        return self._enabled
-
-    @enabled.setter
-    def enabled(self, enabled):
-        self._enabled = enabled
-        self._status.modified()
-
-    def new(self, index):
-        n = D90AdisTSSpec(status=self._status)
-        self._data.insert(index, n)
-        self._status.modified()
-        return n
-
-    def delete(self, data):
-        self._data = list(
-            filter(
-                lambda x: x not in data,
-                self._data
-            )
-        )
-        self._status.modified()
-
-    def delete_i(self, indexes):
-        for ind in indexes:
-            del self._data[ind]
-        self._status.modified()
-
-    def insert(self, index, data):
-        self._data.insert(index, data)
-        self._status.modified()
-
-
-
-
-
-

src/Model/D90AdisTS/D90AdisTSList.py

@@ -1,66 +0,0 @@
-# D90AdisTSList.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-from copy import copy
-from tools import trace, timer
-
-from Model.Tools.PamhyrList import PamhyrModelList
-from Model.D90AdisTS.D90AdisTS import D90AdisTS
-
-class D90AdisTSList(PamhyrModelList):
-    _sub_classes = [
-        D90AdisTS,
-    ]
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = cls(status=data['status'])
-
-        if data is None:
-            data = {}
-
-        new._lst = D90AdisTS._db_load(
-            execute, data
-        )
-
-        return new
-
-    def _db_save(self, execute, data=None):
-        execute("DELETE FROM d90_adists")
-
-        if data is None:
-            data = {}
-
-        for d90 in self._lst:
-            d90._db_save(execute, data=data)
-
-        return True
-
-    def new(self, index):
-        n = D90AdisTS(status=self._status)
-        self._lst.insert(index, n)
-        self._status.modified()
-        return n
-
-    @property
-    def D90_AdisTS_List(self):
-        return self.lst
-
-
-
-

src/Model/D90AdisTS/D90AdisTSSpec.py

@@ -1,200 +0,0 @@
-# D90AdisTSSpec.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-
-from tools import trace, timer
-
-from Model.Tools.PamhyrDB import SQLSubModel
-from Model.Except import NotImplementedMethodeError
-
-logger = logging.getLogger()
-
-class D90AdisTSSpec(SQLSubModel):
-    _sub_classes = [
-    ]
-    _id_cnt = 0
-
-    def __init__(self, id: int = -1, name: str = "",
-                 status=None):
-        super(D90AdisTSSpec, self).__init__()
-
-        self._status = status
-
-        if id == -1:
-            self.id = D90AdisTSSpec._id_cnt
-        else:
-            self.id = id
-
-        self._name_section = name
-        self._reach = None
-        self._start_kp = None
-        self._end_kp = None
-        self._d90 = None
-        self._enabled = True
-
-        D90AdisTSSpec._id_cnt = max(D90AdisTSSpec._id_cnt + 1, self.id)
-
-    @classmethod
-    def _db_create(cls, execute):
-        execute("""
-              CREATE TABLE d90_spec(
-                id INTEGER NOT NULL PRIMARY KEY,
-                d90_default INTEGER NOT NULL,
-                name TEXT NOT NULL,
-                reach INTEGER NOT NULL,
-                start_kp REAL NOT NULL,
-                end_kp REAL NOT NULL,
-                d90 REAL NOT NULL,
-                enabled BOOLEAN NOT NULL,
-                FOREIGN KEY(d90_default) REFERENCES d90_adists(id),
-                FOREIGN KEY(reach) REFERENCES river_reach(id)
-              )
-            """)
-
-        return cls._create_submodel(execute)
-
-    @classmethod
-    def _db_update(cls, execute, version):
-        major, minor, release = version.strip().split(".")
-        if major == minor == "0":
-            if int(release) < 6:
-                cls._db_create(execute)
-
-        return True
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = []
-
-        table = execute(
-            "SELECT id, d90_default, name, reach, start_kp, end_kp, " +
-            "d90, enabled " +
-            "FROM d90_spec " +
-            f"WHERE d90_default = {data['d90_default_id']} "
-        )
-
-        for row in table:
-            id            = row[0]
-            name          = row[2]
-            reach         = row[3]
-            start_kp      = row[4]
-            end_kp        = row[5]
-            d90 = row[6]
-            enabled       = (row[7] == 1)
-
-            new_spec = cls(
-                id=id,
-                name=name,
-                status=data['status']
-            )
-
-            new_spec.reach = reach
-            new_spec.start_kp = start_kp
-            new_spec.end_kp = end_kp
-            new_spec.d90 = d90
-            new_spec.enabled = enabled
-
-            new.append(new_spec)
-
-        return new
-
-    def _db_save(self, execute, data=None):
-        d90_default = data['d90_default_id']
-
-        sql = (
-            "INSERT INTO " +
-            "d90_spec(id, d90_default, name, reach, " +
-            "start_kp, end_kp, d90, enabled) " +
-            "VALUES (" +
-            f"{self.id}, " +
-            f"{d90_default}, " +
-            f"'{self._db_format(self._name_section)}', " +
-            f"{self._reach}, " +
-            f"{self._start_kp}, " +
-            f"{self._end_kp}, " +
-            f"{self._d90}, " +
-            f"{self._enabled}" +
-            ")"
-        )
-        execute(sql)
-
-        return True
-
-    @property
-    def name(self):
-        return self._name_section
-
-    @name.setter
-    def name(self, name):
-        self._name_section = name
-        self._status.modified()
-
-    @property
-    def reach(self):
-        return self._reach
-
-    @reach.setter
-    def reach(self, reach):
-        self._reach = reach
-        self._status.modified()
-
-    @property
-    def start_kp(self):
-        return self._start_kp
-
-    @start_kp.setter
-    def start_kp(self, start_kp):
-        self._start_kp = start_kp
-        self._status.modified()
-
-    @property
-    def end_kp(self):
-        return self._end_kp
-
-    @end_kp.setter
-    def end_kp(self, end_kp):
-        self._end_kp = end_kp
-        self._status.modified()
-
-    @property
-    def d90(self):
-        return self._d90
-
-    @d90.setter
-    def d90(self, d90):
-        self._d90 = d90
-        self._status.modified()
-
-    @property
-    def enabled(self):
-        return self._enabled
-
-    @enabled.setter
-    def enabled(self, enabled):
-        self._enabled = enabled
-        self._status.modified()
-
-
-
-
-
-
-
-
-

src/Model/DIFAdisTS/DIFAdisTS.py

@@ -1,258 +0,0 @@
-# DIFAdisTS.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-from functools import reduce
-
-from tools import trace, timer, old_pamhyr_date_to_timestamp
-
-from Model.Tools.PamhyrDB import SQLSubModel
-from Model.Except import NotImplementedMethodeError
-
-from Model.DIFAdisTS.DIFAdisTSSpec import DIFAdisTSSpec
-
-logger = logging.getLogger()
-
-class DIFAdisTS(SQLSubModel):
-    _sub_classes = [
-        DIFAdisTSSpec,
-    ]
-    _id_cnt = 0
-
-    def __init__(self, id: int = -1, name: str = "default",
-                 status=None):
-        super(DIFAdisTS, self).__init__()
-
-        self._status = status
-
-        if id == -1:
-            self.id = DIFAdisTS._id_cnt
-        else:
-            self.id = id
-
-        self._name = name
-        self._method = None
-        self._dif = None
-        self._b = None
-        self._c = None
-        self._enabled = True
-        self._types = ["iwasa", "fisher", "elder", "constante", "generique"]
-        self._data = []
-
-        DIFAdisTS._id_cnt = max(
-            DIFAdisTS._id_cnt + 1,
-            self.id
-        )
-
-    @classmethod
-    def _db_create(cls, execute):
-        execute("""
-                  CREATE TABLE dif_adists(
-                    id INTEGER NOT NULL PRIMARY KEY,
-                    name TEXT NOT NULL,
-                    method TEXT NOT NULL,
-                    dif REAL NOT NULL,
-                    b REAL,
-                    c REAL,
-                    enabled BOOLEAN NOT NULL
-                  )
-                """)
-
-        return cls._create_submodel(execute)
-
-    @classmethod
-    def _db_update(cls, execute, version):
-        major, minor, release = version.strip().split(".")
-        if major == minor == "0":
-            if int(release) < 6:
-                cls._db_create(execute)
-
-        return True
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = []
-
-        table = execute(
-            "SELECT id, name, method, dif, b, c, enabled " +
-            "FROM dif_adists"
-        )
-
-        if table is not None:
-            for row in table:
-                dif_id = row[0]
-                name = row[1]
-                method = row[2]
-                dif = row[3]
-                b = row[4]
-                c = row[5]
-                enabled = (row[6] == 1)
-
-                DIF = cls(
-                    id=dif_id,
-                    name=name,
-                    status=data['status']
-                )
-
-                DIF.method = method
-                DIF.dif = dif
-                DIF.b = b
-                DIF.c = c
-                DIF.enabled = enabled
-
-                data['dif_default_id'] = dif_id
-                DIF._data = DIFAdisTSSpec._db_load(execute, data)
-
-                new.append(DIF)
-
-        return new
-
-    def _db_save(self, execute, data=None):
-        execute(f"DELETE FROM dif_adists WHERE id = {self.id}")
-
-        method = ""
-        if self.method is not None:
-            method = self.method
-
-        dif = -1.
-        if self.dif is not None:
-            dif = self.dif
-
-        b = -1.
-        if self.b is not None:
-            b = self.b
-
-        c = -1.
-        if self.dif is not None:
-            c = self.c
-
-        sql = (
-            "INSERT INTO " +
-            "dif_adists(" +
-            "id, name, method, dif, b, c, enabled" +
-            ") " +
-            "VALUES (" +
-            f"{self.id}, '{self._db_format(self._name)}', " +
-            f"'{self._db_format(self._method)}', " +
-            f"{dif}, {b}, {c}, {self._enabled}" +
-            ")"
-        )
-
-        execute(sql)
-
-        data['dif_default_id'] = self.id
-        execute(
-            "DELETE FROM dif_spec " +
-            f"WHERE dif_default = {self.id}"
-        )
-
-        for dif_spec in self._data:
-            dif_spec._db_save(execute, data)
-
-        return True
-
-    def __len__(self):
-        return len(self._data)
-
-    @property
-    def name(self):
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        self._name = name
-        self._status.modified()
-
-    @property
-    def method(self):
-        return self._method
-
-    @method.setter
-    def method(self, method):
-        self._method = method
-        self._status.modified()
-
-    @property
-    def types(self):
-        return self._types
-
-    @property
-    def dif(self):
-        return self._dif
-
-    @dif.setter
-    def dif(self, dif):
-        self._dif = dif
-        self._status.modified()
-
-    @property
-    def b(self):
-        return self._b
-
-    @b.setter
-    def b(self, b):
-        self._b = b
-        self._status.modified()
-
-    @property
-    def c(self):
-        return self._c
-
-    @c.setter
-    def c(self, c):
-        self._c = c
-        self._status.modified()
-
-    @property
-    def enabled(self):
-        return self._enabled
-
-    @enabled.setter
-    def enabled(self, enabled):
-        self._enabled = enabled
-        self._status.modified()
-
-    def new(self, index):
-        n = DIFAdisTSSpec(status=self._status)
-        self._data.insert(index, n)
-        self._status.modified()
-        return n
-
-    def delete(self, data):
-        self._data = list(
-            filter(
-                lambda x: x not in data,
-                self._data
-            )
-        )
-        self._status.modified()
-
-    def delete_i(self, indexes):
-        for ind in indexes:
-            del self._data[ind]
-        self._status.modified()
-
-    def insert(self, index, data):
-        self._data.insert(index, data)
-        self._status.modified()
-
-
-
-
-
-

src/Model/DIFAdisTS/DIFAdisTSList.py

@@ -1,66 +0,0 @@
-# DIFAdisTSList.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-from copy import copy
-from tools import trace, timer
-
-from Model.Tools.PamhyrList import PamhyrModelList
-from Model.DIFAdisTS.DIFAdisTS import DIFAdisTS
-
-class DIFAdisTSList(PamhyrModelList):
-    _sub_classes = [
-        DIFAdisTS,
-    ]
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = cls(status=data['status'])
-
-        if data is None:
-            data = {}
-
-        new._lst = DIFAdisTS._db_load(
-            execute, data
-        )
-
-        return new
-
-    def _db_save(self, execute, data=None):
-        execute("DELETE FROM dif_adists")
-
-        if data is None:
-            data = {}
-
-        for dif in self._lst:
-            dif._db_save(execute, data=data)
-
-        return True
-
-    def new(self, index):
-        n = DIFAdisTS(status=self._status)
-        self._lst.insert(index, n)
-        self._status.modified()
-        return n
-
-    @property
-    def DIF_AdisTS_List(self):
-        return self.lst
-
-
-
-

src/Model/DIFAdisTS/DIFAdisTSSpec.py

@@ -1,228 +0,0 @@
-# DIFAdisTSSpec.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-
-from tools import trace, timer
-
-from Model.Tools.PamhyrDB import SQLSubModel
-from Model.Except import NotImplementedMethodeError
-
-logger = logging.getLogger()
-
-class DIFAdisTSSpec(SQLSubModel):
-    _sub_classes = [
-    ]
-    _id_cnt = 0
-
-    def __init__(self, id: int = -1, method: str = "",
-                 status=None):
-        super(DIFAdisTSSpec, self).__init__()
-
-        self._status = status
-
-        if id == -1:
-            self.id = DIFAdisTSSpec._id_cnt
-        else:
-            self.id = id
-
-        self._method = method
-        self._reach = None
-        self._start_kp = None
-        self._end_kp = None
-        self._dif = None
-        self._b = None
-        self._c = None
-        self._enabled = True
-
-        DIFAdisTSSpec._id_cnt = max(DIFAdisTSSpec._id_cnt + 1, self.id)
-
-    @classmethod
-    def _db_create(cls, execute):
-        execute("""
-              CREATE TABLE dif_spec(
-                id INTEGER NOT NULL PRIMARY KEY,
-                dif_default INTEGER NOT NULL,
-                method TEXT NOT NULL,
-                reach INTEGER NOT NULL,
-                start_kp REAL NOT NULL,
-                end_kp REAL NOT NULL,
-                dif REAL NOT NULL,
-                b REAL,
-                c REAL,
-                enabled BOOLEAN NOT NULL,
-                FOREIGN KEY(dif_default) REFERENCES dif_adists(id),
-                FOREIGN KEY(reach) REFERENCES river_reach(id)
-              )
-            """)
-
-        return cls._create_submodel(execute)
-
-    @classmethod
-    def _db_update(cls, execute, version):
-        major, minor, release = version.strip().split(".")
-        if major == minor == "0":
-            if int(release) < 6:
-                cls._db_create(execute)
-
-        return True
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = []
-
-        table = execute(
-            "SELECT id, dif_default, method, reach, start_kp, end_kp, " +
-            "dif, b, c, enabled " +
-            "FROM dif_spec " +
-            f"WHERE dif_default = {data['dif_default_id']} "
-        )
-
-        for row in table:
-            id            = row[0]
-            method          = row[2]
-            reach         = row[3]
-            start_kp      = row[4]
-            end_kp        = row[5]
-            dif = row[6]
-            b = row[7]
-            c = row[8]
-            enabled       = (row[9] == 1)
-
-            new_spec = cls(
-                id=id,
-                method=method,
-                status=data['status']
-            )
-
-            new_spec.reach = reach
-            new_spec.start_kp = start_kp
-            new_spec.end_kp = end_kp
-            new_spec.dif = dif
-            new_spec.b = b
-            new_spec.c = c
-            new_spec.enabled = enabled
-
-            new.append(new_spec)
-
-        return new
-
-    def _db_save(self, execute, data=None):
-        dif_default = data['dif_default_id']
-
-        sql = (
-            "INSERT INTO " +
-            "dif_spec(id, dif_default, method, reach, " +
-            "start_kp, end_kp, dif, b, c, enabled) " +
-            "VALUES (" +
-            f"{self.id}, " +
-            f"{dif_default}, " +
-            f"'{self._db_format(self._method)}', " +
-            f"{self._reach}, " +
-            f"{self._start_kp}, " +
-            f"{self._end_kp}, " +
-            f"{self._dif}, " +
-            f"{self._b}, " +
-            f"{self._c}, " +
-            f"{self._enabled}" +
-            ")"
-        )
-        execute(sql)
-
-        return True
-
-    @property
-    def method(self):
-        return self._method
-
-    @method.setter
-    def method(self, method):
-        self._method = method
-        self._status.modified()
-
-    @property
-    def reach(self):
-        return self._reach
-
-    @reach.setter
-    def reach(self, reach):
-        self._reach = reach
-        self._status.modified()
-
-    @property
-    def start_kp(self):
-        return self._start_kp
-
-    @start_kp.setter
-    def start_kp(self, start_kp):
-        self._start_kp = start_kp
-        self._status.modified()
-
-    @property
-    def end_kp(self):
-        return self._end_kp
-
-    @end_kp.setter
-    def end_kp(self, end_kp):
-        self._end_kp = end_kp
-        self._status.modified()
-
-    @property
-    def dif(self):
-        return self._dif
-
-    @dif.setter
-    def dif(self, dif):
-        self._dif = dif
-        self._status.modified()
-
-    @property
-    def b(self):
-        return self._b
-
-    @b.setter
-    def b(self, b):
-        self._b = b
-        self._status.modified()
-
-    @property
-    def c(self):
-        return self._c
-
-    @c.setter
-    def c(self, c):
-        self._c = c
-        self._status.modified()
-
-    @property
-    def enabled(self):
-        return self._enabled
-
-    @enabled.setter
-    def enabled(self, enabled):
-        self._enabled = enabled
-        self._status.modified()
-
-
-
-
-
-
-
-
-

src/Model/Friction/Friction.py

@@ -43,8 +43,8 @@ class Friction(SQLSubModel):
 
         self._name = name
         self._edge = None
-        self._begin_kp = 0.0
-        self._end_kp = 0.0
+        self._begin_rk = 0.0
+        self._end_rk = 0.0
         self._begin_strickler = None
         self._end_strickler = None
 
@@ -54,8 +54,8 @@ class Friction(SQLSubModel):
           CREATE TABLE friction(
             id INTEGER NOT NULL PRIMARY KEY,
             ind INTEGER NOT NULL,
-            begin_kp REAL NOT NULL,
-            end_kp REAL NOT NULL,
+            begin_rk REAL NOT NULL,
+            end_rk REAL NOT NULL,
             reach INTEGER NOT NULL,
             begin_strickler INTEGER NOT NULL,
             end_strickler INTEGER NOT NULL,
@@ -69,6 +69,13 @@ class Friction(SQLSubModel):
 
     @classmethod
     def _db_update(cls, execute, version):
+        major, minor, release = version.strip().split(".")
+        if major == minor == "0":
+            if int(release) < 11:
+                execute("ALTER TABLE friction " +
+                        "RENAME COLUMN begin_kp TO begin_rk")
+                execute("ALTER TABLE friction RENAME COLUMN end_kp TO end_rk")
+
         return True
 
     @classmethod
@@ -80,7 +87,7 @@ class Friction(SQLSubModel):
         stricklers = data["stricklers"].stricklers
 
         table = execute(
-            "SELECT id, ind, begin_kp, end_kp, " +
+            "SELECT id, ind, begin_rk, end_rk, " +
             "begin_strickler, end_strickler " +
             f"FROM friction WHERE reach = {reach.id}"
         )
@@ -102,8 +109,8 @@ class Friction(SQLSubModel):
             # Create friction
             sec = cls(status=status)
             sec.edge = reach
-            sec.begin_kp = row[2]
-            sec.end_kp = row[3]
+            sec.begin_rk = row[2]
+            sec.end_rk = row[3]
             sec.begin_strickler = bs
             sec.end_strickler = es
 
@@ -124,11 +131,11 @@ class Friction(SQLSubModel):
 
         execute(
             "INSERT INTO " +
-            "friction(id, ind, begin_kp, end_kp, " +
+            "friction(id, ind, begin_rk, end_rk, " +
             "reach, begin_strickler, end_strickler) " +
             "VALUES (" +
             f"{self.id}, {ind}, " +
-            f"{self._begin_kp}, {self._end_kp}, " +
+            f"{self._begin_rk}, {self._end_rk}, " +
             f"{self._edge.id}, " +
             f"{b_s_id}, {e_s_id}" +
             ")"
@@ -157,10 +164,10 @@ class Friction(SQLSubModel):
     def edge(self, edge):
         self._edge = edge
         if (edge is not None and
-            self._begin_kp == 0.0 and
-                self._end_kp == 0.0):
-            self._begin_kp = self._edge.reach.get_kp_min()
-            self._end_kp = self._edge.reach.get_kp_max()
+            self._begin_rk == 0.0 and
+                self._end_rk == 0.0):
+            self._begin_rk = self._edge.reach.get_rk_min()
+            self._end_rk = self._edge.reach.get_rk_max()
         self._status.modified()
 
     def has_edge(self):
@@ -176,45 +183,45 @@ class Friction(SQLSubModel):
         return self.has_edge() and self.has_coefficient()
 
     @property
-    def begin_kp(self):
-        return self._begin_kp
+    def begin_rk(self):
+        return self._begin_rk
 
-    @begin_kp.setter
-    def begin_kp(self, begin_kp):
+    @begin_rk.setter
+    def begin_rk(self, begin_rk):
         if self._edge is None:
-            self._begin_kp = begin_kp
+            self._begin_rk = begin_rk
         else:
-            _min = self._edge.reach.get_kp_min()
-            _max = self._edge.reach.get_kp_max()
+            _min = self._edge.reach.get_rk_min()
+            _max = self._edge.reach.get_rk_max()
 
-            if _min <= begin_kp <= _max:
-                self._begin_kp = begin_kp
+            if _min <= begin_rk <= _max:
+                self._begin_rk = begin_rk
 
         self._status.modified()
 
     @property
-    def end_kp(self):
-        return self._end_kp
+    def end_rk(self):
+        return self._end_rk
 
-    @end_kp.setter
-    def end_kp(self, end_kp):
+    @end_rk.setter
+    def end_rk(self, end_rk):
         if self._edge is None:
-            self._end_kp = end_kp
+            self._end_rk = end_rk
         else:
-            _min = self._edge.reach.get_kp_min()
-            _max = self._edge.reach.get_kp_max()
+            _min = self._edge.reach.get_rk_min()
+            _max = self._edge.reach.get_rk_max()
 
-            if _min <= end_kp <= _max:
-                self._end_kp = end_kp
+            if _min <= end_rk <= _max:
+                self._end_rk = end_rk
 
         self._status.modified()
 
-    def __contains__(self, kp):
-        return self.contains_kp(kp)
+    def __contains__(self, rk):
+        return self.contains_rk(rk)
 
-    def contains_kp(self, kp):
+    def contains_rk(self, rk):
         return (
-            self._begin_kp <= kp <= self._end_kp
+            self._begin_rk <= rk <= self._end_rk
         )
 
     @property

src/Model/Friction/FrictionList.py

@@ -44,7 +44,7 @@ class FrictionList(PamhyrModelList):
             logger.info(f"Update friction TABLE from {version}")
             cls._db_update_0_0_1(execute, version)
 
-        return True
+        return cls._update_submodel(execute, version)
 
     @classmethod
     def _db_load(cls, execute, data=None):

src/Model/Geometry/Profile.py

@@ -31,7 +31,7 @@ class Profile(object):
     _id_cnt = 0
 
     def __init__(self, id: int = -1, num: int = 0,
-                 kp: float = 0.0, name: str = "",
+                 rk: float = 0.0, name: str = "",
                  code1: int = 0, code2: int = 0,
                  _type: str = "", reach=None,
                  status=None):
@@ -49,7 +49,7 @@ class Profile(object):
         self._num = int(num)
         self._code1 = int(code1)
         self._code2 = int(code2)
-        self._kp = float(kp)
+        self._rk = float(rk)
         self._name = str(name)
         self._reach = reach
         self._sl = None
@@ -136,16 +136,16 @@ class Profile(object):
         return len(self.points)
 
     @property
-    def kp(self):
+    def rk(self):
         """
         Returns:
             Kilometer point.
         """
-        return self._kp
+        return self._rk
 
-    @kp.setter
-    def kp(self, value: float):
-        self._kp = float(value)
+    @rk.setter
+    def rk(self, value: float):
+        self._rk = float(value)
         self._status.modified()
 
     @property

src/Model/Geometry/ProfileXYZ.py

@@ -41,7 +41,7 @@ class ProfileXYZ(Profile, SQLSubModel):
     def __init__(self,
                  id: int = -1,
                  name: str = "",
-                 kp: float = 0.,
+                 rk: float = 0.,
                  reach=None,
                  num=0,
                  nb_point: int = 0,
@@ -53,7 +53,7 @@ class ProfileXYZ(Profile, SQLSubModel):
             num: The number of this profile
             code1: The interpolation code 1
             code2: The interpolation code 2
-            kp: Kilometer point
+            rk: Kilometer point
             name: The name of profile
 
         Returns:
@@ -63,7 +63,7 @@ class ProfileXYZ(Profile, SQLSubModel):
             id=id,
             num=num,
             name=name,
-            kp=kp,
+            rk=rk,
             code1=code1, code2=code2,
             _type="XYZ",
             reach=reach,
@@ -78,7 +78,7 @@ class ProfileXYZ(Profile, SQLSubModel):
             ind INTEGER NOT NULL,
             name TEXT,
             reach INTEGER NOT NULL,
-            kp REAL NOT NULL,
+            rk REAL NOT NULL,
             num INTEGER NOT NULL,
             code1 INTEGER NOT NULL,
             code2 INTEGER NOT NULL,
@@ -94,7 +94,8 @@ class ProfileXYZ(Profile, SQLSubModel):
     def _db_update(cls, execute, version):
         major, minor, release = version.strip().split(".")
         if major == minor == "0":
-            if int(release) < 2:
+            rl = int(release)
+            if rl < 2:
                 execute(
                     """
                     ALTER TABLE geometry_profileXYZ
@@ -103,6 +104,14 @@ class ProfileXYZ(Profile, SQLSubModel):
                     """
                 )
 
+            if rl < 11:
+                execute(
+                    """
+                    ALTER TABLE geometry_profileXYZ
+                    RENAME COLUMN kp TO rk
+                    """
+                )
+
         return cls._update_submodel(execute, version)
 
     @classmethod
@@ -112,7 +121,7 @@ class ProfileXYZ(Profile, SQLSubModel):
         reach = data["reach"]
 
         table = execute(
-            "SELECT id, ind, name, kp, num, code1, code2, sl " +
+            "SELECT id, ind, name, rk, num, code1, code2, sl " +
             "FROM geometry_profileXYZ " +
             f"WHERE reach = {reach.id}"
         )
@@ -121,7 +130,7 @@ class ProfileXYZ(Profile, SQLSubModel):
             id = row[0]
             ind = row[1]
             name = row[2]
-            kp = row[3]
+            rk = row[3]
             num = row[5]
             code1 = row[5]
             code2 = row[6]
@@ -129,7 +138,7 @@ class ProfileXYZ(Profile, SQLSubModel):
 
             new = cls(
                 id=id, num=num,
-                name=name, kp=kp,
+                name=name, rk=rk,
                 code1=code1, code2=code2,
                 reach=reach,
                 status=status
@@ -159,10 +168,10 @@ class ProfileXYZ(Profile, SQLSubModel):
         sql = (
             "INSERT OR REPLACE INTO " +
             "geometry_profileXYZ(id, ind, name, reach, " +
-            "kp, num, code1, code2, sl) " +
+            "rk, num, code1, code2, sl) " +
             "VALUES (" +
             f"{self.id}, {ind}, '{self._db_format(self._name)}', " +
-            f"{self.reach.id}, {self.kp}, {self.num}, " +
+            f"{self.reach.id}, {self.rk}, {self.num}, " +
             f"{self.code1}, {self.code1}, {sl}" +
             ")"
         )
@@ -187,19 +196,19 @@ class ProfileXYZ(Profile, SQLSubModel):
         try:
             if len(header) == 0:
                 name = data[0]
-                kp = data[1]
+                rk = data[1]
                 reach = data[2]
                 status = data[3]
 
                 profile = cls(
                     id=-1,
                     name=name,
-                    kp=kp,
+                    rk=rk,
                     reach=reach,
                     status=status
                 )
             else:
-                valid_header = {'name', 'reach', 'kp', 'status'}
+                valid_header = {'name', 'reach', 'rk', 'status'}
                 d = {}
                 for i, v in enumerate(data):
                     h = header[i].strip().lower().split(' ')[0]
@@ -323,7 +332,7 @@ class ProfileXYZ(Profile, SQLSubModel):
             logger.debug(f"{e}")
             raise IndexError(
                 f"Invalid point name: {name} " +
-                f"for profile ({self.id}) kp = {self.kp}"
+                f"for profile ({self.id}) rk = {self.rk}"
             )
 
     def has_standard_named_points(self):

src/Model/Geometry/Reach.py

@@ -141,10 +141,10 @@ class Reach(SQLSubModel):
     def profiles(self, profiles):
         self._profiles = profiles
 
-    def get_profiles_from_kp(self, kp):
+    def get_profiles_from_rk(self, rk):
         return list(
             filter(
-                lambda p: p.kp == kp, self.profiles
+                lambda p: p.rk == rk, self.profiles
             )
         )
 
@@ -335,18 +335,18 @@ class Reach(SQLSubModel):
             )
         )
 
-    def get_kp(self):
-        """List of profiles kp
+    def get_rk(self):
+        """List of profiles rk
 
         Returns:
-            List of profiles kp
+            List of profiles rk
         """
-        return [profile.kp for profile in self.profiles]
+        return [profile.rk for profile in self.profiles]
 
-    def get_kp_complete_profiles(self):
+    def get_rk_complete_profiles(self):
         return list(
             map(
-                lambda profile: profile.kp,
+                lambda profile: profile.rk,
                 filter(
                     lambda profile: len(profile) > 0,
                     self.profiles
@@ -354,41 +354,41 @@ class Reach(SQLSubModel):
             )
         )
 
-    def get_kp_min(self):
-        if len(self.get_kp()) > 0:
-            return min(self.get_kp())
+    def get_rk_min(self):
+        if len(self.get_rk()) > 0:
+            return min(self.get_rk())
         else:
             return 0.0
 
-    def get_kp_max(self):
-        if len(self.get_kp()) > 0:
-            return max(self.get_kp())
+    def get_rk_max(self):
+        if len(self.get_rk()) > 0:
+            return max(self.get_rk())
         else:
             return 0.0
 
-    def inter_profiles_kp(self):
-        profiles = sorted(self.profiles, key=lambda p: p.kp)
+    def inter_profiles_rk(self):
+        profiles = sorted(self.profiles, key=lambda p: p.rk)
         first = profiles[0]
         last = profiles[-1]
 
-        res_kp = [first.kp]
+        res_rk = [first.rk]
 
         profiles = iter(profiles)
         previous = next(profiles)
 
         for profile in profiles:
-            prev = previous.kp
-            curr = profile.kp
+            prev = previous.rk
+            curr = profile.rk
 
-            diff = abs(previous.kp - profile.kp)
+            diff = abs(previous.rk - profile.rk)
 
-            new = previous.kp + (diff / 2.0)
-            res_kp.append(new)
+            new = previous.rk + (diff / 2.0)
+            res_rk.append(new)
 
             previous = profile
 
-        res_kp.append(last.kp)
-        return res_kp
+        res_rk.append(last.rk)
+        return res_rk
 
     # Sediment Layers
 
@@ -536,7 +536,7 @@ class Reach(SQLSubModel):
     def sort(self, is_reversed: bool = False):
         self.profiles = sorted(
             self.profiles,
-            key=lambda profile: profile.kp,
+            key=lambda profile: profile.rk,
             reverse=is_reversed
         )
         self._status.modified()
@@ -613,7 +613,7 @@ class Reach(SQLSubModel):
 
         self.profiles = profiles + self.profiles
         self._update_profile_numbers()
-        self._recompute_kp()
+        self._recompute_rk()
 
         return profiles
 
@@ -633,7 +633,7 @@ class Reach(SQLSubModel):
         try:
             list_profile, list_header = self.read_file_st(str(file_path_name))
             profile_header = ["num", "code1",
-                              "code2", "nb_point", "kp", "name"]
+                              "code2", "nb_point", "rk", "name"]
 
             if list_profile and list_header:
                 for ind, profile in enumerate(list_profile):
@@ -721,12 +721,12 @@ class Reach(SQLSubModel):
                 c1 = f"{profile.code1:>6}"
                 c2 = f"{profile.code2:>6}"
                 t = f"{len(profile.points):>6}"
-                kp = f"{profile.kp:>12f}"[0:12]
+                rk = f"{profile.rk:>12f}"[0:12]
                 pname = profile.name
                 if profile.name == "":
                     pname = f"p{profile.id:>3}".replace(" ", "0")
 
-                st.write(f"{num}{c1}{c2}{t} {kp} {pname}\n")
+                st.write(f"{num}{c1}{c2}{t} {rk} {pname}\n")
 
                 for point in profile.points:
                     x = f"{point.x:<12.4f}"[0:12]
@@ -745,15 +745,15 @@ class Reach(SQLSubModel):
         last = self.profile(len(self) - 1)
 
         z_first = first.z_min()
-        kp_first = first.kp
+        rk_first = first.rk
 
         z_last = last.z_min()
-        kp_last = last.kp
+        rk_last = last.rk
 
         return (
             (z_last - z_first)
             /
-            (kp_last - kp_first)
+            (rk_last - rk_first)
         )
 
     def get_incline_mean(self):
@@ -764,15 +764,15 @@ class Reach(SQLSubModel):
 
         for profile in profiles[1:]:
             z_first = previous.z_min()
-            kp_first = previous.kp
+            rk_first = previous.rk
 
             z_last = profile.z_min()
-            kp_last = profile.kp
+            rk_last = profile.rk
 
             incline_acc += (
                 (z_last - z_first)
                 /
-                (kp_last - kp_first)
+                (rk_last - rk_first)
             )
 
             previous = profile
@@ -787,15 +787,15 @@ class Reach(SQLSubModel):
 
         for profile in profiles[1:]:
             z_first = previous.z_min()
-            kp_first = previous.kp
+            rk_first = previous.rk
 
             z_last = profile.z_min()
-            kp_last = profile.kp
+            rk_last = profile.rk
 
             incline_acc += [
                 (z_last - z_first)
                 /
-                (kp_last - kp_first)
+                (rk_last - rk_first)
             ]
 
             previous = profile
@@ -811,15 +811,15 @@ class Reach(SQLSubModel):
 
         for profile in profiles[1:]:
             z_first = previous.z_min()
-            kp_first = previous.kp
+            rk_first = previous.rk
 
             z_last = profile.z_min()
-            kp_last = profile.kp
+            rk_last = profile.rk
 
             incline_acc += [
                 (z_last - z_first)
                 /
-                (kp_last - kp_first)
+                (rk_last - rk_first)
             ]
 
             previous = profile
@@ -847,14 +847,14 @@ class Reach(SQLSubModel):
             logger_exception(e)
             return 0
 
-    def _recompute_kp(self, offset=0.0):
-        self._recompute_kp_no_gl(offset=offset)
+    def _recompute_rk(self, offset=0.0):
+        self._recompute_rk_no_gl(offset=offset)
 
-    def _recompute_kp_no_gl(self, offset=0.0):
+    def _recompute_rk_no_gl(self, offset=0.0):
         profiles = iter(self.profiles)
 
         previous = next(profiles)
-        previous.kp = offset
+        previous.rk = offset
 
         for profile in profiles:
             prev_points = previous.points
@@ -865,5 +865,5 @@ class Reach(SQLSubModel):
                 prev_points[-1].dist_2d(curr_points[-1])
             ) / 2.0
 
-            profile.kp = previous.kp + dist
+            profile.rk = previous.rk + dist
             previous = profile

src/Model/HydraulicStructures/HydraulicStructures.py

@@ -50,8 +50,8 @@ class HydraulicStructure(SQLSubModel):
             self.id = id
 
         self._name = name
-        self._input_kp = None
-        self._output_kp = None
+        self._input_rk = None
+        self._output_rk = None
         self._input_reach = None
         self._output_reach = None
         self._enabled = True
@@ -64,14 +64,13 @@ class HydraulicStructure(SQLSubModel):
 
     @classmethod
     def _db_create(cls, execute):
-
         execute("""
           CREATE TABLE hydraulic_structures(
             id INTEGER NOT NULL PRIMARY KEY,
             name TEXT NOT NULL,
             enabled BOOLEAN NOT NULL,
-            input_kp REAL NOT NULL,
-            output_kp REAL NOT NULL,
+            input_rk REAL NOT NULL,
+            output_rk REAL NOT NULL,
             input_reach INTEGER,
             output_reach INTEGER,
             FOREIGN KEY(input_reach) REFERENCES river_reach(id),
@@ -85,9 +84,25 @@ class HydraulicStructure(SQLSubModel):
     def _db_update(cls, execute, version):
         major, minor, release = version.strip().split(".")
         if major == minor == "0":
-            if int(release) < 6:
+            rl = int(release)
+
+            if rl < 6:
                 cls._db_create(execute)
 
+            if rl < 11:
+                execute(
+                    """
+                    ALTER TABLE hydraulic_structures
+                    RENAME COLUMN input_kp TO input_rk
+                    """
+                )
+                execute(
+                    """
+                    ALTER TABLE hydraulic_structures
+                    RENAME COLUMN output_kp TO output_rk
+                    """
+                )
+
         return True
 
     @classmethod
@@ -96,7 +111,7 @@ class HydraulicStructure(SQLSubModel):
 
         table = execute(
             "SELECT id, name, enabled, " +
-            "input_kp, output_kp, " +
+            "input_rk, output_rk, " +
             "input_reach, output_reach " +
             "FROM hydraulic_structures "
         )
@@ -107,8 +122,8 @@ class HydraulicStructure(SQLSubModel):
             hs_id = next(it)
             name = next(it)
             enabled = (next(it) == 1)
-            input_kp = next(it)
-            output_kp = next(it)
+            input_rk = next(it)
+            output_rk = next(it)
             input_reach_id = next(it)
             output_reach_id = next(it)
 
@@ -119,8 +134,8 @@ class HydraulicStructure(SQLSubModel):
             )
 
             hs.enabled = enabled
-            hs.input_kp = input_kp if input_kp != -1 else None
-            hs.output_kp = output_kp if output_kp != -1 else None
+            hs.input_rk = input_rk if input_rk != -1 else None
+            hs.output_rk = output_rk if output_rk != -1 else None
 
             hs.input_reach, hs.output_reach = reduce(
                 lambda acc, n: (
@@ -139,7 +154,6 @@ class HydraulicStructure(SQLSubModel):
         return new
 
     def _db_save(self, execute, data=None):
-        print("save hs unit")
         execute(f"DELETE FROM hydraulic_structures WHERE id = {self.id}")
 
         input_reach_id = -1
@@ -150,24 +164,24 @@ 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
+        input_rk = -1
+        if self.input_rk is not None:
+            input_rk = self.input_rk
 
-        output_kp = -1
-        if self.output_kp is not None:
-            output_kp = self.output_kp
+        output_rk = -1
+        if self.output_rk is not None:
+            output_rk = self.output_rk
 
         sql = (
             "INSERT INTO " +
             "hydraulic_structures(" +
-            "  id, name, enabled, input_kp, output_kp, " +
+            "  id, name, enabled, input_rk, output_rk, " +
             "  input_reach, output_reach" +
             ") " +
             "VALUES (" +
             f"{self.id}, '{self._db_format(self._name)}', " +
             f"{self._db_format(self.enabled)}, " +
-            f"{input_kp}, {output_kp}, " +
+            f"{input_rk}, {output_rk}, " +
             f"{input_reach_id}, {output_reach_id}" +
             ")"
         )
@@ -200,24 +214,24 @@ class HydraulicStructure(SQLSubModel):
         self._status.modified()
 
     @property
-    def input_kp(self):
-        return self._input_kp
+    def input_rk(self):
+        return self._input_rk
 
-    @input_kp.setter
-    def input_kp(self, input_kp):
-        if input_kp is not None:
-            input_kp = float(input_kp)
+    @input_rk.setter
+    def input_rk(self, input_rk):
+        if input_rk is not None:
+            input_rk = float(input_rk)
 
-        self._input_kp = input_kp
+        self._input_rk = input_rk
         self._status.modified()
 
     @property
-    def output_kp(self):
-        return self._output_kp
+    def output_rk(self):
+        return self._output_rk
 
-    @output_kp.setter
-    def output_kp(self, output_kp):
-        self._output_kp = output_kp
+    @output_rk.setter
+    def output_rk(self, output_rk):
+        self._output_rk = output_rk
         self._status.modified()
 
     @property

src/Model/InitialConditions/InitialConditions.py

@@ -30,7 +30,7 @@ logger = logging.getLogger()
 class Data(SQLSubModel):
     def __init__(self, name: str = "",
                  comment: str = "", reach=None,
-                 kp: float = 0.0, discharge: float = 0.0,
+                 rk: float = 0.0, discharge: float = 0.0,
                  height: float = 0.0,
                  status=None):
         super(Data, self).__init__()
@@ -42,14 +42,14 @@ class Data(SQLSubModel):
         self._name = name
         self._comment = comment
 
-        self._kp = kp
+        self._rk = rk
         self._discharge = discharge
         self._speed = 0.0
         self._elevation = 0.0
         self._height = height
 
-        if self._kp != 0.0:
-            self._update_from_kp()
+        if self._rk != 0.0:
+            self._update_from_rk()
         if self._height != 0.0:
             self._update_from_height()
         if self._discharge != 0.0:
@@ -64,7 +64,7 @@ class Data(SQLSubModel):
             name TEXT NOT NULL,
             comment TEXT NOT NULL,
             reach INTEGER,
-            kp REAL NOT NULL,
+            rk REAL NOT NULL,
             discharge REAL NOT NULL,
             height REAL NOT NULL,
             FOREIGN KEY(reach) REFERENCES river_reach(id)
@@ -75,13 +75,20 @@ class Data(SQLSubModel):
 
     @classmethod
     def _db_update(cls, execute, version):
+        major, minor, release = version.strip().split(".")
+        if major == minor == "0":
+            if int(release) < 11:
+                execute(
+                    "ALTER TABLE initial_conditions RENAME COLUMN kp TO rk"
+                )
+
         return cls._update_submodel(execute, version)
 
     @classmethod
     def _db_load(cls, execute, data=None):
         id = data["reach"].id
         table = execute(
-            "SELECT ind, name, comment, kp, discharge, height " +
+            "SELECT ind, name, comment, rk, discharge, height " +
             "FROM initial_conditions " +
             f"WHERE reach = {id}"
         )
@@ -95,7 +102,7 @@ class Data(SQLSubModel):
             ind = row[0]
             name = row[1]
             comment = row[2]
-            kp = row[3]
+            rk = row[3]
             discharge = row[4]
             height = row[5]
 
@@ -104,7 +111,7 @@ class Data(SQLSubModel):
                 status=data["status"],
                 name=name,
                 comment=comment,
-                kp=kp,
+                rk=rk,
                 discharge=discharge,
                 height=height,
             )
@@ -118,12 +125,12 @@ class Data(SQLSubModel):
 
         execute(
             "INSERT INTO " +
-            "initial_conditions(ind, name, comment, kp, " +
+            "initial_conditions(ind, name, comment, rk, " +
             "discharge, height, reach) " +
             "VALUES (" +
             f"{ind}, '{self._db_format(self.name)}', " +
             f"'{self._db_format(self._comment)}', " +
-            f"{self._kp}, {self._discharge}, {self._height}, " +
+            f"{self._rk}, {self._discharge}, {self._height}, " +
             f"{self._reach.id}" +
             ")"
         )
@@ -134,13 +141,12 @@ class Data(SQLSubModel):
         new = Data(
             name=self.name,
             comment=self._comment,
-            kp=self._kp,
+            rk=self._rk,
             discharge=self._discharge,
             height=self._height,
             reach=self._reach,
             status=self._status,
         )
-
         return new
 
     @property
@@ -154,8 +160,8 @@ class Data(SQLSubModel):
             val = self._name
         elif key == "comment":
             val = self._comment
-        elif key == "kp":
-            val = self._kp
+        elif key == "rk":
+            val = self._rk
         elif key == "speed":
             val = self._speed
         elif key == "discharge":
@@ -168,7 +174,7 @@ class Data(SQLSubModel):
         return val
 
     def _update_get_min(self):
-        profile = self._reach.reach.get_profiles_from_kp(self._kp)
+        profile = self._reach.reach.get_profiles_from_rk(self._rk)
         if len(profile) > 0:
             min = profile[0].z_min()
         else:
@@ -176,7 +182,7 @@ class Data(SQLSubModel):
 
         return min
 
-    def _update_from_kp(self):
+    def _update_from_rk(self):
         min = self._update_get_min()
         self._elevation = min + self._height
 
@@ -197,9 +203,9 @@ class Data(SQLSubModel):
             self._name = str(value)
         elif key == "comment":
             self._comment = str(value)
-        elif key == "kp":
-            self._kp = float(value)
-            self._update_from_kp()
+        elif key == "rk":
+            self._rk = float(value)
+            self._update_from_rk()
         elif key == "speed":
             # Not supposed to be modified
             self._speed = float(value)
@@ -298,10 +304,10 @@ class InitialConditions(SQLSubModel):
         self._data.insert(index, n)
         self._status.modified()
 
-    def new_from_data(self, kp, discharge, elevation):
+    def new_from_data(self, rk, discharge, elevation):
         n = Data(reach=self._reach, status=self._status)
 
-        n['kp'] = kp
+        n['rk'] = rk
         n['discharge'] = discharge
         n['elevation'] = elevation
 
@@ -344,8 +350,8 @@ class InitialConditions(SQLSubModel):
             )
         )
 
-    def get_kp(self):
-        return self._data_get("kp")
+    def get_rk(self):
+        return self._data_get("rk")
 
     def get_elevation(self):
         return self._data_get("elevation")
@@ -353,10 +359,10 @@ class InitialConditions(SQLSubModel):
     def get_discharge(self):
         return self._data_get("discharge")
 
-    def _sort_by_z_and_kp(self, profiles):
+    def _sort_by_z_and_rk(self, profiles):
         profiles.sort(
             reverse=False,
-            key=lambda p: p.kp
+            key=lambda p: p.rk
         )
 
         first_z = profiles[0].z()
@@ -365,87 +371,107 @@ class InitialConditions(SQLSubModel):
         if first_z > last_z:
             profiles.sort(
                 reverse=True,
-                key=lambda p: p.kp
+                key=lambda p: p.rk
             )
 
-    def generate_growing_constante_height(self, height: float):
-        self._data = []
+    def generate_growing_constante_height(self, height: float,
+                                          compute_discharge: bool):
 
         profiles = self._reach.reach.profiles.copy()
-        self._sort_by_z_and_kp(profiles)
+        self._sort_by_z_and_rk(profiles)
+
+        previous_elevation = -99999.99
+
+        data_discharge = {}
+        if not compute_discharge:
+            if len(self._data) == 0:
+                for profile in profiles:
+                    data_discharge[profile.rk] = 0.0
+            else:
+                for data in self._data:
+                    data_discharge[data["rk"]] = data["discharge"]
 
         incline = self._reach.reach.get_incline_median_mean()
         logger.debug(f"incline = {incline}")
-
-        previous_elevation = -99999.99
+        self._data = []
         for profile in profiles:
             width = profile.width_approximation()
             strickler = 25
-            discharge = (
-                ((width * 0.8)
-                 * strickler
-                 * (height ** (5/3))
-                 * (abs(incline) ** (0.5)))
-            )
+
+            if not compute_discharge:
+                discharge = data_discharge[profile.rk]
+            else:
+                discharge = (
+                    ((width * 0.8)
+                     * strickler
+                     * (height ** (5/3))
+                     * (abs(incline) ** (0.5)))
+                )
 
             elevation = max(
                 profile.z_min() + height,
                 previous_elevation
             )
 
-            logger.debug(f"({profile.kp}):")
+            logger.debug(f"({profile.rk}):")
             logger.debug(f"  width  = {width}")
             logger.debug(f"  strickler = {strickler}")
             logger.debug(f"  discharge = {discharge}")
 
             new = Data(reach=self._reach, status=self._status)
-            new["kp"] = profile.kp
+            new["rk"] = profile.rk
             new["discharge"] = discharge
-
             new["elevation"] = elevation
 
-            self._data.append(new)
             previous_elevation = elevation
+            self._data.append(new)
 
         self._generate_resort_data(profiles)
 
-    def generate_discharge(self, discharge: float):
-        self._data = []
+    def generate_discharge(self, discharge: float, compute_height: bool):
 
-        self._generate_height_estimation_from_discharge(
-            discharge
-        )
-
-    def _generate_height_estimation_from_discharge(self, discharge: float):
         profiles = self._reach.reach.profiles.copy()
-        self._sort_by_z_and_kp(profiles)
+        self._sort_by_z_and_rk(profiles)
 
         previous_elevation = -99999.99
 
+        data_height = {}
+        if not compute_height:
+            if len(self._data) == 0:
+                for profile in profiles:
+                    data_height[profile.rk] = 0.0
+            else:
+                for data in self._data:
+                    data_height[data["rk"]] = data["height"]
+
         incline = self._reach.reach.get_incline_median_mean()
         logger.debug(f"incline = {incline}")
-
+        self._data = []
         for profile in profiles:
             width = profile.width_approximation()
             strickler = 25
-            height = (
-                discharge
-                /
-                ((width * 0.8) * strickler * (abs(incline) ** (0.5)))
-            ) ** (0.6)
+
+            if not compute_height:
+                height = data_height[profile.rk]
+            else:
+                height = (
+                    discharge
+                    /
+                    ((width * 0.8) * strickler * (abs(incline) ** (0.5)))
+                ) ** (0.6)
 
             elevation = max(
                 profile.z_min() + height,
                 previous_elevation
             )
 
-            logger.debug(f"({profile.kp}):")
+            logger.debug(f"({profile.rk}):")
             logger.debug(f"  width  = {width}")
             logger.debug(f"  strickler = {strickler}")
             logger.debug(f"  height = {height}")
 
             new = Data(reach=self._reach, status=self._status)
-            new["kp"] = profile.kp
+            new["rk"] = profile.rk
             new["discharge"] = discharge
             new["elevation"] = elevation
 
@@ -456,10 +482,10 @@ class InitialConditions(SQLSubModel):
 
     def _generate_resort_data(self, profiles):
         is_reverse = False
-        if profiles[0].kp > profiles[-1].kp:
+        if profiles[0].rk > profiles[-1].rk:
             is_reverse = True
 
         self._data.sort(
             reverse=not is_reverse,
-            key=lambda d: d['kp']
+            key=lambda d: d['rk']
         )

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py

@@ -1,272 +0,0 @@
-# InitialConditionsAdisTS.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-from functools import reduce
-
-from tools import trace, timer, old_pamhyr_date_to_timestamp
-
-from Model.Tools.PamhyrDB import SQLSubModel
-from Model.Except import NotImplementedMethodeError
-
-from Model.InitialConditionsAdisTS.InitialConditionsAdisTSSpec import ICAdisTSSpec
-
-logger = logging.getLogger()
-
-class InitialConditionsAdisTS(SQLSubModel):
-    _sub_classes = [
-        ICAdisTSSpec,
-    ]
-    _id_cnt = 0
-
-    def __init__(self, id: int = -1, name: str = "default",
-                 pollutant: int = -1, status=None):
-        super(InitialConditionsAdisTS, self).__init__()
-
-        self._status = status
-
-        if id == -1:
-            self.id = InitialConditionsAdisTS._id_cnt
-        else:
-            self.id = id
-
-        self._name = name
-        self._pollutant = pollutant
-        self._concentration = None
-        self._eg = None
-        self._em = None
-        self._ed = None
-        self._enabled = True
-        self._data = []
-
-        InitialConditionsAdisTS._id_cnt = max(
-            InitialConditionsAdisTS._id_cnt + 1,
-            self.id
-        )
-
-    @classmethod
-    def _db_create(cls, execute):
-        execute("""
-                  CREATE TABLE initial_conditions_adists(
-                    id INTEGER NOT NULL PRIMARY KEY,
-                    pollutant INTEGER NOT NULL,
-                    name TEXT NOT NULL,
-                    concentration REAL NOT NULL,
-                    eg REAL NOT NULL,
-                    em REAL NOT NULL,
-                    ed REAL NOT NULL,
-                    enabled BOOLEAN NOT NULL,
-                    FOREIGN KEY(pollutant) REFERENCES Pollutants(id)
-                  )
-                """)
-
-        return cls._create_submodel(execute)
-
-    @classmethod
-    def _db_update(cls, execute, version):
-        major, minor, release = version.strip().split(".")
-        if major == minor == "0":
-            if int(release) < 6:
-                cls._db_create(execute)
-
-        return True
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = []
-
-        table = execute(
-            "SELECT id, pollutant, name, concentration, eg, em, ed, " +
-            "enabled " +
-            "FROM initial_conditions_adists"
-        )
-
-        if table is not None:
-            for row in table:
-                IC_id = row[0]
-                pollutant = row[1]
-                name = row[2]
-                concentration = row[3]
-                eg = row[4]
-                em = row[5]
-                ed = row[6]
-                enabled = (row[7] == 1)
-
-                IC = cls(
-                    id=IC_id,
-                    name=name,
-                    status=data['status']
-                )
-
-                IC.pollutant = pollutant
-                IC.concentration = concentration
-                IC.eg = eg
-                IC.em = em
-                IC.ed = ed
-                IC.enabled = enabled
-
-                data['ic_default_id'] = IC_id
-                IC._data = ICAdisTSSpec._db_load(execute, data)
-
-                new.append(IC)
-
-        return new
-
-    def _db_save(self, execute, data=None):
-        execute(f"DELETE FROM initial_conditions_adists WHERE id = {self.id}")
-
-        pollutant = -1
-        if self.pollutant is not None:
-            pollutant = self.pollutant
-
-        concentration = -1.
-        if self.concentration is not None:
-            concentration = self.concentration
-
-        eg = -1.
-        if self.eg is not None:
-            eg = self.eg
-
-        em = -1.
-        if self.em is not None:
-            em = self.em
-
-        ed = -1.
-        if self.ed is not None:
-            ed = self.ed
-
-        sql = (
-            "INSERT INTO " +
-            "initial_conditions_adists(" +
-            "id, pollutant, name, concentration, " +
-            "eg, em, ed, enabled" +
-            ") " +
-            "VALUES (" +
-            f"{self.id}, {pollutant}, '{self._db_format(self._name)}', " +
-            f"{concentration}, {eg}, {em}, {ed}, {self._enabled}" +
-            ")"
-        )
-
-        execute(sql)
-
-        data['ic_default_id'] = self.id
-        execute(
-            "DELETE FROM initial_conditions_spec " +
-            f"WHERE ic_default = {self.id}"
-        )
-
-        for ic_spec in self._data:
-            ic_spec._db_save(execute, data)
-
-        return True
-
-    def __len__(self):
-        return len(self._data)
-
-    @property
-    def name(self):
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        self._name = name
-        self._status.modified()
-
-    @property
-    def pollutant(self):
-        return self._pollutant
-
-    @pollutant.setter
-    def pollutant(self, pollutant):
-        self._pollutant = pollutant
-        self._status.modified()
-
-    @property
-    def concentration(self):
-        return self._concentration
-
-    @concentration.setter
-    def concentration(self, concentration):
-        self._concentration = concentration
-        self._status.modified()
-
-    @property
-    def eg(self):
-        return self._eg
-
-    @eg.setter
-    def eg(self, eg):
-        self._eg = eg
-        self._status.modified()
-
-    @property
-    def em(self):
-        return self._em
-
-    @em.setter
-    def em(self, em):
-        self._em = em
-        self._status.modified()
-
-    @property
-    def ed(self):
-        return self._ed
-
-    @ed.setter
-    def ed(self, ed):
-        self._ed = ed
-        self._status.modified()
-
-    @property
-    def enabled(self):
-        return self._enabled
-
-    @enabled.setter
-    def enabled(self, enabled):
-        self._enabled = enabled
-        self._status.modified()
-
-    def new(self, index):
-        n = ICAdisTSSpec(status=self._status)
-        self._data.insert(index, n)
-        self._status.modified()
-        return n
-
-    def delete(self, data):
-        self._data = list(
-            filter(
-                lambda x: x not in data,
-                self._data
-            )
-        )
-        self._status.modified()
-
-    def delete_i(self, indexes):
-        for ind in indexes:
-            del self._data[ind]
-        self._status.modified()
-
-    def insert(self, index, data):
-        self._data.insert(index, data)
-        self._status.modified()
-
-
-
-
-
-

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSList.py

@@ -1,66 +0,0 @@
-# InitialConditionsAdisTSList.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-from copy import copy
-from tools import trace, timer
-
-from Model.Tools.PamhyrList import PamhyrModelList
-from Model.InitialConditionsAdisTS.InitialConditionsAdisTS import InitialConditionsAdisTS
-
-class InitialConditionsAdisTSList(PamhyrModelList):
-    _sub_classes = [
-        InitialConditionsAdisTS,
-    ]
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = cls(status=data['status'])
-
-        if data is None:
-            data = {}
-
-        new._lst = InitialConditionsAdisTS._db_load(
-            execute, data
-        )
-
-        return new
-
-    def _db_save(self, execute, data=None):
-        execute("DELETE FROM initial_conditions_adists")
-
-        if data is None:
-            data = {}
-
-        for ic in self._lst:
-            ic._db_save(execute, data=data)
-
-        return True
-
-    def new(self, index, pollutant):
-        n = InitialConditionsAdisTS(pollutant=pollutant, status=self._status)
-        self._lst.insert(index, n)
-        self._status.modified()
-        return n
-
-    @property
-    def Initial_Conditions_List(self):
-        return self.lst
-
-
-
-

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py

@@ -1,258 +0,0 @@
-# InitialConditionsAdisTSSpec.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-
-from tools import trace, timer
-
-from Model.Tools.PamhyrDB import SQLSubModel
-from Model.Except import NotImplementedMethodeError
-
-logger = logging.getLogger()
-
-class ICAdisTSSpec(SQLSubModel):
-    _sub_classes = [
-    ]
-    _id_cnt = 0
-
-    def __init__(self, id: int = -1, name: str = "",
-                 status=None):
-        super(ICAdisTSSpec, self).__init__()
-
-        self._status = status
-
-        if id == -1:
-            self.id = ICAdisTSSpec._id_cnt
-        else:
-            self.id = id
-
-        self._name_section = name
-        self._reach = None
-        self._start_kp = None
-        self._end_kp = None
-        self._concentration = None
-        self._eg = None
-        self._em = None
-        self._ed = None
-        self._rate = None
-        self._enabled = True
-
-        ICAdisTSSpec._id_cnt = max(ICAdisTSSpec._id_cnt + 1, self.id)
-
-    @classmethod
-    def _db_create(cls, execute):
-        execute("""
-              CREATE TABLE initial_conditions_spec(
-                id INTEGER NOT NULL PRIMARY KEY,
-                ic_default INTEGER NOT NULL,
-                name TEXT NOT NULL,
-                reach INTEGER NOT NULL,
-                start_kp REAL NOT NULL,
-                end_kp REAL NOT NULL,
-                concentration REAL NOT NULL,
-                eg REAL NOT NULL,
-                em REAL NOT NULL,
-                ed REAL NOT NULL,
-                rate REAL NOT NULL,
-                enabled BOOLEAN NOT NULL,
-                FOREIGN KEY(ic_default) REFERENCES initial_conditions_adists(id),
-                FOREIGN KEY(reach) REFERENCES river_reach(id)
-              )
-            """)
-
-        return cls._create_submodel(execute)
-
-    @classmethod
-    def _db_update(cls, execute, version):
-        major, minor, release = version.strip().split(".")
-        if major == minor == "0":
-            if int(release) < 6:
-                cls._db_create(execute)
-
-        return True
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = []
-
-        table = execute(
-            "SELECT id, ic_default, name, reach, start_kp, end_kp, " +
-            "concentration, eg, em, ed, rate, enabled " +
-            "FROM initial_conditions_spec " +
-            f"WHERE ic_default = {data['ic_default_id']} "
-        )
-
-        for row in table:
-            id            = row[0]
-            name          = row[2]
-            reach         = row[3]
-            start_kp      = row[4]
-            end_kp        = row[5]
-            concentration = row[6]
-            eg            = row[7]
-            em            = row[8]
-            ed            = row[9]
-            rate          = row[10]
-            enabled       = (row[11] == 1)
-
-            #new_spec = [name, reach, start_kp, end_kp, concentration, eg, em, ed, rate, enabled]
-
-            new_spec = cls(
-                id=id,
-                name=name,
-                status=data['status']
-            )
-
-            new_spec.reach = reach
-            new_spec.start_kp = start_kp
-            new_spec.end_kp = end_kp
-            new_spec.concentration = concentration
-            new_spec.eg = eg
-            new_spec.em = em
-            new_spec.ed = ed
-            new_spec.rate = rate
-            new_spec.enabled = enabled
-
-            new.append(new_spec)
-
-        return new
-
-    def _db_save(self, execute, data=None):
-        ic_default = data['ic_default_id']
-
-        sql = (
-            "INSERT INTO " +
-            "initial_conditions_spec(id, ic_default, name, reach, " +
-            "start_kp, end_kp, concentration, eg, em, ed, rate, enabled) " +
-            "VALUES (" +
-            f"{self.id}, " +
-            f"{ic_default}, " +
-            f"'{self._db_format(self._name_section)}', " +
-            f"{self._reach}, " +
-            f"{self._start_kp}, " +
-            f"{self._end_kp}, " +
-            f"{self._concentration}, " +
-            f"{self._eg}, " +
-            f"{self._em}, " +
-            f"{self._ed}, " +
-            f"{self._rate}, " +
-            f"{self._enabled}" +
-            ")"
-        )
-        execute(sql)
-
-        return True
-
-    @property
-    def name(self):
-        return self._name_section
-
-    @name.setter
-    def name(self, name):
-        self._name_section = name
-        self._status.modified()
-
-    @property
-    def reach(self):
-        return self._reach
-
-    @reach.setter
-    def reach(self, reach):
-        self._reach = reach
-        self._status.modified()
-
-    @property
-    def start_kp(self):
-        return self._start_kp
-
-    @start_kp.setter
-    def start_kp(self, start_kp):
-        self._start_kp = start_kp
-        self._status.modified()
-
-    @property
-    def end_kp(self):
-        return self._end_kp
-
-    @end_kp.setter
-    def end_kp(self, end_kp):
-        self._end_kp = end_kp
-        self._status.modified()
-
-    @property
-    def concentration(self):
-        return self._concentration
-
-    @concentration.setter
-    def concentration(self, concentration):
-        self._concentration = concentration
-        self._status.modified()
-
-    @property
-    def eg(self):
-        return self._eg
-
-    @eg.setter
-    def eg(self, eg):
-        self._eg = eg
-        self._status.modified()
-
-    @property
-    def em(self):
-        return self._em
-
-    @em.setter
-    def em(self, em):
-        self._em = em
-        self._status.modified()
-
-    @property
-    def ed(self):
-        return self._ed
-
-    @ed.setter
-    def ed(self, ed):
-        self._ed = ed
-        self._status.modified()
-
-    @property
-    def rate(self):
-        return self._rate
-
-    @rate.setter
-    def rate(self, rate):
-        self._rate = rate
-        self._status.modified()
-
-    @property
-    def enabled(self):
-        return self._enabled
-
-    @enabled.setter
-    def enabled(self, enabled):
-        self._enabled = enabled
-        self._status.modified()
-
-
-
-
-
-
-
-
-

src/Model/LateralContribution/LateralContribution.py

@@ -48,8 +48,8 @@ class LateralContribution(SQLSubModel):
         self._name = name
         self._type = ""
         self._edge = None
-        self._begin_kp = 0.0
-        self._end_kp = 0.0
+        self._begin_rk = 0.0
+        self._end_rk = 0.0
         self._data = []
         self._header = []
         self._types = [float, float]
@@ -66,8 +66,8 @@ class LateralContribution(SQLSubModel):
             type TEXT NOT NULL,
             tab TEXT NOT NULL,
             edge INTEGER,
-            begin_kp REAL NOT NULL,
-            end_kp REAL NOT NULL,
+            begin_rk REAL NOT NULL,
+            end_rk REAL NOT NULL,
             FOREIGN KEY(edge) REFERENCES river_reach(id)
           )
         """)
@@ -87,6 +87,22 @@ class LateralContribution(SQLSubModel):
 
     @classmethod
     def _db_update(cls, execute, version):
+        major, minor, release = version.strip().split(".")
+        if major == minor == "0":
+            if int(release) < 11:
+                execute(
+                    """
+                    ALTER TABLE lateral_contribution
+                    RENAME COLUMN begin_kp TO begin_rk
+                    """
+                )
+                execute(
+                    """
+                    ALTER TABLE lateral_contribution
+                    RENAME COLUMN end_kp TO end_rk
+                    """
+                )
+
         return True
 
     @classmethod
@@ -110,7 +126,7 @@ class LateralContribution(SQLSubModel):
         tab = data["tab"]
 
         table = execute(
-            "SELECT id, name, type, edge, begin_kp, end_kp " +
+            "SELECT id, name, type, edge, begin_rk, end_rk " +
             f"FROM lateral_contribution WHERE tab = '{tab}'"
         )
 
@@ -125,8 +141,8 @@ class LateralContribution(SQLSubModel):
             lc.edge = None
             if row[3] != -1:
                 lc.edge = next(filter(lambda e: e.id == row[3], data["edges"]))
-            lc._begin_kp = row[4]
-            lc._end_kp = row[5]
+            lc._begin_rk = row[4]
+            lc._end_rk = row[5]
 
             values = execute(
                 "SELECT ind, data0, data1 FROM lateral_contribution_data " +
@@ -160,11 +176,11 @@ class LateralContribution(SQLSubModel):
         sql = (
             "INSERT INTO " +
             "lateral_contribution(id, name, type, tab, " +
-            "edge, begin_kp, end_kp) " +
+            "edge, begin_rk, end_rk) " +
             "VALUES (" +
             f"{self.id}, '{self._db_format(self._name)}', " +
             f"'{self._db_format(self._type)}', '{tab}', {edge}, " +
-            f"{self._begin_kp}, {self._end_kp}" +
+            f"{self._begin_rk}, {self._end_rk}" +
             ")"
         )
         execute(sql)
@@ -231,44 +247,44 @@ class LateralContribution(SQLSubModel):
     def edge(self, edge):
         self._edge = edge
         if edge is not None:
-            self._begin_kp = self._edge.reach.get_kp_min()
-            self._end_kp = self._edge.reach.get_kp_max()
+            self._begin_rk = self._edge.reach.get_rk_min()
+            self._end_rk = self._edge.reach.get_rk_max()
         self._status.modified()
 
     def has_edge(self):
         return self._edge is not None
 
     @property
-    def begin_kp(self):
-        return self._begin_kp
+    def begin_rk(self):
+        return self._begin_rk
 
-    @begin_kp.setter
-    def begin_kp(self, begin_kp):
+    @begin_rk.setter
+    def begin_rk(self, begin_rk):
         if self._edge is None:
-            self._begin_kp = begin_kp
+            self._begin_rk = begin_rk
         else:
-            _min = self._edge.reach.get_kp_min()
-            _max = self._edge.reach.get_kp_max()
+            _min = self._edge.reach.get_rk_min()
+            _max = self._edge.reach.get_rk_max()
 
-            if _min <= begin_kp <= _max:
-                self._begin_kp = begin_kp
+            if _min <= begin_rk <= _max:
+                self._begin_rk = begin_rk
 
         self._status.modified()
 
     @property
-    def end_kp(self):
-        return self._end_kp
+    def end_rk(self):
+        return self._end_rk
 
-    @end_kp.setter
-    def end_kp(self, end_kp):
+    @end_rk.setter
+    def end_rk(self, end_rk):
         if self._edge is None:
-            self._end_kp = end_kp
+            self._end_rk = end_rk
         else:
-            _min = self._edge.reach.get_kp_min()
-            _max = self._edge.reach.get_kp_max()
+            _min = self._edge.reach.get_rk_min()
+            _max = self._edge.reach.get_rk_max()
 
-            if _min <= end_kp <= _max:
-                self._end_kp = end_kp
+            if _min <= end_rk <= _max:
+                self._end_rk = end_rk
 
         self._status.modified()
 
@@ -377,8 +393,8 @@ class LateralContribution(SQLSubModel):
     def convert(self, cls):
         new = cls(name=self.name, status=self._status)
         new.edge = self.edge
-        new.begin_kp = self.begin_kp
-        new.end_kp = self.end_kp
+        new.begin_rk = self.begin_rk
+        new.end_rk = self.end_rk
 
         for i, _ in enumerate(self.data):
             new.add(i)

src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py

@@ -1,215 +0,0 @@
-# LateralContributionAdisTS.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-
-from tools import (
-    trace, timer,
-    old_pamhyr_date_to_timestamp,
-    date_iso_to_timestamp,
-    date_dmy_to_timestamp,
-)
-
-from Model.Tools.PamhyrDB import SQLSubModel
-from Model.Except import NotImplementedMethodeError
-
-logger = logging.getLogger()
-
-class LateralContributionAdisTS(SQLSubModel):
-    _sub_classes = []
-    _id_cnt = 0
-
-    def __init__(self, id: int = -1, pollutant: int = -1, name: str = "", status=None):
-        super(LateralContributionAdisTS, self).__init__()
-
-        self._status = status
-
-        if id == -1:
-            self.id = LateralContributionAdisTS._id_cnt
-        else:
-            self.id = id
-
-        self._pollutant = pollutant
-        self._edge = None
-        self._begin_kp = 0.0
-        self._end_kp = 0.0
-        self._data = []
-        self._header = ["time", "rate"]
-        self._types = [self.time_convert, float]
-
-        LateralContributionAdisTS._id_cnt = max(
-            LateralContributionAdisTS._id_cnt + 1, self.id)
-
-    @classmethod
-    def _db_create(cls, execute):
-        execute("""
-          CREATE TABLE lateral_contribution_adists(
-            id INTEGER NOT NULL PRIMARY KEY,
-            pollutant INTEGER NOT NULL,
-            edge INTEGER NOT NULL,
-            begin_kp REAL NOT NULL,
-            end_kp REAL NOT NULL,
-            FOREIGN KEY(pollutant) REFERENCES Pollutants(id),
-            FOREIGN KEY(edge) REFERENCES river_reach(id)
-          )
-        """)
-
-        execute("""
-          CREATE TABLE lateral_contribution_data_adists(
-            id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-            data0 TEXT NOT NULL,
-            data1 TEXT NOT NULL,
-            lc INTEGER,
-            FOREIGN KEY(lc) REFERENCES lateral_contribution(id)
-          )
-        """)
-
-        return cls._create_submodel(execute)
-
-    @classmethod
-    def _db_update(cls, execute, version):
-        return True
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = []
-
-        table = execute(
-            "SELECT id, pollutant, edge, begin_kp, end_kp " +
-            "FROM lateral_contribution_adists"
-        )
-
-        if table is not None:
-            for row in table:
-                lc = cls(
-                    id=row[0],
-                    pollutant=row[1],
-                    status=data['status']
-                )
-
-                lc.edge = row[2]
-                lc.begin_kp = row[3]
-                lc.end_kp = row[4]
-
-                values = execute(
-                    "SELECT data0, data1 FROM lateral_contribution_data_adists " +
-                    f"WHERE lc = '{lc.id}'"
-                )
-
-                # Write data
-                for v in values:
-                    data0 = lc._types[0](v[0])
-                    data1 = lc._types[1](v[1])
-                    # Replace data at pos ind
-                    lc._data.append((data0, data1))
-
-                new.append(lc)
-
-        return new
-
-    def _db_save(self, execute, data=None):
-
-        execute(f"DELETE FROM lateral_contribution_adists WHERE id = {self.id}")
-        execute(f"DELETE FROM lateral_contribution_data_adists WHERE lc = {self.id}")
-
-        sql = (
-            "INSERT INTO " +
-            "lateral_contribution_adists(id, pollutant, edge, begin_kp, end_kp) " +
-            "VALUES (" +
-            f"{self.id}, {self._pollutant}, {self.edge}, " +
-            f"{self._begin_kp}, {self._end_kp}" +
-            ")"
-        )
-        execute(sql)
-
-        for d in self._data:
-            data0 = self._db_format(str(d[0]))
-            data1 = self._db_format(str(d[1]))
-
-            sql = (
-                "INSERT INTO " +
-                "lateral_contribution_data_adists(data0, data1, lc) " +
-                f"VALUES ('{data0}', {data1}, {self.id})"
-            )
-            execute(sql)
-
-        return True
-
-    def __len__(self):
-        return len(self._data)
-
-    @classmethod
-    def time_convert(cls, data):
-        if type(data) is str:
-            if data.count("-") == 2:
-                return date_iso_to_timestamp(data)
-            if data.count("/") == 2:
-                return date_dmy_to_timestamp(data)
-            if data.count(":") == 3:
-                return old_pamhyr_date_to_timestamp(data)
-            if data.count(":") == 2:
-                return old_pamhyr_date_to_timestamp("00:" + data)
-            if data.count(".") == 1:
-                return round(float(data))
-
-        return int(data)
-
-    @property
-    def edge(self):
-        return self._edge
-
-    @edge.setter
-    def edge(self, edge):
-        self._edge = edge
-        self._status.modified()
-
-    @property
-    def header(self):
-        return self._header.copy()
-
-    @header.setter
-    def header(self, header):
-        self._header = header
-        self._status.modified()
-
-    @property
-    def pollutant(self):
-        return self._pollutant
-
-    @property
-    def data(self):
-        return self._data.copy()
-
-    @property
-    def begin_kp(self):
-        return self._begin_kp
-
-    @begin_kp.setter
-    def begin_kp(self, begin_kp):
-        self._begin_kp = begin_kp
-        self._status.modified()
-
-    @property
-    def end_kp(self):
-        return self._end_kp
-
-    @end_kp.setter
-    def end_kp(self, end_kp):
-        self._end_kp = end_kp
-        self._status.modified()
-

src/Model/LateralContributionsAdisTS/LateralContributionsAdisTSList.py

@@ -1,65 +0,0 @@
-# LateralContributionsAdisTSList.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-from copy import copy
-from tools import trace, timer
-
-from Model.Tools.PamhyrList import PamhyrModelList
-from Model.Except import NotImplementedMethodeError
-
-from Model.LateralContributionsAdisTS.LateralContributionAdisTS import LateralContributionAdisTS
-
-class LateralContributionsAdisTSList(PamhyrModelList):
-    _sub_classes = [
-        LateralContributionAdisTS,
-    ]
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = cls(status=data['status'])
-
-        if data is None:
-            data = {}
-
-        new._lst = LateralContributionAdisTS._db_load(
-            execute, data
-        )
-
-        return new
-
-    def _db_save(self, execute, data=None):
-        execute("DELETE FROM lateral_contribution_adists")
-        execute("DELETE FROM lateral_condition_data_adists")
-
-        if data is None:
-            data = {}
-
-        for lc in self._lst:
-            lc._db_save(execute, data=data)
-
-        return True
-
-    def new(self, index, pollutant):
-        n = LateralContributionAdisTS(pollutant=pollutant, status=self._status)
-        self._lst.insert(index, n)
-        self._status.modified()
-        return n
-
-    @property
-    def Lat_Cont_List(self):
-        return self.lst

src/Model/OutputKpAdists/OutputKpAdists.py

@@ -1,164 +0,0 @@
-# OutputKpAdists.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-
-from tools import (
-    trace, timer,
-    old_pamhyr_date_to_timestamp,
-    date_iso_to_timestamp,
-    date_dmy_to_timestamp,
-)
-
-from Model.Tools.PamhyrDB import SQLSubModel
-from Model.Except import NotImplementedMethodeError
-
-logger = logging.getLogger()
-
-class OutputKpAdists(SQLSubModel):
-    _sub_classes = []
-    _id_cnt = 0
-
-    def __init__(self, id: int = -1, reach = None, kp = None, title: str = "",  status=None):
-        super(OutputKpAdists, self).__init__()
-
-        self._status = status
-
-        if id == -1:
-            self.id = OutputKpAdists._id_cnt
-        else:
-            self.id = id
-
-        self._reach = reach
-        self._kp = kp
-        self._title = str(title)
-        self._enabled = True
-
-        OutputKpAdists._id_cnt = max(
-            OutputKpAdists._id_cnt + 1, self.id)
-
-    @property
-    def reach(self):
-        return self._reach
-
-    @reach.setter
-    def reach(self, reach_id):
-        self._reach = reach_id
-        self._status.modified()
-
-    @property
-    def kp(self):
-        return self._kp
-
-    @kp.setter
-    def kp(self, profile_id):
-        self._kp = profile_id
-        self._status.modified()
-
-    @property
-    def title(self):
-        return self._title
-
-    @title.setter
-    def title(self, title):
-        self._title = title
-        self._status.modified()
-
-
-    @classmethod
-    def _db_create(cls, execute):
-
-        sql = (
-            "CREATE TABLE OutputKpAdists(" +
-            "id INTEGER NOT NULL PRIMARY KEY, " +
-            "reach INTEGER NOT NULL, " +
-            "kp REAL NOT NULL, " +
-            "title TEXT NOT NULL, " +
-            "FOREIGN KEY(reach) REFERENCES river_reach(id)" +
-            ")"
-        )
-
-        execute(sql)
-
-        return cls._create_submodel(execute)
-
-    @classmethod
-    def _db_update(cls, execute, version):
-        return True
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = []
-
-        #reach   = data["reach"]
-        #profile = data["profile"]
-        status  = data["status"]
-
-        table = execute(
-            "SELECT id, reach, kp, title " +
-            f"FROM OutputKpAdists"
-        )
-
-        if table is not None:
-            for row in table:
-                id       = row[0]
-                id_reach = row[1]
-                id_kp    = row[2]
-                title    = row[3]
-
-                new_output = cls(
-                    id=id, reach=id_reach,
-                    kp=id_kp, title=title,
-                    status=status
-                )
-
-                new.append(new_output)
-
-        return new
-
-    def _db_save(self, execute, data=None):
-
-        execute(f"DELETE FROM OutputKpAdists WHERE id = {self.id}")
-
-        sql = (
-            "INSERT INTO " +
-            "OutputKpAdists(id, reach, kp, title) " +
-            "VALUES (" +
-            f"{self.id}, {self._reach}, {self._kp}, " +
-            f"'{self._db_format(self._title)}'" +
-            ")"
-        )
-
-        execute(sql)
-
-        return True
-
-    @property
-    def enabled(self):
-        return self._enabled
-
-    @enabled.setter
-    def enabled(self, enabled):
-        self._enabled = enabled
-        self._status.modified()
-
-
-
-
-
-

src/Model/OutputKpAdists/OutputKpListAdists.py

@@ -1,56 +0,0 @@
-# OutputKpListAdists.py -- Pamhyr
-# Copyright (C) 2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-from tools import trace, timer
-
-from Model.Except import NotImplementedMethodeError
-from Model.Tools.PamhyrList import PamhyrModelList
-from Model.OutputKpAdists.OutputKpAdists import OutputKpAdists
-
-
-class OutputKpAdistsList(PamhyrModelList):
-    _sub_classes = [OutputKpAdists]
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = cls(status=data["status"])
-
-        new._lst = OutputKpAdists._db_load(execute, data)
-
-        return new
-
-    def _db_save(self, execute, data=None):
-        ok = True
-
-        # Delete previous data
-        execute("DELETE FROM OutputKpAdists")
-
-        for sl in self._lst:
-            ok &= sl._db_save(execute, data)
-
-        return ok
-
-    @property
-    def OutputKp_List(self):
-        return self.lst
-
-    def new(self, lst, index):
-        n = OutputKpAdists(status=self._status)
-        self._lst.insert(index, n)
-        self._status.modified()
-        return n

src/Model/Pollutants/Pollutants.py

@@ -1,186 +0,0 @@
-# Pollutants.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-
-from tools import (
-    trace, timer,
-    old_pamhyr_date_to_timestamp,
-    date_iso_to_timestamp,
-    date_dmy_to_timestamp,
-)
-
-from Model.Tools.PamhyrDB import SQLSubModel
-from Model.Except import NotImplementedMethodeError
-
-logger = logging.getLogger()
-
-class Pollutants(SQLSubModel):
-    _sub_classes = []
-    _id_cnt = 0
-
-    def __init__(self, id: int = -1, name: str = "",  status=None):
-        super(Pollutants, self).__init__()
-
-        self._status = status
-
-        if id == -1:
-            self.id = Pollutants._id_cnt
-        else:
-            self.id = id
-
-        self._name = str(name)
-        self._enabled = True
-
-        self._data = []
-
-        Pollutants._id_cnt = max(
-            Pollutants._id_cnt + 1, self.id)
-
-    @property
-    def name(self):
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        self._name = name
-        self._status.modified()
-
-    @property
-    def data(self):
-        return self._data.copy()
-
-    @classmethod
-    def _db_create(cls, execute):
-        execute("""
-          CREATE TABLE Pollutants(
-            id INTEGER NOT NULL PRIMARY KEY,
-            name TEXT NOT NULL UNIQUE
-          )
-        """)
-
-        execute("""
-          CREATE TABLE Pollutants_characteristics(
-            id INTEGER NOT NULL PRIMARY KEY,
-            type INTEGER NOT NULL,
-            diametre REAL NOT NULL,
-            rho REAL NOT NULL,
-            porosity REAL NOT NULL,
-            cdc_riv REAL NOT NULL,
-            cdc_cas REAL NOT NULL,
-            apd REAL NOT NULL,
-            ac REAL NOT NULL,
-            bc REAL NOT NULL,
-            pollutant INTEGER NOT NULL,
-            FOREIGN KEY(pollutant) REFERENCES Pollutants(id)
-          )
-        """)
-
-        return cls._create_submodel(execute)
-
-    @classmethod
-    def _db_update(cls, execute, version):
-        return True
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = []
-
-        status  = data["status"]
-
-        table = execute(
-            "SELECT id, name " +
-            f"FROM Pollutants"
-        )
-
-        if table is not None:
-            for row in table:
-                id   = row[0]
-                name = row[1]
-
-                new_pollutant = cls(
-                    id=id, name=name,
-                    status=status
-                )
-
-                new_data = []
-                table = execute(
-                    "SELECT * " +
-                    "FROM Pollutants_characteristics " +
-                    f"WHERE pollutant = {id}"
-                )
-
-                if table is not None:
-                    for t in table:
-                        new_data = t[1:]
-
-                new_pollutant._data.append(new_data)
-
-                new.append(new_pollutant)
-
-        return new
-
-    def _db_save(self, execute, data=None):
-
-        execute(f"DELETE FROM Pollutants WHERE id = {self.id}")
-        execute(f"DELETE FROM Pollutants_characteristics WHERE pollutant = {self.id}")
-
-        sql = (
-            "INSERT INTO " +
-            "Pollutants(id, name) " +
-            "VALUES (" +
-            f"{self.id}, " +
-            f"'{self._db_format(self._name)}'" +
-            ")"
-        )
-
-        execute(sql)
-
-        for d in self._data:
-            sql = (
-                "INSERT INTO " +
-                "Pollutants_characteristics(type, diametre, rho, porosity, " +
-                "cdc_riv, cdc_cas, apd, ac, bc, pollutant) " +
-                f"VALUES ({d[0]}, {d[1]}, {d[2]},{d[3]}, {d[4]}, "
-                f"{d[5]}, {d[6]}, {d[7]}, {d[8]}, {self.id})"
-            )
-            execute(sql)
-
-        return True
-
-    @property
-    def enabled(self):
-        return self._enabled
-
-    @enabled.setter
-    def enabled(self, enabled):
-        self._enabled = enabled
-        self._status.modified()
-
-    def is_define(self):
-        return len(self._data) != 0
-
-    def __len__(self):
-        return len(self._data)
-
-
-
-
-
-
-

src/Model/Pollutants/PollutantsList.py

@@ -1,56 +0,0 @@
-# PollutantsList.py -- Pamhyr
-# Copyright (C) 2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-from tools import trace, timer
-
-from Model.Except import NotImplementedMethodeError
-from Model.Tools.PamhyrList import PamhyrModelList
-from Model.Pollutants.Pollutants import Pollutants
-
-
-class PollutantsList(PamhyrModelList):
-    _sub_classes = [Pollutants]
-
-    @classmethod
-    def _db_load(cls, execute, data=None):
-        new = cls(status=data["status"])
-
-        new._lst = Pollutants._db_load(execute, data)
-
-        return new
-
-    def _db_save(self, execute, data=None):
-        ok = True
-
-        # Delete previous data
-        execute("DELETE FROM Pollutants")
-
-        for sl in self._lst:
-            ok &= sl._db_save(execute, data)
-
-        return ok
-
-    @property
-    def Pollutants_List(self):
-        return self.lst
-
-    def new(self, lst, index):
-        n = Pollutants(status=self._status)
-        self._lst.insert(index, n)
-        self._status.modified()
-        return n

src/Model/Results/ResultsAdisTS.py

@@ -1,83 +0,0 @@
-# Results.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import logging
-import numpy as np
-import os, glob
-
-from copy import deepcopy
-from datetime import datetime
-
-from Model.Results.River.RiverAdisTS import River
-
-logger = logging.getLogger()
-
-
-class Results(object):
-    def __init__(self, study=None, solver=None,
-                 repertory="", name="0"):
-        self._study = study
-        self._solver = solver
-        self._repertory = repertory
-        self._name = name
-
-        self._river = River(self._study)
-
-        self._meta_data = {
-            # Keep results creation date
-            "creation_date": datetime.now(),
-        }
-
-        repertory_results = os.path.join(repertory, "resultats")
-        self._pollutants_list = [el.split("/")[-1][0:-4] for el in glob.glob(repertory_results + "/*.bin")]
-
-        self._phys_var_list = ["C", "G", "M", "D", "L", "N", "R"]
-
-        print("*********files names resultats from Results Object: ", self._pollutants_list)
-
-    @property
-    def date(self):
-        date = self._meta_data["creation_date"]
-        return f"{date.isoformat(sep=' ')}"
-
-    @property
-    def river(self):
-        return self._river
-
-    @property
-    def study(self):
-        return self._study
-
-    @property
-    def pollutants_list(self):
-        return self._pollutants_list
-
-    @property
-    def phys_var_list(self):
-        return self._phys_var_list
-
-    def set(self, key, value):
-        self._meta_data[key] = value
-
-    def get(self, key):
-        return self._meta_data[key]
-
-    def reload(self):
-        return self._solver.results(
-            self._study,
-            self._repertory,
-            qlog=None,
-        )

src/Model/Results/River/River.py

@@ -35,8 +35,8 @@ class Profile(object):
         return self._profile.name
 
     @property
-    def kp(self):
-        return self._profile.kp
+    def rk(self):
+        return self._profile.rk
 
     @property
     def geometry(self):

src/Model/Results/River/RiverAdisTS.py

@@ -1,136 +0,0 @@
-# River.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import logging
-
-from datetime import datetime
-
-logger = logging.getLogger()
-
-
-class Profile(object):
-    def __init__(self, profile, study):
-        self._study = study
-        self._profile = profile  # Source profile in the study
-        self._data = {}  # Dict of dict {<ts>: {<key>: <value>, ...}, ...}
-
-    def __len__(self):
-        return len(self._data)
-
-    @property
-    def name(self):
-        return self._profile.name
-
-    @property
-    def kp(self):
-        return self._profile.kp
-
-    @property
-    def geometry(self):
-        return self._profile
-
-    def set(self, timestamp, key, data):
-        if timestamp not in self._data:
-            self._data[timestamp] = {}
-
-        self._data[timestamp][key] = data
-
-    def get_ts(self, timestamp):
-        return self._data[timestamp]
-
-    def get_key(self, key):
-        return list(
-            map(lambda ts: self._data[ts][key], self._data)
-        )
-
-    def get_ts_key(self, timestamp, key):
-        return self._data[timestamp][key]
-
-    def has_sediment(self):
-        return any(map(lambda ts: "sl" in self._data[ts], self._data))
-
-
-class Reach(object):
-    def __init__(self, reach, study):
-        self._study = study
-        self._reach = reach  # Source reach in the study
-        self._profiles = list(
-            map(
-                lambda p: Profile(p, self._study),
-                reach.profiles
-            )
-        )
-
-    def __len__(self):
-        return len(self._profiles)
-
-    @property
-    def name(self):
-        return self._reach.name
-
-    @property
-    def geometry(self):
-        return self._reach
-
-    @property
-    def profiles(self):
-        return self._profiles.copy()
-
-    def profile(self, id):
-        return self._profiles[id]
-
-    def set(self, profile_id, timestamp, key, data):
-        self._profiles[profile_id].set(timestamp, key, data)
-
-    def has_sediment(self):
-        return any(map(lambda profile: profile.has_sediment(), self._profiles))
-
-
-class River(object):
-    def __init__(self, study):
-        self._study = study
-
-        # Dict with timestamps as key
-        self._reachs = []
-
-    def __len__(self):
-        return len(self._reachs)
-
-    @property
-    def reachs(self):
-        return self._reachs.copy()
-
-    def reach(self, id):
-        return self._reachs[id]
-
-    def has_reach(self, id):
-        return 0 <= id < len(self._reachs)
-
-    def add(self, reach_id):
-        reachs = self._study.river.enable_edges()
-
-        new = Reach(reachs[reach_id].reach, self._study)
-
-        self._reachs.append(new)
-        return new
-
-    def get_reach_by_geometry(self, geometry_reach):
-        return next(
-            filter(
-                lambda r: r.geometry is geometry_reach,
-                self._reachs
-            )
-        )

src/Model/River.py

@@ -45,14 +45,6 @@ from Model.REPLine.REPLineList import REPLineList
 
 from Solver.Solvers import solver_type_list
 
-from Model.OutputKpAdists.OutputKpListAdists import OutputKpAdistsList
-from Model.Pollutants.PollutantsList import PollutantsList
-from Model.InitialConditionsAdisTS.InitialConditionsAdisTSList import InitialConditionsAdisTSList
-from Model.BoundaryConditionsAdisTS.BoundaryConditionsAdisTSList import BoundaryConditionsAdisTSList
-from Model.LateralContributionsAdisTS.LateralContributionsAdisTSList import LateralContributionsAdisTSList
-from Model.D90AdisTS.D90AdisTSList import D90AdisTSList
-from Model.DIFAdisTS.DIFAdisTSList import DIFAdisTSList
-
 
 class RiverNode(Node, SQLSubModel):
     _sub_classes = []
@@ -236,13 +228,6 @@ class River(Graph, SQLSubModel):
         HydraulicStructureList,
         AddFileList,
         REPLineList,
-        OutputKpAdistsList,
-        PollutantsList,
-        InitialConditionsAdisTSList,
-        BoundaryConditionsAdisTSList,
-        LateralContributionsAdisTSList,
-        D90AdisTSList,
-        DIFAdisTSList,
     ]
 
     def __init__(self, status=None):
@@ -266,13 +251,6 @@ class River(Graph, SQLSubModel):
         )
         self._additional_files = AddFileList(status=self._status)
         self._rep_lines = REPLineList(status=self._status)
-        self._Output_kp_adists = OutputKpAdistsList(status=self._status)
-        self._Pollutants = PollutantsList(status=self._status)
-        self._InitialConditionsAdisTS = InitialConditionsAdisTSList(status=self._status)
-        self._BoundaryConditionsAdisTS = BoundaryConditionsAdisTSList(status=self._status)
-        self._LateralContributionsAdisTS = LateralContributionsAdisTSList(status=self._status)
-        self._D90AdisTS = D90AdisTSList(status=self._status)
-        self._DIFAdisTS = DIFAdisTSList(status=self._status)
 
     @classmethod
     def _db_create(cls, execute):
@@ -347,22 +325,6 @@ class River(Graph, SQLSubModel):
         )
         new._rep_lines = REPLineList._db_load(execute, data)
 
-        new._Output_kp_adists = OutputKpAdistsList._db_load(
-            execute, data
-        )
-
-        new._Pollutants = PollutantsList._db_load(execute, data)
-
-        new._InitialConditionsAdisTS = InitialConditionsAdisTSList._db_load(execute, data)
-
-        new._BoundaryConditionsAdisTS = BoundaryConditionsAdisTSList._db_load(execute, data)
-
-        new._LateralContributionsAdisTS = LateralContributionsAdisTSList._db_load(execute, data)
-
-        new._D90AdisTS = D90AdisTSList._db_load(execute, data)
-
-        new._DIFAdisTS = DIFAdisTSList._db_load(execute, data)
-
         return new
 
     def _db_save(self, execute, data=None):
@@ -382,14 +344,6 @@ class River(Graph, SQLSubModel):
         for solver in self._parameters:
             objs.append(self._parameters[solver])
 
-        objs.append(self._Output_kp_adists)
-        objs.append(self._Pollutants)
-        objs.append(self._InitialConditionsAdisTS)
-        objs.append(self._BoundaryConditionsAdisTS)
-        objs.append(self._LateralContributionsAdisTS)
-        objs.append(self._D90AdisTS)
-        objs.append(self._DIFAdisTS)
-
         self._save_submodel(execute, objs, data)
         return True
 
@@ -512,34 +466,6 @@ Last export at: @date."""
     def parameters(self):
         return self._parameters
 
-    @property
-    def Output_kp_adists(self):
-        return self._Output_kp_adists
-
-    @property
-    def Pollutants(self):
-        return self._Pollutants
-
-    @property
-    def initial_conditions_adists(self):
-        return self._InitialConditionsAdisTS
-
-    @property
-    def boundary_conditions_adists(self):
-        return self._BoundaryConditionsAdisTS
-
-    @property
-    def lateral_contributions_adists(self):
-        return self._LateralContributionsAdisTS
-
-    @property
-    def d90_adists(self):
-        return self._D90AdisTS
-
-    @property
-    def dif_adists(self):
-        return self._DIFAdisTS
-
     def get_params(self, solver):
         if solver in self._parameters:
             return self._parameters[solver]

src/Model/Saved.py

@@ -22,10 +22,19 @@ logger = logging.getLogger()
 
 
 class SavedStatus(object):
-    def __init__(self):
+    def __init__(self, version=0):
         super(SavedStatus, self).__init__()
+        self._version = version
         self._saved = True
 
+    @property
+    def version(self):
+        return self._version
+
+    @version.setter
+    def version(self, version):
+        self._version = version
+
     def is_saved(self):
         return self._saved
 
@@ -34,5 +43,11 @@ class SavedStatus(object):
         self._saved = True
 
     def modified(self):
-        # logger.debug("model status set as modified")
+        if self._saved:
+            self._version += 1
+
+        logger.debug(
+            "STATUS: Model status set as modified " +
+            f"at version {self._version}"
+        )
         self._saved = False

src/Model/Study.py

@@ -41,7 +41,7 @@ class Study(SQLModel):
 
     def __init__(self, filename=None, init_new=True):
         # Metadata
-        self._version = "0.0.9"
+        self._version = "0.0.11"
         self.creation_date = datetime.now()
         self.last_modification_date = datetime.now()
         self.last_save_date = datetime.now()
@@ -72,7 +72,7 @@ class Study(SQLModel):
             StudyNetworkReachChecker(),
             StudyGeometryChecker(),
             StudyInitialConditionsChecker(),
-            #StudyBoundaryConditionChecker(),
+            StudyBoundaryConditionChecker(),
             # DummyOK(),
             # DummyWARNING(),
             # DummyERROR(),
@@ -117,6 +117,9 @@ class Study(SQLModel):
         if ".backup" in self.filename:
             is_new = True
 
+        if not os.path.exists(self.filename):
+            is_new = True
+
         self._init_db_file(self.filename, is_new=is_new)
         self.commit()
 
@@ -209,7 +212,12 @@ class Study(SQLModel):
     def _create(self):
         # Info (metadata)
         self.execute(
-            "CREATE TABLE info(key TEXT NOT NULL UNIQUE, value TEXT NOT NULL)")
+            "INSERT INTO info VALUES ('study_release', '0')"
+        )
+
+        self.execute(
+            "CREATE TABLE info(key TEXT NOT NULL UNIQUE, value TEXT NOT NULL)"
+        )
         self.execute(
             "INSERT INTO info VALUES ('version', " +
             f"'{self._db_format(self._version)}')",
@@ -218,19 +226,20 @@ class Study(SQLModel):
         self.execute("INSERT INTO info VALUES ('name', '')")
         self.execute("INSERT INTO info VALUES ('description', '')")
         self.execute(
-            f"INSERT INTO info VALUES ('time_system', '{self._time_system}')")
+            f"INSERT INTO info VALUES ('time_system', '{self._time_system}')"
+        )
         self.execute(
-            f"INSERT INTO info VALUES ('date', " +
-            "'{self._date.timestamp()}')"
+            "INSERT INTO info VALUES ('date', " +
+            f"'{timestamp(self._date)}')"
         )
 
         self.execute(
-            f"INSERT INTO info VALUES ('creation_date', " +
-            "'{self.creation_time.timestamp()}')"
+            "INSERT INTO info VALUES ('creation_date', " +
+            f"'{timestamp(self.creation_date)}')"
         )
         self.execute(
-            f"INSERT INTO info VALUES ('last_save_date', " +
-            "'{self.last_save_time.timestamp()}')"
+            "INSERT INTO info VALUES ('last_save_date', " +
+            f"'{timestamp(self.last_save_date)}')"
         )
 
         self._create_submodel()
@@ -245,6 +254,12 @@ class Study(SQLModel):
 
         logger.debug("Update database")
 
+        major, minor, release = version[0].split('.')
+        if major == "0" and minor == "0" and int(release) < 10:
+            self.execute(
+                "INSERT INTO info VALUES ('study_release', '0')"
+            )
+
         if self._update_submodel(version[0]):
             self.execute(
                 f"UPDATE info SET value='{self._version}' WHERE key='version'"
@@ -258,6 +273,11 @@ class Study(SQLModel):
     def _load(cls, filename):
         new = cls(init_new=False, filename=filename)
 
+        version = new.execute(
+            "SELECT value FROM info WHERE key='study_release'"
+        )
+        new.status.version = int(version[0])
+
         # TODO: Load metadata
         new.name = new.execute("SELECT value FROM info WHERE key='name'")[0]
         new.description = new.execute(
@@ -292,6 +312,11 @@ class Study(SQLModel):
     def _save(self, progress=None):
         progress = progress if progress is not None else lambda: None
 
+        self.execute(
+            "INSERT INTO info VALUES ('study_release', " +
+            f"'{self.status.version}')"
+        )
+
         self.execute(
             f"UPDATE info SET " +
             f"value='{self._db_format(self.name)}' WHERE key='name'"

src/Modules.py

@@ -54,7 +54,6 @@ class Modules(IterableFlag):
     RESERVOIR = auto()
     SEDIMENT_LAYER = auto()
     ADDITIONAL_FILES = auto()
-    OUTPUT_KP = auto()
 
     # Results
     RESULTS = auto()
@@ -78,7 +77,6 @@ class Modules(IterableFlag):
             cls.ADDITIONAL_FILES,
             cls.RESULTS,
             cls.WINDOW_LIST,
-            cls.OUTPUT_KP,
         ]
 
     @classmethod

src/Solver/AdisTS.py

@@ -1,731 +0,0 @@
-# AdisTS.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import os, glob
-import logging
-from http.cookiejar import reach
-
-import numpy as np
-
-import shutil
-
-from tools import (
-    trace, timer, logger_exception,
-    timestamp_to_old_pamhyr_date,
-    old_pamhyr_date_to_timestamp,
-    timestamp_to_old_pamhyr_date_adists
-)
-
-from Solver.CommandLine import CommandLineSolver
-
-from Model.Results.ResultsAdisTS import Results
-from Model.Results.River.River import River, Reach, Profile
-
-from Checker.Adists import (
-    AdistsOutputKpChecker,
-)
-
-logger = logging.getLogger()
-
-def adists_file_open(filepath, mode):
-    f = open(filepath, mode)
-
-    if "w" in mode:
-        # Write header
-        comment = "*"
-        if ".ST" in filepath:
-            comment = "#"
-
-        f.write(
-            f"{comment} " +
-            "This file is generated by PAMHYR, please don't modify\n"
-        )
-
-    return f
-
-class AdisTS(CommandLineSolver):
-    _type = "adists"
-
-    def __init__(self, name):
-        super(AdisTS, self).__init__(name)
-
-        self._type = "adists"
-
-        self._cmd_input = ""
-        self._cmd_solver = "@path @input -o @output"
-        self._cmd_output = ""
-
-    @classmethod
-    def default_parameters(cls):
-        lst = super(AdisTS, cls).default_parameters()
-
-        lst += [
-            ("adists_implicitation_parameter", "0.5"),
-            ("adists_timestep_screen", "60"),
-            ("adists_timestep_bin", "60"),
-            ("adists_timestep_csv", "60"),
-            ("adists_timestep_mage", "60"),
-            ("adists_initial_concentration", "60"),
-        ]
-
-        return lst
-
-    @classmethod
-    def checkers(cls):
-        lst = [
-            AdistsOutputKpChecker(),
-        ]
-
-        return lst
-
-    def cmd_args(self, study):
-        lst = super(AdisTS, self).cmd_args(study)
-        return lst
-
-    def input_param(self):
-        name = self._study.name
-        return f"{name}.REP"
-
-    def log_file(self):
-        name = self._study.name
-        return f"{name}.TRA"
-
-    def _export_REP_additional_lines(self, study, rep_file):
-        lines = filter(
-            lambda line: line.is_enabled(),
-            study.river.rep_lines.lines
-        )
-
-        for line in lines:
-            rep_file.write(line.line)
-
-    def _export_REP(self, study, repertory, mage_rep, files, qlog, name="0"):
-
-        if qlog is not None:
-            qlog.put("Export REP file")
-
-        # Write header
-        with adists_file_open(
-                os.path.join(
-                    repertory, f"{name}.REP"
-                ), "w+"
-        ) as f:
-
-            f.write(f"NET ../{mage_rep}/{name}.NET\n")
-            f.write(f"REP ../{mage_rep}/{name}.REP\n")
-
-            for file in files:
-                EXT = file.split('.')[1]
-                f.write(f"{EXT} {file}\n")
-
-            self._export_REP_additional_lines(study, f)
-
-        path_mage_net = os.path.join(os.path.abspath(os.path.join(repertory, os.pardir)), f"{mage_rep}/net")
-        path_adists_net = os.path.join(repertory, "net")
-
-        if os.path.exists(path_mage_net):
-            shutil.copytree(path_mage_net, path_adists_net, dirs_exist_ok=True)
-
-    @timer
-    def export(self, study, repertory, qlog=None):
-        self._study = study
-        name = study.name.replace(" ", "_")
-
-        self.export_additional_files(study, repertory, qlog, name=name)
-
-        return True
-
-    ###########
-    # RESULTS #
-    ###########
-
-    def read_bin(self, study, repertory, results, qlog=None, name="0"):
-        return
-
-    @timer
-    def results(self, study, repertory, qlog=None, name="0"):
-        results = Results(
-            study=study,
-            solver=self,
-            repertory=repertory,
-            name=name,
-        )
-        self.read_bin(study, repertory, results, qlog, name=name)
-
-        return results
-
-    def output_param(self):
-        name = ""
-        return f"{name}"
-
-################################
-# Adis-TS in low coupling mode #
-################################
-
-
-class AdisTSlc(AdisTS):
-    _type = "adistslc"
-
-    def __init__(self, name):
-        super(AdisTSlc, self).__init__(name)
-
-        self._type = "adistslc"
-
-    @classmethod
-    def default_parameters(cls):
-        lst = super(AdisTSlc, cls).default_parameters()
-
-        # Insert new parameters at specific position
-        names = list(map(lambda t: t[0], lst))
-
-        return lst
-
-    ##########
-    # Export #
-    ##########
-
-    def cmd_args(self, study):
-        lst = super(AdisTSlc, self).cmd_args(study)
-
-        return lst
-
-    def _export_POLs(self, study, repertory, qlog=None, name="0"):
-
-        files = []
-
-        if qlog is not None:
-            qlog.put("Export POLS files")
-
-        pollutants = study.river.Pollutants.Pollutants_List
-
-        for pollutant in pollutants:
-            name = pollutant.name
-            with adists_file_open(os.path.join(repertory, f"{name}.POL"), "w+") as f:
-                files.append(f"{name}.POL")
-                f.write(f"*Polluant A contaminé aux PCB\n")
-                f.write(f"name = {name}\n")
-
-                self._export_POL_Characteristics(study, pollutant._data, f, qlog)
-
-                POL_ICs = next(filter(lambda ic: ic.pollutant == pollutant.id,\
-                                      study.river.initial_conditions_adists.Initial_Conditions_List))
-
-                if POL_ICs.concentration != None:
-                    f.write(f"file_ini = {name}.INI\n")
-                    self._export_ICs_AdisTS(study, repertory, POL_ICs, qlog, name)
-
-                POL_BCs = list(filter(lambda bc: bc.pollutant == pollutant.id,\
-                                      study.river.boundary_conditions_adists.BCs_AdisTS_List))
-
-                if len(POL_BCs) != 0:
-                    f.write(f"file_cl = {name}.CDT\n")
-                    self._export_BCs_AdisTS(study, repertory, POL_BCs, qlog, name)
-
-                POL_LAT_Cont = list(filter(lambda lc: lc.pollutant == pollutant.id,\
-                                      study.river.lateral_contributions_adists.Lat_Cont_List))
-
-                if len(POL_LAT_Cont) != 0:
-                    f.write(f"file_ald = {name}.ALD\n")
-                    f.write(f"*\n")
-                    self._export_Lat_AdisTS(study, repertory, POL_LAT_Cont, qlog, name)
-
-        return files
-
-    def _export_Lat_AdisTS(self, study, repertory, POL_LC, qlog, POL_name):
-
-        if qlog is not None:
-            qlog.put("Export POL LCs files")
-
-        with adists_file_open(os.path.join(repertory, f"{POL_name}.ALD"), "w+") as f:
-            for LC in POL_LC:
-                reach_name = next(filter(lambda edge: edge.id == LC.edge, study.river.edges())).name
-                f.write(f"${reach_name} {LC.begin_kp} {LC.end_kp}\n")
-                f.write(f"*temps   |débit massique (kg/s)\n")
-                f.write(f"*---------++++++++++\n")
-
-                for LC_data in LC._data:
-                    f.write(f"{timestamp_to_old_pamhyr_date_adists(int(LC_data[0]))} {LC_data[1]}\n")
-                f.write(f"*\n")
-
-        return True
-
-    def _export_BCs_AdisTS(self, study, repertory, POL_BC, qlog, POL_name):
-
-        if qlog is not None:
-            qlog.put("Export POL BCs files")
-
-        with adists_file_open(os.path.join(repertory, f"{POL_name}.CDT"), "w+") as f:
-            for BC in POL_BC:
-                node_name = next(filter(lambda x: x.id == BC.node, study.river._nodes)).name
-                f.write(f"${node_name}\n")
-
-                if BC.type == "Concentration":
-                    f.write(f"*temps |concentration\n")
-                    f.write(f"*JJ:HH:MM | (g/L)\n")
-                    f.write(f"*---------++++++++++\n")
-                else:
-                    f.write(f"*temps |rate\n")
-                    f.write(f"*JJ:HH:MM | (kg/s)\n")
-                    f.write(f"*---------++++++++++\n")
-
-                for BC_data in BC._data:
-                    f.write(f"{timestamp_to_old_pamhyr_date_adists(int(BC_data[0]))} {BC_data[1]}\n")
-                f.write(f"*\n")
-
-        return True
-
-    def _export_ICs_AdisTS(self, study, repertory, POL_IC_default, qlog, POL_name):
-
-        if qlog is not None:
-            qlog.put("Export POL ICs files")
-
-        with adists_file_open(os.path.join(repertory, f"{POL_name}.INI"), "w+") as f:
-            f.write(f"*État initial pour le polluant {POL_name}\n")
-            f.write(f"{POL_IC_default.name} = {POL_IC_default.concentration} {POL_IC_default.eg} "+
-            f"{POL_IC_default.em} {POL_IC_default.ed}\n")
-
-            if len(POL_IC_default._data) != 0:
-                self._export_ICs_AdisTS_Spec(study, POL_IC_default._data, f, qlog)
-
-    def _export_ICs_AdisTS_Spec(self, study, pol_ics_spec_data, f, qlog, name="0"):
-
-        for ic_spec in pol_ics_spec_data:
-            f.write(f"{ic_spec.name} = {ic_spec.reach} {ic_spec.start_kp} {ic_spec.end_kp} " +
-                    f"{ic_spec.concentration} {ic_spec.eg} {ic_spec.em} {ic_spec.ed} {ic_spec.rate}")
-
-        return True
-
-    def _export_POL_Characteristics(self, study, pol_data, f, qlog, name="0"):
-
-        list_characteristics = ["type", "diametre", "rho", "porosity", "cdc_riv", "cdc_cas", "apd", "ac", "bc"]
-
-        if len(list_characteristics) == (len(pol_data[0])-1):
-            for l in range(len(list_characteristics)):
-                f.write(f"{list_characteristics[l]} = {pol_data[0][l]}\n")
-
-    def _export_D90(self, study, repertory, qlog=None, name="0"):
-
-        files = []
-
-        if qlog is not None:
-            qlog.put("Export D90 file")
-
-        with adists_file_open(os.path.join(repertory, f"{name}.D90"), "w+") as f:
-            files.append(f"{name}.D90")
-
-            f.write(f"*Diamètres caractéristiques du fond stable\n")
-
-            d90AdisTS = study.river.d90_adists.D90_AdisTS_List
-
-            f.write(f"{d90AdisTS[0].name} = {d90AdisTS[0].d90}\n")
-
-            self._export_d90_spec(study, d90AdisTS[0]._data, f, qlog)
-
-        return files
-
-    def _export_d90_spec(self, study, d90_spec_data, f, qlog, name="0"):
-
-        for d90_spec in d90_spec_data:
-            if (d90_spec.name is None) or (d90_spec.reach is None) or (d90_spec.start_kp is None) or \
-                (d90_spec.end_kp is None) or (d90_spec.d90 is None):
-                return
-
-            edges = study.river.enable_edges()
-
-            id_edges = list(map(lambda x: x.id, edges))
-
-            id_reach = d90_spec.reach
-
-            if id_reach not in id_edges:
-                return
-
-            f.write(f"{d90_spec.name} = {id_reach} {d90_spec.start_kp} {d90_spec.end_kp} {d90_spec.d90}\n")
-
-    def _export_DIF(self, study, repertory, qlog=None, name="0"):
-
-        files = []
-
-        if qlog is not None:
-            qlog.put("Export DIF file")
-
-        with adists_file_open(os.path.join(repertory, f"{name}.DIF"), "w+") as f:
-            files.append(f"{name}.DIF")
-
-            f.write(f"*Définition des paramètres des fonctions de calcul du\n")
-            f.write(f"*coefficient de diffusion\n")
-
-            difAdisTS = study.river.dif_adists.DIF_AdisTS_List
-
-            if difAdisTS[0].method != "generique":
-                f.write(f"defaut = {difAdisTS[0].method} {difAdisTS[0].dif }\n")
-            else:
-                f.write(f"defaut = {difAdisTS[0].method} {difAdisTS[0].dif} {difAdisTS[0].b} {difAdisTS[0].c}\n")
-
-            self._export_dif_spec(study, difAdisTS[0]._data, f, qlog)
-
-        return files
-
-    def _export_dif_spec(self, study, dif_spec_data, f, qlog, name="0"):
-
-        for dif_spec in dif_spec_data:
-            if (dif_spec.reach is None) or (dif_spec.start_kp is None) or \
-                (dif_spec.end_kp is None) or (dif_spec.dif is None) or (dif_spec.b is None) or (dif_spec.c is None):
-                return
-
-            edges = study.river.enable_edges()
-
-            id_edges = list(map(lambda x: x.id, edges))
-
-            id_reach = dif_spec.reach
-
-            if id_reach not in id_edges:
-                return
-
-            if dif_spec.method != "generique":
-                f.write(f"{dif_spec.method} = {id_reach} {dif_spec.start_kp} {dif_spec.end_kp} {dif_spec.dif}\n")
-            else:
-                f.write(f"{dif_spec.method} = {id_reach} {dif_spec.start_kp} {dif_spec.end_kp} {dif_spec.dif}" +
-                f"{dif_spec.b} {dif_spec.c}\n")
-
-    def _export_NUM(self, study, repertory, qlog=None, name="0"):
-
-        dict_names = {"init_time":"start_date",
-                      "final_time":"end_date",
-                      "timestep":"dt0",
-                      "implicitation_parameter":"theta",
-                      "timestep_screen":"dtscr",
-                      "timestep_bin":"dtbin",
-                      "timestep_csv":"dtcsv",
-                      "timestep_mage":"dtMage",
-                      "initial_concentration":"c_initiale"}
-        files = []
-
-        if qlog is not None:
-            qlog.put("Export NUM file")
-
-        with adists_file_open(os.path.join(repertory, f"{name}.NUM"), "w+") as f:
-            files.append(f"{name}.NUM")
-
-            params = study.river.get_params(self.type).parameters
-            for p in params:
-                name = p.name\
-                        .replace("all_", "")\
-                        .replace("adists_", "")
-                value = p.value
-
-                logger.debug(
-                    f"export: NUM: {name}: {value} ({p.value})"
-                )
-
-                if name != "command_line_arguments":
-                    f.write(f"{dict_names[name]} = {value}\n")
-
-            outputkps = study.river.Output_kp_adists.OutputKp_List
-
-            for outputkp in outputkps:
-                self._export_outputkp(study, outputkp, f, qlog)
-
-        return files
-
-    def _export_outputkp(self, study, outputkp, f, qlog, name="0"):
-        if (outputkp.reach is None) or (outputkp.kp is None) or (outputkp.title is None):
-            return
-
-        edges = study.river.enable_edges()
-
-        id_edges = list(map(lambda x: x.id, edges))
-
-        id_reach = outputkp.reach
-        kp = outputkp.kp
-        title = outputkp.title
-
-        if id_reach not in id_edges:
-            return
-
-        f.write(f"output = {id_reach} {kp} {title}\n")
-
-    @timer
-    def read_bin(self, study, repertory, results, qlog=None, name="0"):
-        repertory_results = os.path.join(repertory, "resultats")
-
-        files_bin_names = [el.split("/")[-1] for el in glob.glob(repertory_results+"/*.bin")]
-        print("files names resultats: ", files_bin_names)
-
-        ifilename = os.path.join(repertory_results, files_bin_names[0])
-
-        logger.info(f"read_bin: Start reading '{ifilename}' ...")
-
-        print("reading ", ifilename)
-        with open(ifilename, 'rb') as f:
-            # header
-            # first line
-            data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-            data = np.fromfile(f, dtype=np.int32, count=3)
-            ibmax = data[0]  # number of reaches
-            ismax = data[1]  # total number of cross sections
-            kbl = data[2] * -1  # block size for .BIN header
-            data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
-            # second line
-            data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-            ibu = np.fromfile(f, dtype=np.int32, count=ibmax)
-            data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
-            # third line
-            data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-            data = np.fromfile(f, dtype=np.int32, count=2 * ibmax)
-            is1 = np.zeros(ibmax, dtype=np.int32)
-            is2 = np.zeros(ibmax, dtype=np.int32)
-            print("nombre de biefs : ", ibmax)
-
-            logger.debug(f"read_bin: nb_reach = {ibmax}")
-            logger.debug(f"read_bin: nb_profile = {ismax}")
-
-            results.set("nb_reach", f"{ibmax}")
-            results.set("nb_profile", f"{ismax}")
-
-            reachs = []
-            iprofiles = {}
-            reach_offset = {}
-
-            for i in range(ibmax):
-                # Add results reach to reach list
-                r = results.river.add(i)
-                reachs.append(r)
-
-                is1[i] = data[2 * i] - 1 # first section of reach i (FORTRAN numbering)
-                is2[i] = data[2 * i + 1] - 1  # last section of reach i (FORTRAN numbering)
-
-                key = (is1[i], is2[i])
-                iprofiles[key] = r
-
-                reach_offset[r] = is1[i]
-
-            logger.debug(f"read_bin: iprofiles = {iprofiles}")
-
-            data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
-            # fourth line
-            pk = np.zeros(ismax, dtype=np.float32)
-            for k in range(0, ismax, kbl):
-                data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-                pk[k:min(k + kbl, ismax)] = np.fromfile(f, dtype=np.float32, count=min(k + kbl, ismax) - k)
-                print("pk : ", pk)
-                data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
-
-                # fifth line (useless)
-                data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-                zmin_OLD = np.fromfile(f, dtype=np.float32, count=1)[0]
-                print("zmin_OLD : ", zmin_OLD)
-                data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
-                # sixth line
-                zf = np.zeros(ismax, dtype=np.float32)
-                z = np.zeros(ismax * 3, dtype=np.float32)
-                for k in range(0, ismax, kbl):
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-                    z[3 * k:3 * min(k + kbl, ismax)] = np.fromfile(f, dtype=np.float32,
-                                                                   count=3 * (min(k + kbl, ismax) - k))
-                    # z[i*3+1] and z[i*3+2] are useless
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
-                zf = [z[i * 3] for i in range(ismax)]
-                print("zf : ", zf)
-                # seventh line (useless)
-                for k in range(0, ismax, kbl):
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-                    zero = np.fromfile(f, dtype=np.int32, count=ismax)
-                    print("zero : ", zero)
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
-                # end header
-
-        def ip_to_r(i): return iprofiles[
-            next(
-                filter(
-                    lambda k: k[0] <= i <= k[1],
-                    iprofiles
-                )
-            )
-        ]
-
-        def ip_to_ri(r, i): return i - reach_offset[r]
-
-        path_files = map(lambda file: os.path.join(repertory_results, file), files_bin_names)
-
-        data_tmp = {}
-
-        for file_bin in path_files:
-            key_pol = file_bin.split("/")[-1][0:-4]
-            data_tmp[key_pol] = {}
-            with open(file_bin, 'rb') as f:
-                # header
-                # first line
-                data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-                data = np.fromfile(f, dtype=np.int32, count=3)
-                ibmax = data[0]  # number of reaches
-                ismax = data[1]  # total number of cross sections
-                kbl = data[2] * -1  # block size for .BIN header
-                data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
-                # second line
-                data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-                ibu = np.fromfile(f, dtype=np.int32, count=ibmax)
-                data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
-                # third line
-                data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-                data = np.fromfile(f, dtype=np.int32, count=2 * ibmax)
-                is1 = np.zeros(ibmax, dtype=np.int32)
-                is2 = np.zeros(ibmax, dtype=np.int32)
-                for i in range(ibmax):
-                    is1[i] = data[2 * i]  # first section of reach i (FORTRAN numbering)
-                    is2[i] = data[2 * i + 1]  # last section of reach i (FORTRAN numbering)
-                data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
-                # fourth line
-                pk = np.zeros(ismax, dtype=np.float32)
-                for k in range(0, ismax, kbl):
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-                    pk[k:min(k + kbl, ismax)] = np.fromfile(f, dtype=np.float32, count=min(k + kbl, ismax) - k)
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
-                # fifth line (useless)
-                data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-                zmin_OLD = np.fromfile(f, dtype=np.float32, count=1)[0]
-                data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
-                # sixth line
-                zf = np.zeros(ismax, dtype=np.float32)
-                z = np.zeros(ismax * 3, dtype=np.float32)
-                for k in range(0, ismax, kbl):
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-                    z[3 * k:3 * min(k + kbl, ismax)] = np.fromfile(f, dtype=np.float32,
-                                                                   count=3 * (min(k + kbl, ismax) - k))
-                    # z[i*3+1] and z[i*3+2] are useless
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
-                zf = [z[i * 3] for i in range(ismax)]
-                # seventh line (useless)
-                for k in range(0, ismax, kbl):
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-                    zero = np.fromfile(f, dtype=np.int32, count=ismax)
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
-                # end header
-                # data
-                data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-                while data.size > 0:
-                    ismax = np.fromfile(f, dtype=np.int32, count=1)[0]
-                    t = np.fromfile(f, dtype=np.float64, count=1)[0]
-                    if not t in data_tmp[key_pol]:
-                        data_tmp[key_pol][t] = {}
-                    c = np.fromfile(f, dtype=np.byte, count=1)
-                    # possible values :
-                    # sediment : C, G, M, D, L, N, R
-                    # polutant : C, G, M, D
-                    phys_var = bytearray(c).decode()
-                    data_tmp[key_pol][t][phys_var] = {}
-                    real_data = np.fromfile(f, dtype=np.float32, count=ismax)
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
-                    data_tmp[key_pol][t][phys_var] = real_data
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (start)
-                # end data
-
-        ###print("dta tmp AAA")
-        ###print("-----------")
-        ###print(data_tmp["AAA-silt"])
-
-        pollutants_keys = list(data_tmp.keys())
-        timestamps_keys = list(data_tmp[pollutants_keys[0]].keys())
-        phys_data_names = list(data_tmp[pollutants_keys[0]][timestamps_keys[0]].keys())
-
-        ###print("pol keys: ", pollutants_keys)
-        ###print("t keys: ", timestamps_keys)
-        ###print("phys var: ", phys_data_names)
-        #print("set timestamps keys: ", set(timestamps_keys))
-        #print("isma")
-        ###print("iprofiles: ", iprofiles)
-
-        pi_tmp = []
-        reach_tmp = []
-
-        for i in range(ismax-1):
-            #print("first i: ", i)
-            reach = ip_to_r(i)
-            reach_tmp.append(reach)
-            #print("reach i:", reach)
-            #print("second i: ", i)
-            p_i = ip_to_ri(reach, i)
-            pi_tmp.append(p_i)
-
-            for t_data in timestamps_keys:
-                pol_view = []
-                for pol in pollutants_keys:
-                    #print("pol results: ", type(list(data_tmp[pol][t_data].values())))
-                    pol_view.append(tuple( list(map(lambda data_el: data_el[p_i], list(data_tmp[pol][t_data].values()))) ))
-
-                reach.set(p_i, t_data, "pols", pol_view)
-
-        ###print("pi_tmp: ", pi_tmp)
-        ###print("pol view: ", pol_view)
-        ###print("reach from i: ", reach_tmp)
-        #print("pol view: ", pol_view)
-        #print("results: ", results)
-        results.set("timestamps", set(timestamps_keys))
-        #print("------------------------set timestamps results meta data: ", set(timestamps_keys))
-
-        ###print("debug profiles for draw:")
-        ###print("------------------------")
-        ###print(data_tmp["AAA-silt"][0.0]["C"][0])
-        ###print(data_tmp["AAA-silt"][600.0]["C"][0])
-        ###print(data_tmp["AAA-silt"][1205.7208829578194]["C"][0])
-        ###print("========================")
-
-    @timer
-    def results(self, study, repertory, qlog=None, name=None):
-        self._study = study
-        if name is None:
-            name = study.name.replace(" ", "_")
-
-        results = super(AdisTSlc, self).results(study, repertory, qlog, name=name)
-
-        return results
-
-    def export_func_dict(self):
-        return [
-            self._export_NUM,
-            self._export_DIF,
-            self._export_D90,
-            self._export_POLs,
-        ]
-
-    @timer
-    def export(self, study, repertory, mage_rep, qlog=None, name="0"):
-        print("cmd solver adistslc : ", self._cmd_solver)
-        self._study = study
-        name = study.name.replace(" ", "_")
-
-        # Generate files
-        files = []
-
-        try:
-            for func in self.export_func_dict():
-                files = files + func(study, repertory, qlog, name=name)
-
-            self.export_additional_files(study, repertory, qlog, name=name)
-            self._export_REP(study, repertory, mage_rep, files, qlog, name=name)
-
-            return True
-        except Exception as e:
-            logger.error(f"Failed to export study to {self._type}")
-            logger_exception(e)
-            return False
-
-
-
-
-
-

src/Solver/Mage.py

@@ -180,7 +180,7 @@ class Mage(CommandLineSolver):
         c1 = f"{profile.code1:>6}"
         c2 = f"{profile.code2:>6}"
         t = f"{len(profile.points):>6}"
-        kp = f"{profile.kp:>12f}"[0:12]
+        rk = f"{profile.rk:>12f}"[0:12]
         pname = profile.name
         if profile.name == "":
             # Generate name from profile id prefixed with
@@ -207,7 +207,7 @@ class Mage(CommandLineSolver):
                 )
 
         # Profile header line
-        wfile.write(f"{num}{c1}{c2}{t} {kp} {pname} {sediment}\n")
+        wfile.write(f"{num}{c1}{c2}{t} {rk} {pname} {sediment}\n")
 
     def _export_ST_point_line(self, wfile, files, point):
         x = f"{point.x:<12.4f}"[0:12]
@@ -339,7 +339,7 @@ class Mage(CommandLineSolver):
         f.write(f"* {lateral.edge.name} ({name}) {lateral.lctype}\n")
         f.write(
             f"${name}    " +
-            f"{lateral.begin_kp:>10.4f} {lateral.end_kp:>10.4f}\n"
+            f"{lateral.begin_rk:>10.4f} {lateral.end_rk:>10.4f}\n"
         )
         header = lateral.header
         f.write(f"*{header[0]:>9}|{header[1]:>10}\n")
@@ -371,17 +371,17 @@ class Mage(CommandLineSolver):
                         continue
 
                     num = f"{id:>3}"
-                    bkp = f"{friction.begin_kp:>10.3f}"
-                    ekp = f"{friction.end_kp:>10.3f}"
+                    brk = f"{friction.begin_rk:>10.3f}"
+                    erk = f"{friction.end_rk:>10.3f}"
 
-                    # if friction.begin_kp != friction.end_kp:
+                    # if friction.begin_rk != friction.end_rk:
                     #     print("TODO")
 
                     strickler = friction.begin_strickler
                     coef_1 = f"{strickler.minor:>10.3f}"
                     coef_2 = f"{strickler.medium:>10.3f}"
 
-                    f.write(f"K{num}      {bkp}{ekp}{coef_1}{coef_2}\n")
+                    f.write(f"K{num}      {brk}{erk}{coef_1}{coef_2}\n")
 
                 id += 1
 
@@ -401,7 +401,7 @@ class Mage(CommandLineSolver):
 
             # TODO put real date...
             f.write(f"$ date en minutes :       0.00\n")
-            f.write(f"* IB IS    discharge  elevation         kp\n")
+            f.write(f"* IB IS    discharge  elevation         rk\n")
 
             id = 1
             for reach in reachs:
@@ -418,9 +418,9 @@ class Mage(CommandLineSolver):
                     IS = f"{id_sec}"
                     discharge = f"{d['discharge']:>10.5f}"
                     elevation = f"{d['elevation']:>11.6f}"
-                    kp = f"{d['kp']:>9.2f}"
+                    rk = f"{d['rk']:>9.2f}"
 
-                    f.write(f"{IR} {IS} {discharge} {elevation} {kp}\n")
+                    f.write(f"{IR} {IS} {discharge} {elevation} {rk}\n")
                     id_sec += 1
 
                 id += 1
@@ -495,12 +495,12 @@ class Mage(CommandLineSolver):
                 if not hs.enabled:
                     continue
 
-                if hs.input_kp is None:
+                if hs.input_rk is None:
                     continue
 
                 f.write(
                     '* ouvrage au pk ' +
-                    f"{float(hs.input_kp):>12.1f}" + ' ' +
+                    f"{float(hs.input_rk):>12.1f}" + ' ' +
                     hs.name + '\n'
                 )
 
@@ -527,7 +527,7 @@ class Mage(CommandLineSolver):
 
                 f.write(
                     f"{sin_dict[bhs._type]} " +
-                    f"{reach_id} {float(hs.input_kp):>12.3f} " +
+                    f"{reach_id} {float(hs.input_rk):>12.3f} " +
                     f"{param_str} {name}\n"
                 )
 
@@ -980,7 +980,6 @@ class Mage8(Mage):
 
                 # Add profile id correspondance to reach
                 key = (i1, i2)
-                print("mage keys reachs: ", key)
                 iprofiles[key] = r
 
                 # Profile ID offset
@@ -1013,8 +1012,6 @@ class Mage8(Mage):
             ]
             def ip_to_ri(r, i): return i - reach_offset[r]
 
-            print("mage iprofiles: ", iprofiles)
-
             ts = set()
             end = False
             while not end:
@@ -1050,7 +1047,6 @@ class Mage8(Mage):
 
             logger.debug(reachs[0].profiles[0]._data)
             results.set("timestamps", ts)
-            print("set timestamps mage: ", ts)
             logger.info(f"read_bin: ... end with {len(ts)} timestamp read")
 
     @timer

src/Solver/RubarBE.py

@@ -265,10 +265,10 @@ class RubarBE(CommandLineSolver):
 
                 ind = 1
                 for profile in reach.profiles:
-                    kp = profile.kp
+                    rk = profile.rk
                     n_points = len(profile)
 
-                    f.write(f"{ind:>4} {kp:>11.3f} {n_points:>4}\n")
+                    f.write(f"{ind:>4} {rk:>11.3f} {n_points:>4}\n")
 
                     for point in profile.points:
                         label = point.name.lower()
@@ -307,8 +307,8 @@ class RubarBE(CommandLineSolver):
                 lm = len(reach) + 1
                 f.write(f"{lm:>13}\n")
 
-                for mails in [reach.inter_profiles_kp(),
-                              reach.get_kp()]:
+                for mails in [reach.inter_profiles_rk(),
+                              reach.get_rk()]:
                     ind = 0
                     for mail in mails:
                         f.write(f"{mail:15.3f}")
@@ -338,7 +338,7 @@ class RubarBE(CommandLineSolver):
                 lm = len(reach) + 1
                 f.write(f"{lm:>6}\n")
 
-                def get_stricklers_from_kp(kp):
+                def get_stricklers_from_rk(rk):
                     return next(
                         map(
                             lambda s: (
@@ -346,15 +346,15 @@ class RubarBE(CommandLineSolver):
                                 else s.begin_strickler.minor
                             ),
                             filter(
-                                lambda f: kp in f,
+                                lambda f: rk in f,
                                 edge.frictions.lst
                             )
                         )
                     )
 
                 ind = 1
-                for mail in edge.reach.inter_profiles_kp():
-                    coef = get_stricklers_from_kp(mail)
+                for mail in edge.reach.inter_profiles_rk():
+                    coef = get_stricklers_from_rk(mail)
 
                     f.write(f"{ind:>6} {coef:>12.5f}")
 
@@ -382,7 +382,7 @@ class RubarBE(CommandLineSolver):
                 first = profiles[0]
                 last = profiles[-1]
 
-                if first.kp not in data or last.kp not in data:
+                if first.rk not in data or last.rk not in data:
                     logger.error(
                         "Study initial condition is not fully defined"
                     )
@@ -400,7 +400,7 @@ class RubarBE(CommandLineSolver):
 
                 prev_h, prev_s = f_h_s
                 for profile in it:
-                    if profile.kp not in data:
+                    if profile.rk not in data:
                         ind += 1
                         continue
 
@@ -424,7 +424,7 @@ class RubarBE(CommandLineSolver):
         data = {}
 
         for d in ics.data:
-            data[d['kp']] = (
+            data[d['rk']] = (
                 d['elevation'],
                 d['discharge'],
             )
@@ -432,8 +432,8 @@ class RubarBE(CommandLineSolver):
         return data
 
     def _export_tps_profile_height_speed(self, profile, data):
-        z = data[profile.kp][0]
-        q = data[profile.kp][1]
+        z = data[profile.rk][0]
+        q = data[profile.rk][1]
 
         height = z - profile.z_min()
         speed = profile.speed(q, z)

src/Solver/Solvers.py

@@ -23,7 +23,6 @@ from Solver.Mage import (
     Mage7, Mage8, MageFake7,
 )
 from Solver.RubarBE import RubarBE
-from Solver.AdisTS import AdisTSlc
 
 _translate = QCoreApplication.translate
 
@@ -32,8 +31,7 @@ solver_long_name = {
     # "mage7": "Mage v7",
     "mage8": "Mage v8",
     # "mage_fake7": "Mage fake v7",
-    "rubarbe": "RubarBE",
-    "adistslc": "Adis-TS_LC",
+    # "rubarbe": "RubarBE",
 }
 
 solver_type_list = {
@@ -41,6 +39,5 @@ solver_type_list = {
     # "mage7": Mage7,
     "mage8": Mage8,
     # "mage_fake7": MageFake7,
-    "rubarbe": RubarBE,
-    "adistslc": AdisTSlc,
+    # "rubarbe": RubarBE,
 }

src/View/BoundaryCondition/Edit/Table.py

@@ -99,7 +99,7 @@ class TableModel(PamhyrTableModel):
             logger.info(e)
             logger.debug(traceback.format_exc())
 
-        self.dataChanged.emit(index, index)
+        self.update()
         return True
 
     def add(self, row, parent=QModelIndex()):
@@ -112,7 +112,7 @@ class TableModel(PamhyrTableModel):
         )
 
         self.endInsertRows()
-        self.layoutChanged.emit()
+        self.update()
 
     def delete(self, rows, parent=QModelIndex()):
         self.beginRemoveRows(parent, rows[0], rows[-1])
@@ -135,7 +135,7 @@ class TableModel(PamhyrTableModel):
         )
 
         self.layoutAboutToBeChanged.emit()
-        self.layoutChanged.emit()
+        self.update()
 
     def move_up(self, row, parent=QModelIndex()):
         if row <= 0:
@@ -152,7 +152,7 @@ class TableModel(PamhyrTableModel):
         )
 
         self.endMoveRows()
-        self.layoutChanged.emit()
+        self.update()
 
     def move_down(self, index, parent=QModelIndex()):
         if row > len(self._data):
@@ -169,7 +169,7 @@ class TableModel(PamhyrTableModel):
         )
 
         self.endMoveRows()
-        self.layoutChanged.emit()
+        self.update()
 
     def paste(self, row, header, data):
         if len(data) == 0:
@@ -190,4 +190,13 @@ class TableModel(PamhyrTableModel):
         )
 
         self.layoutAboutToBeChanged.emit()
+        self.update()
+
+    def auto_sort(self):
+        self.layoutAboutToBeChanged.emit()
+        self._data.sort(key=lambda x: x[0])
+        self.layoutAboutToBeChanged.emit()
+
+    def update(self):
+        # self.auto_sort()
         self.layoutChanged.emit()

src/View/BoundaryCondition/Edit/Window.py

@@ -195,6 +195,7 @@ class EditBoundaryConditionWindow(PamhyrWindow):
         self.find(QAction, "action_sort").triggered.connect(self.sort)
 
         self._table.dataChanged.connect(self.update)
+        self._table.layoutChanged.connect(self.update)
 
         if self._is_solid:
             self._d50sigma.d50Changed.connect(self.d50_changed)

src/View/BoundaryCondition/translate.py

@@ -48,7 +48,7 @@ class BCTranslate(MainTranslate):
 
         self._sub_dict["long_types"] = {
             "ND": self._dict["not_defined"],
-            "PC": _translate("BoundaryCondition", "Ponctual contribution"),
+            "PC": _translate("BoundaryCondition", "Point sources"),
             "TZ": _translate("BoundaryCondition", "Z(t)"),
             "TD": _translate("BoundaryCondition", "Q(t)"),
             "ZD": _translate("BoundaryCondition", "Q(Z)"),

src/View/BoundaryConditionsAdisTS/Edit/Plot.py

@@ -1,105 +0,0 @@
-# Plot.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-
-from datetime import datetime
-
-from tools import timer, trace
-from View.Tools.PamhyrPlot import PamhyrPlot
-
-from PyQt5.QtCore import (
-    QCoreApplication
-)
-
-_translate = QCoreApplication.translate
-
-logger = logging.getLogger()
-
-
-class Plot(PamhyrPlot):
-    def __init__(self, mode="time", data=None,
-                 trad=None, canvas=None, toolbar=None,
-                 parent=None):
-        super(Plot, self).__init__(
-            canvas=canvas,
-            trad=trad,
-            data=data,
-            toolbar=toolbar,
-            parent=parent
-        )
-
-        self._table_headers = self._trad.get_dict("table_headers")
-
-        header = self.data.header
-
-        self.label_x = self._table_headers[header[0]]
-        self.label_y = self._table_headers[header[1]]
-
-        self._mode = mode
-        self._isometric_axis = False
-
-        self._auto_relim_update = True
-        self._autoscale_update = True
-
-    def custom_ticks(self):
-        if self.data.header[0] != "time":
-            return
-
-        self.set_ticks_time_formater()
-
-    @timer
-    def draw(self):
-        self.init_axes()
-
-        if len(self.data) == 0:
-            self._init = False
-            return
-
-        self.draw_data()
-        self.custom_ticks()
-
-        self.idle()
-        self._init = True
-
-    def draw_data(self):
-        # Plot data
-        x = list(map(lambda v: v[0], self.data.data))
-        y = list(map(lambda v: v[1], self.data.data))
-
-        self._line, = self.canvas.axes.plot(
-            x, y,
-            color=self.color_plot,
-            **self.plot_default_kargs
-        )
-
-    @timer
-    def update(self, ind=None):
-        if not self._init:
-            self.draw()
-            return
-
-        self.update_data()
-
-        self.update_idle()
-
-    def update_data(self):
-        x = list(map(lambda v: v[0], self.data.data))
-        y = list(map(lambda v: v[1], self.data.data))
-
-        self._line.set_data(x, y)

src/View/BoundaryConditionsAdisTS/Edit/Table.py

@@ -1,121 +0,0 @@
-# Table.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-import traceback
-
-from datetime import date, time, datetime, timedelta
-
-from tools import (
-    trace, timer,
-    timestamp_to_old_pamhyr_date,
-    old_pamhyr_date_to_timestamp
-)
-
-from View.Tools.PamhyrTable import PamhyrTableModel
-
-from PyQt5.QtCore import (
-    Qt, QVariant, QAbstractTableModel,
-    QCoreApplication, QModelIndex, pyqtSlot,
-    QRect, QTime, QDateTime,
-)
-
-from PyQt5.QtWidgets import (
-    QTableView, QAbstractItemView, QSpinBox,
-    QTimeEdit, QDateTimeEdit, QItemDelegate,
-)
-
-from View.BoundaryConditionsAdisTS.Edit.UndoCommand import (
-    AddCommand, DelCommand, SetDataCommand,
-)
-
-_translate = QCoreApplication.translate
-
-logger = logging.getLogger()
-
-
-class TableModel(PamhyrTableModel):
-    def data(self, index, role):
-        if role == Qt.TextAlignmentRole:
-            return Qt.AlignHCenter | Qt.AlignVCenter
-
-        if role != Qt.ItemDataRole.DisplayRole:
-            return QVariant()
-
-        row = index.row()
-        column = index.column()
-
-        value = QVariant()
-
-        if 0 <= column < 2:
-            v = self._data._data[row][column]
-            if self._data._types[column] == float:
-                value = f"{v:.4f}"
-            elif self._data.header[column] == "time":
-                if self._opt_data == "time":
-                    value = timestamp_to_old_pamhyr_date(int(v))
-                else:
-                    value = str(datetime.fromtimestamp(v))
-            else:
-                value = f"{v}"
-
-        return value
-
-    def setData(self, index, value, role=Qt.EditRole):
-        if not index.isValid() or role != Qt.EditRole:
-            return False
-
-        row = index.row()
-        column = index.column()
-
-        try:
-            self._undo.push(
-                SetDataCommand(
-                    self._data, row, column, value
-                )
-            )
-        except Exception as e:
-            logger.info(e)
-            logger.debug(traceback.format_exc())
-
-        self.dataChanged.emit(index, index)
-        return True
-
-    def add(self, row, parent=QModelIndex()):
-        self.beginInsertRows(parent, row, row - 1)
-
-        self._undo.push(
-            AddCommand(
-                self._data, row
-            )
-        )
-
-        self.endInsertRows()
-        self.layoutChanged.emit()
-
-    def delete(self, rows, parent=QModelIndex()):
-        self.beginRemoveRows(parent, rows[0], rows[-1])
-
-        self._undo.push(
-            DelCommand(
-                self._data, rows
-            )
-        )
-
-        self.endRemoveRows()
-

src/View/BoundaryConditionsAdisTS/Edit/UndoCommand.py

@@ -1,95 +0,0 @@
-# UndoCommand.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-
-from copy import deepcopy
-from tools import trace, timer
-
-from PyQt5.QtWidgets import (
-    QMessageBox, QUndoCommand, QUndoStack,
-)
-
-from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS import BoundaryConditionAdisTS
-
-logger = logging.getLogger()
-
-
-class SetDataCommand(QUndoCommand):
-    def __init__(self, data, index, column, new_value):
-        QUndoCommand.__init__(self)
-
-        self._data = data
-        self._index = index
-        self._column = column
-        self._old = self._data._data[self._index][self._column]
-        _type = self._data._types[self._column]
-        self._new = _type(new_value)
-
-    def undo(self):
-        if self._column == 0:
-            self._data._data[self._index] = (self._old,self._data._data[self._index][1])
-        else:
-            self._data._data[self._index] = (self._data._data[self._index][0], self._old)
-
-    def redo(self):
-        if self._column == 0:
-            self._data._data[self._index] = (self._new,self._data._data[self._index][1])
-        else:
-            self._data._data[self._index] = (self._data._data[self._index][0], self._new)
-
-class AddCommand(QUndoCommand):
-    def __init__(self, data, index):
-        QUndoCommand.__init__(self)
-
-        self._data = data
-        self._index = index
-        self._new = None
-
-    def undo(self):
-        del self._data._data[self._index]
-
-    def redo(self):
-        if self._new is None:
-            self._new = self._data._data.insert(self._index, (self._data._types[0](0), self._data._types[1](0.0)))
-        else:
-            self._data._data.insert(self._index, self._new)
-
-class DelCommand(QUndoCommand):
-    def __init__(self, data, rows):
-        QUndoCommand.__init__(self)
-
-        self._data = data
-        self._rows = rows
-
-        self._bc = []
-        for row in rows:
-            self._bc.append((row, self._data._data[row]))
-        self._bc.sort()
-
-    def undo(self):
-        for row, el in self._bc:
-            self._data._data.insert(row, el)
-
-    def redo(self):
-        for row in self._rows:
-            del self._data._data[row]
-
-
-
-

src/View/BoundaryConditionsAdisTS/Edit/Window.py

@@ -1,206 +0,0 @@
- # Window.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-
-from tools import timer, trace
-
-from View.Tools.PamhyrWindow import PamhyrWindow
-from View.Tools.PamhyrWidget import PamhyrWidget
-from View.Tools.PamhyrDelegate import PamhyrExTimeDelegate
-
-from PyQt5.QtGui import (
-    QKeySequence,
-)
-
-from PyQt5 import QtCore
-from PyQt5.QtCore import (
-    Qt, QVariant, QAbstractTableModel, QCoreApplication,
-    pyqtSlot, pyqtSignal,
-)
-
-from PyQt5.QtWidgets import (
-    QDialogButtonBox, QPushButton, QLineEdit,
-    QFileDialog, QTableView, QAbstractItemView,
-    QUndoStack, QShortcut, QAction, QItemDelegate,
-    QHeaderView, QDoubleSpinBox, QVBoxLayout,
-)
-
-from View.Tools.Plot.PamhyrCanvas import MplCanvas
-from View.Tools.Plot.PamhyrToolbar import PamhyrPlotToolbar
-
-from View.BoundaryConditionsAdisTS.Edit.translate import BCETranslate
-from View.BoundaryConditionsAdisTS.Edit.Table import TableModel
-from View.BoundaryConditionsAdisTS.Edit.Plot import Plot
-
-_translate = QCoreApplication.translate
-
-logger = logging.getLogger()
-
-class EditBoundaryConditionWindow(PamhyrWindow):
-    _pamhyr_ui = "EditBoundaryConditionsAdisTS"
-    _pamhyr_name = "Edit Boundary Conditions AdisTS"
-
-    def __init__(self, data=None, study=None, config=None, parent=None):
-        self._data = data
-        trad = BCETranslate()
-
-        name = trad[self._pamhyr_name]
-
-        super(EditBoundaryConditionWindow, self).__init__(
-            title=name,
-            study=study,
-            config=config,
-            trad=trad,
-            parent=parent
-        )
-
-        if self._data is not None:
-            n = self._data.node
-            node_name = next(filter(lambda x: x.id == n, self._study.river._nodes)).name
-            name += (
-                f" - {study.name} " +
-                f"({node_name})"
-            )
-
-        self._hash_data.append(data)
-
-        self.setup_table()
-        self.setup_plot()
-        self.setup_connections()
-
-    def setup_table(self):
-        if self._data.type == "Concentration":
-            self._data.header = ["time", "concentration"]
-        else:
-            self._data.header = ["time", "rate"]
-
-        headers = {}
-        table_headers = self._trad.get_dict("table_headers")
-        for h in self._data.header:
-            headers[h] = table_headers[h]
-
-        self._delegate_time = PamhyrExTimeDelegate(
-            data=self._data,
-            mode=self._study.time_system,
-            parent=self
-        )
-
-        table = self.find(QTableView, "tableView")
-        self._table = TableModel(
-            table_view=table,
-            table_headers=headers,
-            editable_headers=self._data.header,
-            delegates={
-                # "time": self._delegate_time,
-            },
-            data=self._data,
-            undo=self._undo_stack,
-            opt_data=self._study.time_system
-        )
-
-        table.setModel(self._table)
-        table.setSelectionBehavior(QAbstractItemView.SelectRows)
-        table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
-        table.setAlternatingRowColors(True)
-
-    def setup_plot(self):
-        self.canvas = MplCanvas(width=5, height=4, dpi=100)
-        self.canvas.setObjectName("canvas")
-        self.toolbar = PamhyrPlotToolbar(
-            self.canvas, self
-        )
-        self.verticalLayout.addWidget(self.toolbar)
-        self.verticalLayout.addWidget(self.canvas)
-
-        self.plot = Plot(
-            canvas=self.canvas,
-            data=self._data,
-            mode=self._study.time_system,
-            trad=self._trad,
-            toolbar=self.toolbar,
-        )
-        self.plot.draw()
-
-    def setup_connections(self):
-        self.find(QAction, "action_add").triggered.connect(self.add)
-        self.find(QAction, "action_del").triggered.connect(self.delete)
-
-        self._table.dataChanged.connect(self.update)
-
-    def update(self):
-        self.plot.update()
-
-    def index_selected_row(self):
-        table = self.find(QTableView, "tableView")
-        return table.selectionModel()\
-                    .selectedRows()[0]\
-                    .row()
-
-    def index_selected_rows(self):
-        table = self.find(QTableView, "tableView")
-        return list(
-            # Delete duplicate
-            set(
-                map(
-                    lambda i: i.row(),
-                    table.selectedIndexes()
-                )
-            )
-        )
-
-    def add(self):
-        rows = self.index_selected_rows()
-        if len(self._data) == 0 or len(rows) == 0:
-            self._table.add(0)
-        else:
-            self._table.add(rows[0])
-
-        self.plot.update()
-
-    def delete(self):
-        rows = self.index_selected_rows()
-        if len(rows) == 0:
-            return
-
-        self._table.delete(rows)
-        self.plot.update()
-
-    def sort(self):
-        self._table.sort(False)
-        self.plot.update()
-
-    def _copy(self):
-        rows = self.index_selected_rows()
-
-        table = []
-        table.append(self._data.header)
-
-        data = self._data.data
-        for row in rows:
-            table.append(list(data[row]))
-
-        self.copyTableIntoClipboard(table)
-
-    def _undo(self):
-        self._table.undo()
-        self.plot.update()
-
-    def _redo(self):
-        self._table.redo()
-        self.plot.update()

src/View/BoundaryConditionsAdisTS/Edit/translate.py

@@ -1,41 +0,0 @@
-# translate.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-from PyQt5.QtCore import QCoreApplication
-
-from View.Translate import MainTranslate
-
-from View.BoundaryCondition.translate import BCTranslate
-
-_translate = QCoreApplication.translate
-
-
-class BCETranslate(BCTranslate):
-    def __init__(self):
-        super(BCETranslate, self).__init__()
-
-        self._dict["Edit Boundary Conditions AdisTS"] = _translate(
-            "BoundaryConditionAdisTS", "Edit boundary conditions AdisTS"
-        )
-
-        self._sub_dict["table_headers"] = {
-            "time": self._dict["time"],
-            "date": self._dict["date"],
-            "rate": _translate("BoundaryConditionAdisTS", "Rate"),
-            "concentration": _translate("BoundaryConditionAdisTS", "Concentration"),
-        }

src/View/BoundaryConditionsAdisTS/Table.py

@@ -1,206 +0,0 @@
-# Table.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-import traceback
-
-from tools import trace, timer
-
-from PyQt5.QtCore import (
-    Qt, QVariant, QAbstractTableModel,
-    QCoreApplication, QModelIndex, pyqtSlot,
-    QRect,
-)
-
-from PyQt5.QtWidgets import (
-    QDialogButtonBox, QPushButton, QLineEdit,
-    QFileDialog, QTableView, QAbstractItemView,
-    QUndoStack, QShortcut, QAction, QItemDelegate,
-    QComboBox,
-)
-
-from Model.BoundaryCondition.BoundaryConditionTypes import (
-    NotDefined, PonctualContribution,
-    TimeOverZ, TimeOverDischarge, ZOverDischarge
-)
-
-from View.Tools.PamhyrTable import PamhyrTableModel
-
-from View.BoundaryConditionsAdisTS.UndoCommand import (
-    SetNodeCommand, SetTypeCommand,
-    AddCommand, DelCommand,
-)
-from View.BoundaryCondition.translate import BC_types
-
-logger = logging.getLogger()
-
-_translate = QCoreApplication.translate
-
-
-class ComboBoxDelegate(QItemDelegate):
-    def __init__(self, data=None, mode="type", tab="",
-                 trad=None, parent=None):
-        super(ComboBoxDelegate, self).__init__(parent)
-
-        self._data = data
-        self._mode = mode
-        self._tab = tab
-        self._trad = trad
-
-        self._long_types = {}
-        if self._trad is not None:
-            self._long_types = self._trad.get_dict("long_types")
-
-    def createEditor(self, parent, option, index):
-        self.editor = QComboBox(parent)
-
-        if self._mode == "type":
-            lst = [self._trad["not_associated"], "Concentration", "Rate"]
-            self.editor.addItems(
-                lst
-            )
-        else:
-            self.editor.addItems(
-                [self._trad["not_associated"]] +
-                self._data.nodes_names()
-            )
-
-        self.editor.setCurrentText(index.data(Qt.DisplayRole))
-        return self.editor
-
-    def setEditorData(self, editor, index):
-        value = index.data(Qt.DisplayRole)
-        self.editor.currentTextChanged.connect(self.currentItemChanged)
-
-    def setModelData(self, editor, model, index):
-        text = str(editor.currentText())
-        model.setData(index, text)
-        editor.close()
-        editor.deleteLater()
-
-    def updateEditorGeometry(self, editor, option, index):
-        r = QRect(option.rect)
-        if self.editor.windowFlags() & Qt.Popup:
-            if editor.parent() is not None:
-                r.setTopLeft(self.editor.parent().mapToGlobal(r.topLeft()))
-        editor.setGeometry(r)
-
-    @pyqtSlot()
-    def currentItemChanged(self):
-        self.commitData.emit(self.sender())
-
-
-class TableModel(PamhyrTableModel):
-    def __init__(self, pollutant=None, bc_list =None, trad=None, **kwargs):
-        self._trad = trad
-        self._bc_list = bc_list
-        self._pollutant = pollutant
-
-        super(TableModel, self).__init__(trad=trad, **kwargs)
-
-    def _setup_lst(self):
-        self._lst = self._bc_list.lst
-
-    def rowCount(self, parent):
-        return len(self._lst)
-
-    def data(self, index, role):
-        if len(self._lst) != 0:
-            data = list(filter(lambda x: x.pollutant == self._pollutant,
-                                     self._lst))
-        else:
-            data = []
-
-        if role != Qt.ItemDataRole.DisplayRole:
-            return QVariant()
-
-        row = index.row()
-        column = index.column()
-
-        if self._headers[column] == "type":
-            n = data[row].type
-            if n is None or n == "":
-                return self._trad["not_associated"]
-            return n
-        elif self._headers[column] == "node":
-            n = data[row].node
-            if n is None:
-                return self._trad["not_associated"]
-            return next(filter(lambda x: x.id == n, self._data._nodes)).name
-
-        return QVariant()
-
-    def setData(self, index, value, role=Qt.EditRole):
-        if not index.isValid() or role != Qt.EditRole:
-            return False
-
-        row = index.row()
-        column = index.column()
-
-        try:
-            if self._headers[column] == "type":
-                self._undo.push(
-                    SetTypeCommand(
-                        self._lst, row, value
-                    )
-                )
-            elif self._headers[column] == "node":
-                self._undo.push(
-                    SetNodeCommand(
-                        self._lst, row, self._data.node(value)
-                    )
-                )
-                print(value, self._data.node(value).id)
-        except Exception as e:
-            logger.info(e)
-            logger.debug(traceback.format_exc())
-
-        self.dataChanged.emit(index, index)
-        return True
-
-    def add(self, row, parent=QModelIndex()):
-        self.beginInsertRows(parent, row, row - 1)
-
-        self._undo.push(
-            AddCommand(
-                self._pollutant, self._bc_list, self._lst, row
-            )
-        )
-
-        self.endInsertRows()
-        self.layoutChanged.emit()
-
-    def delete(self, rows, parent=QModelIndex()):
-        self.beginRemoveRows(parent, rows[0], rows[-1])
-
-        self._undo.push(
-            DelCommand(
-                self._lst, rows
-            )
-        )
-
-        self.endRemoveRows()
-        self.layoutChanged.emit()
-
-    def undo(self):
-        self._undo.undo()
-        self.layoutChanged.emit()
-
-    def redo(self):
-        self._undo.redo()
-        self.layoutChanged.emit()

src/View/BoundaryConditionsAdisTS/UndoCommand.py

@@ -1,99 +0,0 @@
-# UndoCommand.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-from copy import deepcopy
-from tools import trace, timer
-
-from PyQt5.QtWidgets import (
-    QMessageBox, QUndoCommand, QUndoStack,
-)
-
-from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS import BoundaryConditionAdisTS
-from Model.BoundaryConditionsAdisTS.BoundaryConditionsAdisTSList import BoundaryConditionsAdisTSList
-
-class SetNodeCommand(QUndoCommand):
-    def __init__(self, bcs, index, node):
-        QUndoCommand.__init__(self)
-
-        self._bcs = bcs
-        self._index = index
-        self._old = self._bcs[self._index].node
-        self._new = node.id
-
-    def undo(self):
-        self._bcs[self._index].node = self._old
-
-    def redo(self):
-        self._bcs[self._index].node = self._new
-
-class SetTypeCommand(QUndoCommand):
-    def __init__(self, bcs, index, _type):
-        QUndoCommand.__init__(self)
-
-        self._bcs = bcs
-        self._index = index
-        self._type = _type
-        self._old = self._bcs[self._index].type
-        self._new = self._type
-
-    def undo(self):
-        self._bcs[self._index].type = self._old
-
-    def redo(self):
-        self._bcs[self._index].type = self._new
-
-class AddCommand(QUndoCommand):
-    def __init__(self, pollutant, bcs_list, bcs, index):
-        QUndoCommand.__init__(self)
-
-        self._bcs = bcs
-        self._bc_list = bcs_list
-        self._pollutant = pollutant
-        self._index = index
-        self._new = None
-
-    def undo(self):
-        del self._bcs[self._index]
-
-    def redo(self):
-        if self._new is None:
-            self._new = self._bc_list.new(self._index, self._pollutant)
-        else:
-            self._bcs.insert(self._index, self._new)
-
-
-class DelCommand(QUndoCommand):
-    def __init__(self, bcs, rows):
-        QUndoCommand.__init__(self)
-
-        self._bcs = bcs
-        self._rows = rows
-
-        self._bc = []
-        for row in rows:
-            self._bc.append((row, self._bcs[row]))
-        self._bc.sort()
-
-    def undo(self):
-        for row, el in self._bc:
-            self._bcs.insert(row, el)
-
-    def redo(self):
-        for row in self._rows:
-            del self._bcs[row]
-

src/View/BoundaryConditionsAdisTS/Window.py

@@ -1,195 +0,0 @@
-# Window.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-
-from tools import trace, timer, logger_exception
-
-from View.Tools.PamhyrWindow import PamhyrWindow
-
-from PyQt5.QtGui import (
-    QKeySequence,
-)
-
-from PyQt5.QtCore import (
-    Qt, QVariant, QAbstractTableModel,
-    QCoreApplication, QModelIndex, pyqtSlot,
-    QRect,
-)
-
-from PyQt5.QtWidgets import (
-    QDialogButtonBox, QPushButton, QLineEdit,
-    QFileDialog, QTableView, QAbstractItemView,
-    QUndoStack, QShortcut, QAction, QItemDelegate,
-    QComboBox, QVBoxLayout, QHeaderView, QTabWidget,
-    QWidget,
-)
-
-from View.BoundaryConditionsAdisTS.Table import (
-    TableModel, ComboBoxDelegate
-)
-
-from View.Network.GraphWidget import GraphWidget
-from View.BoundaryConditionsAdisTS.translate import BCAdisTSTranslate
-from View.BoundaryConditionsAdisTS.Edit.Window import EditBoundaryConditionWindow
-
-_translate = QCoreApplication.translate
-
-logger = logging.getLogger()
-
-
-class BoundaryConditionAdisTSWindow(PamhyrWindow):
-    _pamhyr_ui = "BoundaryConditionsAdisTS"
-    _pamhyr_name = "Boundary conditions AdisTS"
-
-    def __init__(self, pollutant=None, study=None, config=None, parent=None):
-        trad = BCAdisTSTranslate()
-        name = (
-            trad[self._pamhyr_name] +
-            " - " + study.name
-        )
-
-        self._pollutant = pollutant
-
-        super(BoundaryConditionAdisTSWindow, self).__init__(
-            title=name,
-            study=study,
-            config=config,
-            trad=trad,
-            parent=parent
-        )
-
-        self._bcs = self._study.river.boundary_conditions_adists
-
-        self.setup_table()
-        self.setup_graph()
-        self.setup_connections()
-
-        self.ui.setWindowTitle(self._title)
-
-    def setup_table(self):
-        self._delegate_type = ComboBoxDelegate(
-            trad=self._trad,
-            data=self._study.river,
-            mode="type",
-            parent=self
-        )
-        self._delegate_node = ComboBoxDelegate(
-            trad=self._trad,
-            data=self._study.river,
-            mode="node",
-            parent=self
-        )
-
-        table = self.find(QTableView, f"tableView")
-        self._table = TableModel(
-            table_view=table,
-            table_headers=self._trad.get_dict("table_headers"),
-            editable_headers=["type", "node"],
-            delegates={
-                "type": self._delegate_type,
-                "node": self._delegate_node,
-            },
-            trad=self._trad,
-            bc_list = self._study.river.boundary_conditions_adists,
-            undo=self._undo_stack,
-            pollutant=self._pollutant,
-            data=self._study.river
-        )
-        table.setModel(self._table)
-        table.setSelectionBehavior(QAbstractItemView.SelectRows)
-        table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
-        table.setAlternatingRowColors(True)
-
-    def setup_graph(self):
-        self.graph_widget = GraphWidget(
-            self._study.river,
-            min_size=None, size=(200, 200),
-            only_display=True,
-            parent=self
-        )
-        self.graph_layout = self.find(QVBoxLayout, "verticalLayout")
-        self.graph_layout.addWidget(self.graph_widget)
-
-    def setup_connections(self):
-        self.find(QAction, "action_add").triggered.connect(self.add)
-        self.find(QAction, "action_del").triggered.connect(self.delete)
-        self.find(QAction, "action_edit").triggered.connect(self.edit)
-
-    def index_selected_row(self):
-        tab = "liquid"
-        table = self.find(QTableView, f"tableView_{tab}")
-        return table.selectionModel()\
-                    .selectedRows()[0]\
-                    .row()
-
-    def index_selected_rows(self):
-        table = self.find(QTableView, f"tableView")
-        return list(
-            # Delete duplicate
-            set(
-                map(
-                    lambda i: i.row(),
-                    table.selectedIndexes()
-                )
-            )
-        )
-
-    def add(self):
-        rows = self.index_selected_rows()
-        if len(self._bcs) == 0 or len(rows) == 0:
-            self._table.add(0)
-        else:
-            self._table.add(rows[0])
-
-    def delete(self):
-        rows = self.index_selected_rows()
-        if len(rows) == 0:
-            return
-
-        self._table.delete(rows)
-
-    def _copy(self):
-        logger.info("TODO: copy")
-
-    def _paste(self):
-        logger.info("TODO: paste")
-
-    def _undo(self):
-        self._table.undo()
-
-    def _redo(self):
-        self._table.redo()
-
-    def edit(self):
-        rows = self.index_selected_rows()
-        for row in rows:
-            data = self._bcs.lst[row]
-
-            if self.sub_window_exists(
-                EditBoundaryConditionWindow,
-                data=[self._study, None, data]
-            ):
-                continue
-
-            win = EditBoundaryConditionWindow(
-                data=data,
-                study=self._study,
-                parent=self
-            )
-            win.show()

src/View/BoundaryConditionsAdisTS/translate.py

@@ -1,36 +0,0 @@
-# translate.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-from PyQt5.QtCore import QCoreApplication
-
-from View.Translate import MainTranslate
-
-_translate = QCoreApplication.translate
-
-class BCAdisTSTranslate(MainTranslate):
-    def __init__(self):
-        super(BCAdisTSTranslate, self).__init__()
-
-        self._dict["Boundary conditions AdisTS"] = _translate(
-            "BoundaryConditionsAdisTS", "Boundary conditions AdisTS"
-        )
-
-        self._sub_dict["table_headers"] = {
-            "type": self._dict["type"],
-            "node": _translate("BoundaryCondition", "Node")
-        }

src/View/CheckList/WindowAdisTS.py

@@ -1,200 +0,0 @@
-# WindowAdisTS.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-from tools import trace, timer
-
-from View.Tools.PamhyrWindow import PamhyrWindow
-
-from PyQt5.QtGui import (
-    QKeySequence,
-)
-
-from PyQt5.QtCore import (
-    Qt, QVariant, QAbstractTableModel,
-    QCoreApplication, QModelIndex, QRect, QThread,
-    pyqtSlot, pyqtSignal,
-)
-
-from PyQt5.QtWidgets import (
-    QDialogButtonBox, QPushButton, QLineEdit,
-    QFileDialog, QTableView, QAbstractItemView,
-    QUndoStack, QShortcut, QAction, QItemDelegate,
-    QComboBox, QVBoxLayout, QHeaderView, QTabWidget,
-    QProgressBar, QLabel,
-)
-
-from View.CheckList.Table import TableModel
-from View.CheckList.Worker import Worker
-from View.CheckList.Translate import CheckListTranslate
-
-_translate = QCoreApplication.translate
-
-
-class CheckListWindowAdisTS(PamhyrWindow):
-    _pamhyr_ui = "CheckList"
-    _pamhyr_name = "Check list"
-
-    signalStatus = pyqtSignal(str)
-
-    def __init__(self, autorun: bool = True,
-                 study=None, config=None,
-                 solver=None, parent=None, mage_rep=None):
-        trad = CheckListTranslate()
-
-        self._autorun = autorun
-        self._solver = solver
-        self._mage_rep = mage_rep
-
-        name = trad[self._pamhyr_name] + " - " + study.name
-
-        super(CheckListWindowAdisTS, self).__init__(
-            title=name,
-            study=study,
-            config=config,
-            trad=trad,
-            options=[],
-            parent=parent
-        )
-
-        # Add solver to hash computation data
-        self._hash_data.append(self._solver)
-
-        self._checker_list = (
-            self._study.checkers() +
-            self._solver.checkers()
-        )
-
-        self.setup_table()
-        self.setup_progress_bar()
-        self.setup_connections()
-        self.setup_thread()
-        self.setup_statusbar()
-
-    def setup_table(self):
-        table = self.find(QTableView, f"tableView")
-        self._table = TableModel(
-            table_view=table,
-            table_headers=self._trad.get_dict("table_headers"),
-            data=self._checker_list,
-        )
-
-    def setup_progress_bar(self):
-        self._progress = self.find(QProgressBar, f"progressBar")
-        self._p = 0             # Progress current step
-
-        self._progress.setRange(0, len(self._checker_list))
-        self._progress.setValue(self._p)
-
-    def setup_connections(self):
-        self.find(QPushButton, "pushButton_ok").clicked.connect(self.accept)
-        self.find(QPushButton, "pushButton_retry").clicked.connect(self.retry)
-        self.find(QPushButton, "pushButton_cancel")\
-            .clicked.connect(self.reject)
-
-    def setup_thread(self):
-        self._worker = Worker(self._study, self._checker_list)
-        self._worker_thread = QThread()
-        self._worker.moveToThread(self._worker_thread)
-
-        # Connect any worker signals
-        self._worker.signalStatus.connect(self.update)
-        self._worker_thread.started.connect(self._worker.process)
-
-        self._worker_thread.start()
-
-    def retry(self):
-        self._worker_thread.terminate()
-        self._worker_thread.wait()
-
-        self.find(QPushButton, "pushButton_retry").setEnabled(False)
-        self.find(QPushButton, "pushButton_ok").setEnabled(False)
-
-        self.setup_thread()
-
-    def _compute_status(self):
-        ok = len(list(filter(lambda c: c.is_ok(), self._checker_list)))
-        warning = len(
-            list(filter(lambda c: c.is_warning(), self._checker_list)))
-        error = len(list(filter(lambda c: c.is_error(), self._checker_list)))
-
-        return ok, warning, error
-
-    def _compute_status_label(self):
-        ok, warning, error = self._compute_status()
-        return (f"<font color=\"Green\">Ok: {ok} </font> |" +
-                f"<font color=\"Orange\">Warning: {warning} </font> |" +
-                f"<font color=\"Red\">Error: {error}</font>")
-
-    def setup_statusbar(self):
-        txt = self._compute_status_label()
-        self._status_label = QLabel(txt)
-        self.statusbar.addPermanentWidget(self._status_label)
-
-    def update_statusbar(self):
-        txt = self._compute_status_label()
-        self._status_label.setText(txt)
-
-    def progress(self):
-        self._p += 1
-        self._progress.setValue(self._p)
-        self._table.update()
-
-    def start_compute(self):
-        self._p = 0
-        self._progress.setValue(self._p)
-
-    def info_compute(self, str):
-        self.statusbar.showMessage(str, 3000)
-
-    def end_compute(self):
-        self._table.layoutChanged.emit()
-        self.find(QPushButton, "pushButton_retry").setEnabled(True)
-
-        errors = any(filter(lambda c: c.is_error(), self._checker_list))
-        if not errors:
-            self.find(QPushButton, "pushButton_ok").setEnabled(True)
-            if self._autorun:
-                self._parent.solver_log_adists(self._solver, self._mage_rep)
-                self.end()
-
-        self.update_statusbar()
-
-    def update(self, key: str):
-        if key == "start":
-            self.start_compute()
-            self.info_compute("Starting ...")
-        elif key == "end":
-            self.info_compute("Finish")
-            self.end_compute()
-        elif key == "progress":
-            self.progress()
-        else:
-            self.info_compute(key)
-
-        self.update_statusbar()
-
-    def end(self):
-        # self._worker.join()b
-        self.close()
-
-    def reject(self):
-        self.end()
-
-    def accept(self):
-        self._parent.solver_log_adists(self._solver, self._mage_rep)
-        # self.end()

src/View/CheckList/Worker.py

@@ -46,7 +46,7 @@ class Worker(QObject):
             self.signalStatus.emit(checker.name)
 
             # Run checker
-            checker._run(self._study)
+            checker.run(self._study)
 
             self.signalStatus.emit("progress")
 

src/View/D90AdisTS/Table.py

@@ -1,217 +0,0 @@
-# Table.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-import traceback
-from tools import trace, timer
-
-from PyQt5.QtCore import (
-    Qt, QVariant, QAbstractTableModel,
-    QCoreApplication, QModelIndex, pyqtSlot,
-    QRect,
-)
-
-from PyQt5.QtWidgets import (
-    QDialogButtonBox, QPushButton, QLineEdit,
-    QFileDialog, QTableView, QAbstractItemView,
-    QUndoStack, QShortcut, QAction, QItemDelegate,
-    QComboBox,
-)
-
-from View.Tools.PamhyrTable import PamhyrTableModel
-
-from View.D90AdisTS.UndoCommand import (
-    SetCommand, AddCommand, SetCommandSpec,
-    DelCommand,
-)
-
-logger = logging.getLogger()
-
-_translate = QCoreApplication.translate
-
-
-class ComboBoxDelegate(QItemDelegate):
-    def __init__(self, data=None, ic_spec_lst=None, trad=None, parent=None, mode="reaches"):
-        super(ComboBoxDelegate, self).__init__(parent)
-
-        self._data = data
-        self._mode = mode
-        self._trad = trad
-        self._ic_spec_lst = ic_spec_lst
-
-    def createEditor(self, parent, option, index):
-        self.editor = QComboBox(parent)
-
-        val = []
-        if self._mode == "kp":
-            reach_id = self._ic_spec_lst[index.row()].reach
-
-            reach = next(filter(lambda edge: edge.id == reach_id, self._data.edges()))
-
-            if reach_id is not None:
-                val = list(
-                    map(
-                        lambda kp: str(kp), reach.reach.get_kp()
-                    )
-                )
-        else:
-            val = list(
-                map(
-                    lambda n: n.name, self._data.edges()
-                )
-            )
-
-        self.editor.addItems(
-            [self._trad['not_associated']] +
-            val
-        )
-
-        self.editor.setCurrentText(str(index.data(Qt.DisplayRole)))
-        return self.editor
-
-    def setEditorData(self, editor, index):
-        value = index.data(Qt.DisplayRole)
-        self.editor.currentTextChanged.connect(self.currentItemChanged)
-
-    def setModelData(self, editor, model, index):
-        text = str(editor.currentText())
-        model.setData(index, text)
-        editor.close()
-        editor.deleteLater()
-
-    def updateEditorGeometry(self, editor, option, index):
-        r = QRect(option.rect)
-        if self.editor.windowFlags() & Qt.Popup:
-            if editor.parent() is not None:
-                r.setTopLeft(self.editor.parent().mapToGlobal(r.topLeft()))
-        editor.setGeometry(r)
-
-    @pyqtSlot()
-    def currentItemChanged(self):
-        self.commitData.emit(self.sender())
-
-
-class D90TableModel(PamhyrTableModel):
-    def __init__(self, river=None, data=None, **kwargs):
-        self._river = river
-
-        super(D90TableModel, self).__init__(data=data, **kwargs)
-
-        self._data = data
-
-    def _setup_lst(self):
-        self._lst = self._data._data
-
-    def rowCount(self, parent):
-        return len(self._lst)
-
-    def data(self, index, role):
-        if role != Qt.ItemDataRole.DisplayRole:
-            return QVariant()
-
-        row = index.row()
-        column = index.column()
-
-        if self._headers[column] is "name":
-            n = self._lst[row].name
-            if n is None or n == "":
-                return self._trad['not_associated']
-            return n
-        elif self._headers[column] is "reach":
-            n = self._lst[row].reach
-            if n is None:
-                return self._trad['not_associated']
-            return next(filter(lambda edge: edge.id == n, self._river.edges())).name
-        elif self._headers[column] is "start_kp":
-            n = self._lst[row].start_kp
-            if n is None:
-                return self._trad['not_associated']
-            return n
-        elif self._headers[column] is "end_kp":
-            n = self._lst[row].end_kp
-            if n is None:
-                return self._trad['not_associated']
-            return n
-        elif self._headers[column] is "d90":
-            n = self._lst[row].d90
-            if n is None:
-                return self._trad['not_associated']
-            return n
-
-        return QVariant()
-
-    def setData(self, index, value, role=Qt.EditRole):
-        if not index.isValid() or role != Qt.EditRole:
-            return False
-
-        row = index.row()
-        column = index.column()
-
-        try:
-            if self._headers[column] != "reach":
-                self._undo.push(
-                    SetCommandSpec(
-                        self._lst, row, self._headers[column], value
-                    )
-                )
-            elif self._headers[column] == "reach":
-                print(self._river.edge(value).id)
-                self._undo.push(
-                    SetCommandSpec(
-                        self._lst, row, self._headers[column], self._river.edge(value).id
-                    )
-                )
-        except Exception as e:
-            logger.info(e)
-            logger.debug(traceback.format_exc())
-
-        self.dataChanged.emit(index, index)
-        return True
-
-    def add(self, row, parent=QModelIndex()):
-        self.beginInsertRows(parent, row, row - 1)
-
-        self._undo.push(
-            AddCommand(
-                self._data, self._lst, row
-            )
-        )
-
-        self.endInsertRows()
-        self.layoutChanged.emit()
-
-    def delete(self, rows, parent=QModelIndex()):
-        self.beginRemoveRows(parent, rows[0], rows[-1])
-
-        self._undo.push(
-            DelCommand(
-                self._data, self._lst, rows
-            )
-        )
-
-        self.endRemoveRows()
-        self.layoutChanged.emit()
-
-    def undo(self):
-        self._undo.undo()
-        self.layoutChanged.emit()
-
-    def redo(self):
-        self._undo.redo()
-        self.layoutChanged.emit()
-

src/View/D90AdisTS/TableDefault.py

@@ -1,95 +0,0 @@
-# Table.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-import traceback
-from tools import trace, timer
-
-from PyQt5.QtCore import (
-    Qt, QVariant, QAbstractTableModel,
-    QCoreApplication, QModelIndex, pyqtSlot,
-    QRect,
-)
-
-from PyQt5.QtWidgets import (
-    QDialogButtonBox, QPushButton, QLineEdit,
-    QFileDialog, QTableView, QAbstractItemView,
-    QUndoStack, QShortcut, QAction, QItemDelegate,
-    QComboBox,
-)
-
-from View.Tools.PamhyrTable import PamhyrTableModel
-
-from View.D90AdisTS.UndoCommand import (
-    SetCommand,
-)
-
-logger = logging.getLogger()
-
-_translate = QCoreApplication.translate
-
-class D90TableDefaultModel(PamhyrTableModel):
-    def __init__(self, **kwargs):
-        super(D90TableDefaultModel, self).__init__(**kwargs)
-
-    def data(self, index, role):
-        if role != Qt.ItemDataRole.DisplayRole:
-            return QVariant()
-
-        row = index.row()
-        column = index.column()
-
-        if self._headers[column] is "name":
-            return self._data[row].name
-        elif self._headers[column] is "d90":
-            n = self._data[row].d90
-            if n is None:
-                return self._trad['not_associated']
-            return n
-
-        return QVariant()
-
-    def setData(self, index, value, role=Qt.EditRole):
-        if not index.isValid() or role != Qt.EditRole:
-            return False
-
-        row = index.row()
-        column = index.column()
-
-        try:
-            if self._headers[column] is not None:
-                self._undo.push(
-                    SetCommand(
-                        self._data, row, self._headers[column], value
-                    )
-                )
-        except Exception as e:
-            logger.info(e)
-            logger.debug(traceback.format_exc())
-
-        self.dataChanged.emit(index, index)
-        return True
-
-    def undo(self):
-        self._undo.undo()
-        self.layoutChanged.emit()
-
-    def redo(self):
-        self._undo.redo()
-        self.layoutChanged.emit()
-

src/View/D90AdisTS/UndoCommand.py

@@ -1,150 +0,0 @@
-# UndoCommand.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-from copy import deepcopy
-from tools import trace, timer
-
-from PyQt5.QtWidgets import (
-    QMessageBox, QUndoCommand, QUndoStack,
-)
-
-from Model.D90AdisTS.D90AdisTS import D90AdisTS
-from Model.D90AdisTS.D90AdisTSList import D90AdisTSList
-
-
-class SetCommand(QUndoCommand):
-    def __init__(self, data, row, column, new_value):
-        QUndoCommand.__init__(self)
-
-        self._data = data
-        self._row = row
-        self._column = column
-
-        if self._column == "name":
-            self._old = self._data[self._row].name
-        elif self._column == "d90":
-            self._old = self._data[self._row].d90
-
-        _type = float
-        if column == "name":
-            _type = str
-
-        self._new = _type(new_value)
-
-    def undo(self):
-        if self._column == "name":
-            self._data[self._row].name = self._old
-        elif self._column == "d90":
-            self._data[self._row].d90 = self._old
-
-    def redo(self):
-        if self._column == "name":
-            self._data[self._row].name = self._new
-        elif self._column == "d90":
-            self._data[self._row].d90 = self._new
-
-class SetCommandSpec(QUndoCommand):
-    def __init__(self, data, row, column, new_value):
-        QUndoCommand.__init__(self)
-
-        self._data = data
-        self._row = row
-        self._column = column
-
-        if self._column == "name":
-            self._old = self._data[self._row].name
-        elif self._column == "reach":
-            self._old = self._data[self._row].reach
-        elif self._column == "start_kp":
-            self._old = self._data[self._row].start_kp
-        elif self._column == "end_kp":
-            self._old = self._data[self._row].end_kp
-        elif self._column == "d90":
-            self._old = self._data[self._row].d90
-
-        _type = float
-        if column == "name":
-            _type = str
-        elif column == "reach":
-            _type = int
-
-        self._new = _type(new_value)
-
-    def undo(self):
-        if self._column == "name":
-            self._data[self._row].name = self._old
-        elif self._column == "reach":
-            self._data[self._row].reach = self._old
-        elif self._column == "start_kp":
-            self._data[self._row].start_kp = self._old
-        elif self._column == "end_kp":
-            self._data[self._row].end_kp = self._old
-        elif self._column == "d90":
-            self._data[self._row].d90 = self._old
-
-    def redo(self):
-        if self._column == "name":
-            self._data[self._row].name = self._new
-        elif self._column == "reach":
-            self._data[self._row].reach = self._new
-        elif self._column == "start_kp":
-            self._data[self._row].start_kp = self._new
-        elif self._column == "end_kp":
-            self._data[self._row].end_kp = self._new
-        elif self._column == "d90":
-            self._data[self._row].d90 = self._new
-
-class AddCommand(QUndoCommand):
-    def __init__(self, data, ics_spec, index):
-        QUndoCommand.__init__(self)
-
-        self._data = data
-        self._ics_spec = ics_spec
-        self._index = index
-        self._new = None
-
-    def undo(self):
-        self._data.delete_i([self._index])
-
-    def redo(self):
-        if self._new is None:
-            self._new = self._data.new(self._index)
-        else:
-            self._data.insert(self._index, self._new)
-
-class DelCommand(QUndoCommand):
-    def __init__(self, data, ics_spec, rows):
-        QUndoCommand.__init__(self)
-
-        self._data = data
-        self._ics_spec = ics_spec
-        self._rows = rows
-        #self._data = data
-
-        self._ic = []
-        for row in rows:
-            self._ic.append((row, self._ics_spec[row]))
-        self._ic.sort()
-
-    def undo(self):
-        for row, el in self._ic:
-            self._data.insert(row, el)
-
-    def redo(self):
-        self._data.delete_i(self._rows)
-

src/View/D90AdisTS/Window.py

@@ -1,283 +0,0 @@
-# Window.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import os
-import logging
-
-from tools import trace, timer, logger_exception
-
-from View.Tools.PamhyrWindow import PamhyrWindow
-
-from PyQt5.QtGui import (
-    QKeySequence, QIcon,
-)
-
-from PyQt5.QtCore import (
-    Qt, QVariant, QAbstractTableModel,
-    QCoreApplication, QModelIndex, pyqtSlot,
-    QRect, QItemSelectionModel,
-)
-
-from PyQt5.QtWidgets import (
-    QDialogButtonBox, QPushButton, QLineEdit,
-    QFileDialog, QTableView, QAbstractItemView,
-    QUndoStack, QShortcut, QAction, QItemDelegate,
-    QComboBox, QVBoxLayout, QHeaderView, QTabWidget,
-    QVBoxLayout, QToolBar, QAction, QToolButton,
-)
-
-from Modules import Modules
-
-from View.InitialConditionsAdisTS.UndoCommand import (
-    SetCommand,
-)
-
-from View.D90AdisTS.TableDefault import (
-    D90TableDefaultModel,
-)
-
-from View.D90AdisTS.Table import (
-    D90TableModel, ComboBoxDelegate,
-)
-
-from View.D90AdisTS.translate import D90AdisTSTranslate
-
-from Solver.Mage import Mage8
-
-_translate = QCoreApplication.translate
-
-logger = logging.getLogger()
-
-
-class D90AdisTSWindow(PamhyrWindow):
-    _pamhyr_ui = "D90AdisTS"
-    _pamhyr_name = "D90 AdisTS"
-
-    def __init__(self, data=None, study=None, config=None, parent=None):
-        self._data = []
-        self._data.append(data)
-        trad = D90AdisTSTranslate()
-
-        name = (
-            trad[self._pamhyr_name] +
-            " - " + study.name +
-            " - " + self._data[0].name
-        )
-
-        super(D90AdisTSWindow, self).__init__(
-            title=name,
-            study=study,
-            config=config,
-            trad=trad,
-            parent=parent
-        )
-
-        self._hash_data.append(data)
-
-        self._d90_adists_lst = study.river.d90_adists
-
-        self.setup_table()
-
-        self.ui.setWindowTitle(self._title)
-
-    def setup_table(self):
-
-        path_icons = os.path.join(self._get_ui_directory(), f"ressources")
-
-        table_default = self.find(QTableView, f"tableView")
-
-        self._table = D90TableDefaultModel(
-            table_view=table_default,
-            table_headers=self._trad.get_dict("table_headers"),
-            editable_headers=["name", "d90"],
-            delegates={},
-            data=self._data,
-            undo=self._undo_stack,
-            trad=self._trad
-        )
-
-        table_default.setModel(self._table)
-        table_default.setSelectionBehavior(QAbstractItemView.SelectRows)
-        table_default.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
-        table_default.setAlternatingRowColors(True)
-
-        layout = self.find(QVBoxLayout, f"verticalLayout_1")
-        toolBar = QToolBar()
-        layout.addWidget(toolBar)
-
-        action_add = QAction(self)
-        action_add.setIcon(QIcon(os.path.join(path_icons, f"add.png")))
-        action_add.triggered.connect(self.add)
-        action_delete = QAction(self)
-        action_delete.setIcon(QIcon(os.path.join(path_icons, f"del.png")))
-        action_delete.triggered.connect(self.delete)
-
-        toolBar.addAction(action_add)
-        toolBar.addAction(action_delete)
-
-        self.table_spec = QTableView()
-        layout.addWidget(self.table_spec)
-
-        self._delegate_reach = ComboBoxDelegate(
-            trad=self._trad,
-            data=self._study.river,
-            ic_spec_lst=self._data[0]._data,
-            parent=self,
-            mode="reaches"
-        )
-        self._delegate_kp = ComboBoxDelegate(
-            trad=self._trad,
-            data=self._study.river,
-            ic_spec_lst=self._data[0]._data,
-            parent=self,
-            mode="kp"
-        )
-
-        self._table_spec = D90TableModel(
-            table_view=self.table_spec,
-            table_headers=self._trad.get_dict("table_headers_spec"),
-            editable_headers=["name", "reach", "start_kp", "end_kp", "d90"],
-            delegates={
-                "reach": self._delegate_reach,
-                "start_kp": self._delegate_kp,
-                "end_kp": self._delegate_kp
-            },
-            data=self._data[0],
-            undo=self._undo_stack,
-            trad=self._trad,
-            river=self._study.river
-        )
-
-        self.table_spec.setModel(self._table_spec)
-        self.table_spec.setSelectionBehavior(QAbstractItemView.SelectRows)
-        self.table_spec.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
-        self.table_spec.setAlternatingRowColors(True)
-
-        selectionModel = self.table_spec.selectionModel()
-        index = self.table_spec.model().index(0, 0)
-
-        selectionModel.select(
-            index,
-            QItemSelectionModel.Rows |
-            QItemSelectionModel.ClearAndSelect |
-            QItemSelectionModel.Select
-        )
-        self.table_spec.scrollTo(index)
-
-    def index_selected_row(self):
-        #table = self.find(QTableView, f"tableView")
-        table = self.table_spec
-        rows = table.selectionModel()\
-                    .selectedRows()
-
-        if len(rows) == 0:
-            return 0
-
-        return rows[0].row()
-
-    def index_selected_rows(self):
-        #table = self.find(QTableView, f"tableView")
-        table = self.table_spec
-        return list(
-            # Delete duplicate
-            set(
-                map(
-                    lambda i: i.row(),
-                    table.selectedIndexes()
-                )
-            )
-        )
-
-    def move_up(self):
-        row = self.index_selected_row()
-        self._table.move_up(row)
-        self._update()
-
-    def move_down(self):
-        row = self.index_selected_row()
-        self._table.move_down(row)
-        self._update()
-
-    def _copy(self):
-        rows = list(
-            map(
-                lambda row: row.row(),
-                self.tableView.selectionModel().selectedRows()
-            )
-        )
-
-        table = list(
-            map(
-                lambda eic: list(
-                    map(
-                        lambda k: eic[1][k],
-                        ["kp", "discharge", "elevation"]
-                    )
-                ),
-                filter(
-                    lambda eic: eic[0] in rows,
-                    enumerate(self._ics.lst())
-                )
-            )
-        )
-
-        self.copyTableIntoClipboard(table)
-
-    def _paste(self):
-        header, data = self.parseClipboardTable()
-
-        if len(data) + len(header) == 0:
-            return
-
-        logger.debug(
-            "D90: Paste: " +
-            f"header = {header}, " +
-            f"data = {data}"
-        )
-
-        try:
-            row = self.index_selected_row()
-            # self._table.paste(row, header, data)
-            self._table.paste(row, [], data)
-        except Exception as e:
-            logger_exception(e)
-
-        self._update()
-
-    def _undo(self):
-        self._table.undo()
-        self._update()
-
-    def _redo(self):
-        self._table.redo()
-        self._update()
-
-    def add(self):
-        rows = self.index_selected_rows()
-        if len(self._data[0]._data) == 0 or len(rows) == 0:
-            self._table_spec.add(0)
-        else:
-            self._table_spec.add(rows[0])
-
-    def delete(self):
-        print("del")
-        rows = self.index_selected_rows()
-        if len(rows) == 0:
-            print("len 0")
-            return
-        self._table_spec.delete(rows)

src/View/D90AdisTS/translate.py

@@ -1,46 +0,0 @@
-# translate.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-from PyQt5.QtCore import QCoreApplication
-
-from View.Translate import MainTranslate
-
-_translate = QCoreApplication.translate
-
-
-class D90AdisTSTranslate(MainTranslate):
-    def __init__(self):
-        super(D90AdisTSTranslate, self).__init__()
-
-        self._dict["D90 AdisTS"] = _translate(
-            "D90AdisTS", "D90 AdisTS")
-
-        self._dict["kp"] = self._dict["unit_kp"]
-
-        self._sub_dict["table_headers"] = {
-            "name": self._dict["name"],
-            "d90": _translate("Unit", "D90"),
-        }
-
-        self._sub_dict["table_headers_spec"] = {
-            "name": self._dict["name"],
-            "reach": self._dict["reach"],
-            "start_kp": _translate("Unit", "Start_KP (m)"),
-            "end_kp": _translate("Unit", "End_KP (m)"),
-            "d90": _translate("Unit", "D90"),
-        }

src/View/DIFAdisTS/Table.py

@@ -1,229 +0,0 @@
-# Table.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-import traceback
-from tools import trace, timer
-
-from PyQt5.QtCore import (
-    Qt, QVariant, QAbstractTableModel,
-    QCoreApplication, QModelIndex, pyqtSlot,
-    QRect,
-)
-
-from PyQt5.QtWidgets import (
-    QDialogButtonBox, QPushButton, QLineEdit,
-    QFileDialog, QTableView, QAbstractItemView,
-    QUndoStack, QShortcut, QAction, QItemDelegate,
-    QComboBox,
-)
-
-from View.Tools.PamhyrTable import PamhyrTableModel
-
-from View.DIFAdisTS.UndoCommand import (
-    SetCommand, AddCommand, SetCommandSpec,
-    DelCommand,
-)
-
-logger = logging.getLogger()
-
-_translate = QCoreApplication.translate
-
-
-class ComboBoxDelegate(QItemDelegate):
-    def __init__(self, data=None, ic_spec_lst=None, trad=None, parent=None, mode="reaches"):
-        super(ComboBoxDelegate, self).__init__(parent)
-
-        self._data = data
-        self._mode = mode
-        self._trad = trad
-        self._ic_spec_lst = ic_spec_lst
-
-    def createEditor(self, parent, option, index):
-        self.editor = QComboBox(parent)
-
-        val = []
-        if self._mode == "kp":
-            reach_id = self._ic_spec_lst[index.row()].reach
-
-            reach = next(filter(lambda edge: edge.id == reach_id, self._data.edges()))
-
-            if reach_id is not None:
-                val = list(
-                    map(
-                        lambda kp: str(kp), reach.reach.get_kp()
-                    )
-                )
-        elif self._mode == "method":
-            val = self._data.dif_adists.lst[0].types
-        else:
-            val = list(
-                map(
-                    lambda n: n.name, self._data.edges()
-                )
-            )
-
-        self.editor.addItems(
-            [self._trad['not_associated']] +
-            val
-        )
-
-        self.editor.setCurrentText(str(index.data(Qt.DisplayRole)))
-        return self.editor
-
-    def setEditorData(self, editor, index):
-        value = index.data(Qt.DisplayRole)
-        self.editor.currentTextChanged.connect(self.currentItemChanged)
-
-    def setModelData(self, editor, model, index):
-        text = str(editor.currentText())
-        model.setData(index, text)
-        editor.close()
-        editor.deleteLater()
-
-    def updateEditorGeometry(self, editor, option, index):
-        r = QRect(option.rect)
-        if self.editor.windowFlags() & Qt.Popup:
-            if editor.parent() is not None:
-                r.setTopLeft(self.editor.parent().mapToGlobal(r.topLeft()))
-        editor.setGeometry(r)
-
-    @pyqtSlot()
-    def currentItemChanged(self):
-        self.commitData.emit(self.sender())
-
-
-class DIFTableModel(PamhyrTableModel):
-    def __init__(self, river=None, data=None, **kwargs):
-        self._river = river
-
-        super(DIFTableModel, self).__init__(data=data, **kwargs)
-
-        self._data = data
-
-    def _setup_lst(self):
-        self._lst = self._data._data
-
-    def rowCount(self, parent):
-        return len(self._lst)
-
-    def data(self, index, role):
-        if role != Qt.ItemDataRole.DisplayRole:
-            return QVariant()
-
-        row = index.row()
-        column = index.column()
-
-        if self._headers[column] is "method":
-            n = self._lst[row].method
-            if n is None or n == "":
-                return self._trad['not_associated']
-            return n
-        elif self._headers[column] is "reach":
-            n = self._lst[row].reach
-            if n is None:
-                return self._trad['not_associated']
-            return next(filter(lambda edge: edge.id == n, self._river.edges())).name
-        elif self._headers[column] is "start_kp":
-            n = self._lst[row].start_kp
-            if n is None:
-                return self._trad['not_associated']
-            return n
-        elif self._headers[column] is "end_kp":
-            n = self._lst[row].end_kp
-            if n is None:
-                return self._trad['not_associated']
-            return n
-        elif self._headers[column] is "dif":
-            n = self._lst[row].dif
-            if n is None:
-                return self._trad['not_associated']
-            return n
-        elif self._headers[column] is "b":
-            n = self._lst[row].b
-            if n is None:
-                return self._trad['not_associated']
-            return n
-        elif self._headers[column] is "c":
-            n = self._lst[row].c
-            if n is None:
-                return self._trad['not_associated']
-            return n
-
-        return QVariant()
-
-    def setData(self, index, value, role=Qt.EditRole):
-        if not index.isValid() or role != Qt.EditRole:
-            return False
-
-        row = index.row()
-        column = index.column()
-
-        try:
-            if self._headers[column] != "reach":
-                self._undo.push(
-                    SetCommandSpec(
-                        self._lst, row, self._headers[column], value
-                    )
-                )
-            elif self._headers[column] == "reach":
-                print(self._river.edge(value).id)
-                self._undo.push(
-                    SetCommandSpec(
-                        self._lst, row, self._headers[column], self._river.edge(value).id
-                    )
-                )
-        except Exception as e:
-            logger.info(e)
-            logger.debug(traceback.format_exc())
-
-        self.dataChanged.emit(index, index)
-        return True
-
-    def add(self, row, parent=QModelIndex()):
-        self.beginInsertRows(parent, row, row - 1)
-
-        self._undo.push(
-            AddCommand(
-                self._data, self._lst, row
-            )
-        )
-
-        self.endInsertRows()
-        self.layoutChanged.emit()
-
-    def delete(self, rows, parent=QModelIndex()):
-        self.beginRemoveRows(parent, rows[0], rows[-1])
-
-        self._undo.push(
-            DelCommand(
-                self._data, self._lst, rows
-            )
-        )
-
-        self.endRemoveRows()
-        self.layoutChanged.emit()
-
-    def undo(self):
-        self._undo.undo()
-        self.layoutChanged.emit()
-
-    def redo(self):
-        self._undo.redo()
-        self.layoutChanged.emit()
-

src/View/DIFAdisTS/TableDefault.py

@@ -1,108 +0,0 @@
-# Table.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-import traceback
-from tools import trace, timer
-
-from PyQt5.QtCore import (
-    Qt, QVariant, QAbstractTableModel,
-    QCoreApplication, QModelIndex, pyqtSlot,
-    QRect,
-)
-
-from PyQt5.QtWidgets import (
-    QDialogButtonBox, QPushButton, QLineEdit,
-    QFileDialog, QTableView, QAbstractItemView,
-    QUndoStack, QShortcut, QAction, QItemDelegate,
-    QComboBox,
-)
-
-from View.Tools.PamhyrTable import PamhyrTableModel
-
-from View.DIFAdisTS.UndoCommand import (
-    SetCommand,
-)
-
-logger = logging.getLogger()
-
-_translate = QCoreApplication.translate
-
-class DIFTableDefaultModel(PamhyrTableModel):
-    def __init__(self, **kwargs):
-        super(DIFTableDefaultModel, self).__init__(**kwargs)
-
-    def data(self, index, role):
-        if role != Qt.ItemDataRole.DisplayRole:
-            return QVariant()
-
-        row = index.row()
-        column = index.column()
-
-        if self._headers[column] is "method":
-            n = self._data[row].method
-            if n is None:
-                return self._trad['not_associated']
-            return n
-        elif self._headers[column] is "dif":
-            n = self._data[row].dif
-            if n is None:
-                return self._trad['not_associated']
-            return n
-        elif self._headers[column] is "b":
-            n = self._data[row].b
-            if n is None:
-                return self._trad['not_associated']
-            return n
-        elif self._headers[column] is "c":
-            n = self._data[row].c
-            if n is None:
-                return self._trad['not_associated']
-            return n
-
-        return QVariant()
-
-    def setData(self, index, value, role=Qt.EditRole):
-        if not index.isValid() or role != Qt.EditRole:
-            return False
-
-        row = index.row()
-        column = index.column()
-
-        try:
-            if self._headers[column] is not None:
-                self._undo.push(
-                    SetCommand(
-                        self._data, row, self._headers[column], value
-                    )
-                )
-        except Exception as e:
-            logger.info(e)
-            logger.debug(traceback.format_exc())
-
-        self.dataChanged.emit(index, index)
-        return True
-
-    def undo(self):
-        self._undo.undo()
-        self.layoutChanged.emit()
-
-    def redo(self):
-        self._undo.redo()
-        self.layoutChanged.emit()
-

src/View/DIFAdisTS/UndoCommand.py

@@ -1,174 +0,0 @@
-# UndoCommand.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-from copy import deepcopy
-from tools import trace, timer
-
-from PyQt5.QtWidgets import (
-    QMessageBox, QUndoCommand, QUndoStack,
-)
-
-from Model.DIFAdisTS.DIFAdisTS import DIFAdisTS
-from Model.DIFAdisTS.DIFAdisTSList import DIFAdisTSList
-
-
-class SetCommand(QUndoCommand):
-    def __init__(self, data, row, column, new_value):
-        QUndoCommand.__init__(self)
-
-        self._data = data
-        self._row = row
-        self._column = column
-
-        if self._column == "method":
-            self._old = self._data[self._row].method
-        elif self._column == "dif":
-            self._old = self._data[self._row].dif
-        elif self._column == "b":
-            self._old = self._data[self._row].b
-        elif self._column == "c":
-            self._old = self._data[self._row].c
-
-        _type = float
-        if column == "method":
-            _type = str
-
-        self._new = _type(new_value)
-
-    def undo(self):
-        if self._column == "method":
-            self._data[self._row].method = self._old
-        elif self._column == "dif":
-            self._data[self._row].dif = self._old
-        elif self._column == "b":
-            self._data[self._row].b = self._old
-        elif self._column == "c":
-            self._data[self._row].c = self._old
-
-    def redo(self):
-        if self._column == "method":
-            self._data[self._row].method = self._new
-        elif self._column == "dif":
-            self._data[self._row].dif = self._new
-        elif self._column == "b":
-            self._data[self._row].b = self._new
-        elif self._column == "c":
-            self._data[self._row].c = self._new
-
-class SetCommandSpec(QUndoCommand):
-    def __init__(self, data, row, column, new_value):
-        QUndoCommand.__init__(self)
-
-        self._data = data
-        self._row = row
-        self._column = column
-
-        if self._column == "method":
-            self._old = self._data[self._row].method
-        elif self._column == "reach":
-            self._old = self._data[self._row].reach
-        elif self._column == "start_kp":
-            self._old = self._data[self._row].start_kp
-        elif self._column == "end_kp":
-            self._old = self._data[self._row].end_kp
-        elif self._column == "dif":
-            self._old = self._data[self._row].dif
-        elif self._column == "b":
-            self._old = self._data[self._row].b
-        elif self._column == "c":
-            self._old = self._data[self._row].c
-
-        _type = float
-        if column == "method":
-            _type = str
-        elif column == "reach":
-            _type = int
-
-        self._new = _type(new_value)
-
-    def undo(self):
-        if self._column == "method":
-            self._data[self._row].method = self._old
-        elif self._column == "reach":
-            self._data[self._row].reach = self._old
-        elif self._column == "start_kp":
-            self._data[self._row].start_kp = self._old
-        elif self._column == "end_kp":
-            self._data[self._row].end_kp = self._old
-        elif self._column == "dif":
-            self._data[self._row].dif = self._old
-        elif self._column == "b":
-            self._data[self._row].b = self._old
-        elif self._column == "c":
-            self._data[self._row].c = self._old
-
-    def redo(self):
-        if self._column == "method":
-            self._data[self._row].method = self._new
-        elif self._column == "reach":
-            self._data[self._row].reach = self._new
-        elif self._column == "start_kp":
-            self._data[self._row].start_kp = self._new
-        elif self._column == "end_kp":
-            self._data[self._row].end_kp = self._new
-        elif self._column == "dif":
-            self._data[self._row].dif = self._new
-        elif self._column == "b":
-            self._data[self._row].b = self._new
-        elif self._column == "c":
-            self._data[self._row].c = self._new
-
-class AddCommand(QUndoCommand):
-    def __init__(self, data, ics_spec, index):
-        QUndoCommand.__init__(self)
-
-        self._data = data
-        self._ics_spec = ics_spec
-        self._index = index
-        self._new = None
-
-    def undo(self):
-        self._data.delete_i([self._index])
-
-    def redo(self):
-        if self._new is None:
-            self._new = self._data.new(self._index)
-        else:
-            self._data.insert(self._index, self._new)
-
-class DelCommand(QUndoCommand):
-    def __init__(self, data, ics_spec, rows):
-        QUndoCommand.__init__(self)
-
-        self._data = data
-        self._ics_spec = ics_spec
-        self._rows = rows
-        #self._data = data
-
-        self._ic = []
-        for row in rows:
-            self._ic.append((row, self._ics_spec[row]))
-        self._ic.sort()
-
-    def undo(self):
-        for row, el in self._ic:
-            self._data.insert(row, el)
-
-    def redo(self):
-        self._data.delete_i(self._rows)
-

src/View/DIFAdisTS/Window.py

@@ -1,290 +0,0 @@
-# Window.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import os
-import logging
-
-from tools import trace, timer, logger_exception
-
-from View.Tools.PamhyrWindow import PamhyrWindow
-
-from PyQt5.QtGui import (
-    QKeySequence, QIcon,
-)
-
-from PyQt5.QtCore import (
-    Qt, QVariant, QAbstractTableModel,
-    QCoreApplication, QModelIndex, pyqtSlot,
-    QRect, QItemSelectionModel,
-)
-
-from PyQt5.QtWidgets import (
-    QDialogButtonBox, QPushButton, QLineEdit,
-    QFileDialog, QTableView, QAbstractItemView,
-    QUndoStack, QShortcut, QAction, QItemDelegate,
-    QComboBox, QVBoxLayout, QHeaderView, QTabWidget,
-    QVBoxLayout, QToolBar, QAction, QToolButton,
-)
-
-from Modules import Modules
-
-from View.DIFAdisTS.TableDefault import (
-    DIFTableDefaultModel,
-)
-
-from View.DIFAdisTS.Table import (
-    DIFTableModel, ComboBoxDelegate,
-)
-
-from View.DIFAdisTS.translate import DIFAdisTSTranslate
-
-from Solver.Mage import Mage8
-
-_translate = QCoreApplication.translate
-
-logger = logging.getLogger()
-
-
-class DIFAdisTSWindow(PamhyrWindow):
-    _pamhyr_ui = "DIFAdisTS"
-    _pamhyr_name = "DIF AdisTS"
-
-    def __init__(self, data=None, study=None, config=None, parent=None):
-        self._data = []
-        self._data.append(data)
-        trad = DIFAdisTSTranslate()
-
-        name = (
-            trad[self._pamhyr_name] +
-            " - " + study.name +
-            " - " + self._data[0].name
-        )
-
-        super(DIFAdisTSWindow, self).__init__(
-            title=name,
-            study=study,
-            config=config,
-            trad=trad,
-            parent=parent
-        )
-
-        self._hash_data.append(data)
-
-        self._dif_adists_lst = study.river.dif_adists
-
-        self.setup_table()
-
-        self.ui.setWindowTitle(self._title)
-
-    def setup_table(self):
-
-        path_icons = os.path.join(self._get_ui_directory(), f"ressources")
-
-        table_default = self.find(QTableView, f"tableView")
-
-        self._delegate_method = ComboBoxDelegate(
-            trad=self._trad,
-            data=self._study.river,
-            ic_spec_lst=self._data[0]._data,
-            parent=self,
-            mode="method"
-        )
-
-        self._table = DIFTableDefaultModel(
-            table_view=table_default,
-            table_headers=self._trad.get_dict("table_headers"),
-            editable_headers=["method", "dif", "b", "c"],
-            delegates={
-                "method": self._delegate_method
-            },
-            data=self._data,
-            undo=self._undo_stack,
-            trad=self._trad
-        )
-
-        table_default.setModel(self._table)
-        table_default.setSelectionBehavior(QAbstractItemView.SelectRows)
-        table_default.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
-        table_default.setAlternatingRowColors(True)
-
-        layout = self.find(QVBoxLayout, f"verticalLayout_1")
-        toolBar = QToolBar()
-        layout.addWidget(toolBar)
-
-        action_add = QAction(self)
-        action_add.setIcon(QIcon(os.path.join(path_icons, f"add.png")))
-        action_add.triggered.connect(self.add)
-        action_delete = QAction(self)
-        action_delete.setIcon(QIcon(os.path.join(path_icons, f"del.png")))
-        action_delete.triggered.connect(self.delete)
-
-        toolBar.addAction(action_add)
-        toolBar.addAction(action_delete)
-
-        self.table_spec = QTableView()
-        layout.addWidget(self.table_spec)
-
-        self._delegate_reach = ComboBoxDelegate(
-            trad=self._trad,
-            data=self._study.river,
-            ic_spec_lst=self._data[0]._data,
-            parent=self,
-            mode="reaches"
-        )
-        self._delegate_kp = ComboBoxDelegate(
-            trad=self._trad,
-            data=self._study.river,
-            ic_spec_lst=self._data[0]._data,
-            parent=self,
-            mode="kp"
-        )
-
-        self._table_spec = DIFTableModel(
-            table_view=self.table_spec,
-            table_headers=self._trad.get_dict("table_headers_spec"),
-            editable_headers=["method", "reach", "start_kp", "end_kp", "dif", "b", "c"],
-            delegates={
-                "method": self._delegate_method,
-                "reach": self._delegate_reach,
-                "start_kp": self._delegate_kp,
-                "end_kp": self._delegate_kp
-            },
-            data=self._data[0],
-            undo=self._undo_stack,
-            trad=self._trad,
-            river=self._study.river
-        )
-
-        self.table_spec.setModel(self._table_spec)
-        self.table_spec.setSelectionBehavior(QAbstractItemView.SelectRows)
-        self.table_spec.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
-        self.table_spec.setAlternatingRowColors(True)
-
-        selectionModel = self.table_spec.selectionModel()
-        index = self.table_spec.model().index(0, 0)
-
-        selectionModel.select(
-            index,
-            QItemSelectionModel.Rows |
-            QItemSelectionModel.ClearAndSelect |
-            QItemSelectionModel.Select
-        )
-        self.table_spec.scrollTo(index)
-
-    def index_selected_row(self):
-        #table = self.find(QTableView, f"tableView")
-        table = self.table_spec
-        rows = table.selectionModel()\
-                    .selectedRows()
-
-        if len(rows) == 0:
-            return 0
-
-        return rows[0].row()
-
-    def index_selected_rows(self):
-        #table = self.find(QTableView, f"tableView")
-        table = self.table_spec
-        return list(
-            # Delete duplicate
-            set(
-                map(
-                    lambda i: i.row(),
-                    table.selectedIndexes()
-                )
-            )
-        )
-
-    def move_up(self):
-        row = self.index_selected_row()
-        self._table.move_up(row)
-        self._update()
-
-    def move_down(self):
-        row = self.index_selected_row()
-        self._table.move_down(row)
-        self._update()
-
-    def _copy(self):
-        rows = list(
-            map(
-                lambda row: row.row(),
-                self.tableView.selectionModel().selectedRows()
-            )
-        )
-
-        table = list(
-            map(
-                lambda eic: list(
-                    map(
-                        lambda k: eic[1][k],
-                        ["kp", "discharge", "elevation"]
-                    )
-                ),
-                filter(
-                    lambda eic: eic[0] in rows,
-                    enumerate(self._ics.lst())
-                )
-            )
-        )
-
-        self.copyTableIntoClipboard(table)
-
-    def _paste(self):
-        header, data = self.parseClipboardTable()
-
-        if len(data) + len(header) == 0:
-            return
-
-        logger.debug(
-            "DIF: Paste: " +
-            f"header = {header}, " +
-            f"data = {data}"
-        )
-
-        try:
-            row = self.index_selected_row()
-            # self._table.paste(row, header, data)
-            self._table.paste(row, [], data)
-        except Exception as e:
-            logger_exception(e)
-
-        self._update()
-
-    def _undo(self):
-        self._table.undo()
-        self._update()
-
-    def _redo(self):
-        self._table.redo()
-        self._update()
-
-    def add(self):
-        rows = self.index_selected_rows()
-        if len(self._data[0]._data) == 0 or len(rows) == 0:
-            self._table_spec.add(0)
-        else:
-            self._table_spec.add(rows[0])
-
-    def delete(self):
-        print("del")
-        rows = self.index_selected_rows()
-        if len(rows) == 0:
-            print("len 0")
-            return
-        self._table_spec.delete(rows)

src/View/DIFAdisTS/translate.py

@@ -1,50 +0,0 @@
-# translate.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-from PyQt5.QtCore import QCoreApplication
-
-from View.Translate import MainTranslate
-
-_translate = QCoreApplication.translate
-
-
-class DIFAdisTSTranslate(MainTranslate):
-    def __init__(self):
-        super(DIFAdisTSTranslate, self).__init__()
-
-        self._dict["DIF AdisTS"] = _translate(
-            "DIFAdisTS", "DIF AdisTS")
-
-        self._dict["kp"] = self._dict["unit_kp"]
-
-        self._sub_dict["table_headers"] = {
-            "method": self._dict["method"],
-            "dif": _translate("Unit", "DIF"),
-            "b": _translate("Unit", "Coeff b"),
-            "c": _translate("Unit", "Coeff c"),
-        }
-
-        self._sub_dict["table_headers_spec"] = {
-            "method": self._dict["method"],
-            "reach": self._dict["reach"],
-            "start_kp": _translate("Unit", "Start_KP (m)"),
-            "end_kp": _translate("Unit", "End_KP (m)"),
-            "dif": _translate("Unit", "DIF"),
-            "b": _translate("Unit", "Coeff b"),
-            "c": _translate("Unit", "Coeff c"),
-        }

src/View/Frictions/PlotRKZ.py

@@ -1,4 +1,4 @@
-# Adists.py -- Pamhyr study checkers
+# PlotRKC.py -- Pamhyr
 # Copyright (C) 2023-2024  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
@@ -16,36 +16,35 @@
 
 # -*- coding: utf-8 -*-
 
-import time
-import logging
-from functools import reduce
-
 from PyQt5.QtCore import QCoreApplication
-
-from Modules import Modules
-from Checker.Checker import AbstractModelChecker, STATUS
+from View.HydraulicStructures.PlotRKC import PlotRKC
 
 _translate = QCoreApplication.translate
 
-logger = logging.getLogger()
 
-class AdistsOutputKpChecker(AbstractModelChecker):
-    def __init__(self):
-        super(AdistsOutputKpChecker, self).__init__()
-
-        self._name = _translate("Checker", "AdisTS output Kp checker")
-        self._description = _translate(
-            "Checker", "Check output Kp"
+class PlotRKZ(PlotRKC):
+    def __init__(self, canvas=None, trad=None, toolbar=None,
+                 river=None, reach=None, profile=None,
+                 parent=None):
+        super(PlotRKC, self).__init__(
+            canvas=canvas,
+            trad=trad,
+            data=river,
+            toolbar=toolbar,
+            parent=parent
         )
-        self._modules = Modules.OUTPUT_KP
 
-    def run(self, study):
-        ok = True
-        nerror = 0
-        self._summary = "ok"
-        self._status = STATUS.OK
+        self._current_reach = reach
+        self._current_profile = profile
 
-        if not self.basic_check(study):
-            return False
+        self.label_x = self._trad["unit_rk"]
+        self.label_y = self._trad["unit_elevation"]
 
-        return ok
+        self._isometric_axis = False
+
+        self._auto_relim_update = True
+        self._autoscale_update = True
+        self.parent = parent
+
+    def onpick(self, event):
+        return

src/View/Frictions/PlotStricklers.py

@@ -41,10 +41,10 @@ class PlotStricklers(PamhyrPlot):
             parent=parent
         )
 
-        self.label_x = self._trad["kp"]
-        self.label_y = self._trad["stricklers"]
+        self.label_x = self._trad["rk"]
+        self.label_y = self._trad["strickler_plot"]
 
-        self.line_kp_elevation = [None, None]
+        self.line_rk_elevation = [None, None]
 
         self._isometric_axis = False
 
@@ -65,9 +65,9 @@ class PlotStricklers(PamhyrPlot):
         self._init = True
 
     def draw_data(self):
-        kp = self.data.reach.get_kp()
+        rk = self.data.reach.get_rk()
         self.canvas.axes.set_xlim(
-            left=min(kp), right=max(kp)
+            left=min(rk), right=max(rk)
         )
 
         frictions = self.data.frictions
@@ -76,14 +76,14 @@ class PlotStricklers(PamhyrPlot):
             self.draw_frictions(lst, self.color_plot)
 
             # HightLight
-            kp_min, kp_max = (-1, -1)
+            rk_min, rk_max = (-1, -1)
             if self._highlight_data is not None:
-                kp_min, kp_max = self._highlight_data
+                rk_min, rk_max = self._highlight_data
 
                 lst = list(
                     filter(
-                        lambda s: (s.begin_kp == kp_min and
-                                   s.end_kp == kp_max),
+                        lambda s: (s.begin_rk == rk_min and
+                                   s.end_rk == rk_max),
                         frictions.frictions
                     )
                 )
@@ -96,7 +96,7 @@ class PlotStricklers(PamhyrPlot):
                 lambda f: f.is_full_defined(),
                 frictions
             ),
-            key=lambda s: s.begin_kp
+            key=lambda s: s.begin_rk
         )
 
         coef = flatten(
@@ -106,9 +106,9 @@ class PlotStricklers(PamhyrPlot):
             )
         )
 
-        kp = flatten(
+        rk = flatten(
             map(
-                lambda s: [s.begin_kp, s.end_kp],
+                lambda s: [s.begin_rk, s.end_rk],
                 lst
             )
         )
@@ -116,13 +116,13 @@ class PlotStricklers(PamhyrPlot):
         coef_minor = list(map(lambda s: s.minor, coef))
         coef_medium = list(map(lambda s: s.medium, coef))
 
-        self.line_kp_elevation[0] = self.canvas.axes.plot(
-            kp, coef_minor,
+        self.line_rk_elevation[0] = self.canvas.axes.plot(
+            rk, coef_minor,
             color=color, lw=1.
         )
 
-        self.line_kp_elevation[1] = self.canvas.axes.plot(
-            kp, coef_medium,
+        self.line_rk_elevation[1] = self.canvas.axes.plot(
+            rk, coef_medium,
             color=color, lw=1.
         )
 

src/View/Frictions/Table.py

@@ -113,10 +113,10 @@ class TableModel(PamhyrTableModel):
 
         if self._headers[column] == "name":
             return self._lst.get(row).name
-        elif self._headers[column] == "begin_kp":
-            return self._lst.get(row).begin_kp
-        elif self._headers[column] == "end_kp":
-            return self._lst.get(row).end_kp
+        elif self._headers[column] == "begin_rk":
+            return self._lst.get(row).begin_rk
+        elif self._headers[column] == "end_rk":
+            return self._lst.get(row).end_rk
         elif self._headers[column] == "begin_strickler":
             value = self._lst.get(row).begin_strickler
             if value is None:
@@ -144,13 +144,13 @@ class TableModel(PamhyrTableModel):
                         self._lst, row, value
                     )
                 )
-            elif self._headers[column] == "begin_kp":
+            elif self._headers[column] == "begin_rk":
                 self._undo.push(
                     SetBeginCommand(
                         self._lst, row, value
                     )
                 )
-            elif self._headers[column] == "end_kp":
+            elif self._headers[column] == "end_rk":
                 self._undo.push(
                     SetEndCommand(
                         self._lst, row, value

src/View/Frictions/UndoCommand.py

@@ -49,14 +49,14 @@ class SetBeginCommand(QUndoCommand):
 
         self._frictions = frictions
         self._index = index
-        self._old = self._frictions.get(self._index).begin_kp
+        self._old = self._frictions.get(self._index).begin_rk
         self._new = float(new_value)
 
     def undo(self):
-        self._frictions.get(self._index).begin_kp = float(self._old)
+        self._frictions.get(self._index).begin_rk = float(self._old)
 
     def redo(self):
-        self._frictions.get(self._index).begin_kp = float(self._new)
+        self._frictions.get(self._index).begin_rk = float(self._new)
 
 
 class SetEndCommand(QUndoCommand):
@@ -65,14 +65,14 @@ class SetEndCommand(QUndoCommand):
 
         self._frictions = frictions
         self._index = index
-        self._old = self._frictions.get(self._index).end_kp
+        self._old = self._frictions.get(self._index).end_rk
         self._new = float(new_value)
 
     def undo(self):
-        self._frictions.get(self._index).end_kp = float(self._old)
+        self._frictions.get(self._index).end_rk = float(self._old)
 
     def redo(self):
-        self._frictions.get(self._index).end_kp = float(self._new)
+        self._frictions.get(self._index).end_rk = float(self._new)
 
 
 class SetBeginStricklerCommand(QUndoCommand):

src/View/Frictions/Window.py

@@ -50,7 +50,7 @@ from View.Frictions.Table import (
 )
 
 from View.Tools.Plot.PamhyrCanvas import MplCanvas
-from View.Geometry.PlotKPZ import PlotKPZ
+from View.Frictions.PlotRKZ import PlotRKZ
 from View.Frictions.PlotStricklers import PlotStricklers
 from View.Frictions.translate import FrictionsTranslate
 
@@ -110,7 +110,7 @@ class FrictionsWindow(PamhyrWindow):
             table_view=table,
             table_headers=self._trad.get_dict("table_headers"),
             editable_headers=[
-                "name", "begin_kp", "end_kp",
+                "name", "begin_rk", "end_rk",
                 "begin_strickler", "end_strickler"
             ],
             delegates={
@@ -133,11 +133,13 @@ class FrictionsWindow(PamhyrWindow):
         self.plot_layout = self.find(QVBoxLayout, "verticalLayout")
         self.plot_layout.addWidget(self.canvas)
 
-        self.plot = PlotKPZ(
+        self.plot = PlotRKZ(
             canvas=self.canvas,
-            data=self._reach.reach,
+            reach=self._reach,
+            river=self._study.river,
             trad=self._trad,
             toolbar=None,
+            parent=self
         )
         self.plot.draw()
 
@@ -202,7 +204,7 @@ class FrictionsWindow(PamhyrWindow):
             data = self._reach
             reach = self._reach.reach
             sec = self._frictions.get(rows[0])
-            highlight = (sec.begin_kp, sec.end_kp)
+            highlight = (sec.begin_rk, sec.end_rk)
 
         self.update_plot(highlight)
 

src/View/Frictions/translate.py

@@ -27,7 +27,10 @@ class FrictionsTranslate(MainTranslate):
     def __init__(self):
         super(FrictionsTranslate, self).__init__()
 
-        self._dict["kp"] = self._dict["unit_kp"]
+        self._dict["rk"] = self._dict["unit_rk"]
+        self._dict["strickler_plot"] = _translate(
+            "Frictions", "Strickler ($m^{1/3}/s$)"
+        )
         self._dict["stricklers"] = _translate(
             "Frictions", "Stricklers"
         )
@@ -39,8 +42,8 @@ class FrictionsTranslate(MainTranslate):
         self._sub_dict["table_headers"] = {
             # "name": self._dict["name"],
             # "edge": self._dict["reach"],
-            "begin_kp": _translate("Frictions", "Begin kp (m)"),
-            "end_kp": _translate("Frictions", "End kp (m)"),
-            "begin_strickler": _translate("Frictions", "Begin strickler"),
-            "end_strickler": _translate("Frictions", "End strickler"),
+            "begin_rk": _translate("Frictions", "Start (m)"),
+            "end_rk": _translate("Frictions", "End (m)"),
+            "begin_strickler": _translate("Frictions", "Start coefficient"),
+            "end_strickler": _translate("Frictions", "End coefficient"),
         }

src/View/Geometry/MeshingDialog.py

@@ -76,11 +76,11 @@ class MeshingDialog(PamhyrDialog):
     def _init_default_values_profiles(self):
         profiles = self.profiles
 
-        self.combobox_add_items("comboBox_begin_kp", profiles)
-        self.combobox_add_items("comboBox_end_kp", profiles)
+        self.combobox_add_items("comboBox_begin_rk", profiles)
+        self.combobox_add_items("comboBox_end_rk", profiles)
 
-        self.set_combobox_text("comboBox_begin_kp", profiles[0])
-        self.set_combobox_text("comboBox_end_kp", profiles[-1])
+        self.set_combobox_text("comboBox_begin_rk", profiles[0])
+        self.set_combobox_text("comboBox_end_rk", profiles[-1])
 
     @property
     def profiles(self):
@@ -98,9 +98,9 @@ class MeshingDialog(PamhyrDialog):
         name = profile.name
 
         if name == "":
-            name = f"{profile.kp}"
+            name = f"{profile.rk}"
         else:
-            name += f" ({profile.kp})"
+            name += f" ({profile.rk})"
 
         return name
 
@@ -125,14 +125,6 @@ class MeshingDialog(PamhyrDialog):
     def lplan(self):
         return self._lplan
 
-    @property
-    def origin(self):
-        return self._origin
-
-    @property
-    def lm(self):
-        return int(self._lm)
-
     @property
     def linear(self):
         return self._linear
@@ -159,21 +151,15 @@ class MeshingDialog(PamhyrDialog):
         )
         self._linear = self.get_radio_button("radioButton_linear")
 
-        p1 = self.get_combobox_text("comboBox_begin_kp")
-        p2 = self.get_combobox_text("comboBox_end_kp")
+        p1 = self.get_combobox_text("comboBox_begin_rk")
+        p2 = self.get_combobox_text("comboBox_end_rk")
 
         self._begin_cs = self.profiles.index(p1)
         self._end_cs = self.profiles.index(p2)
 
-        origin = self.get_combobox_text("comboBox_origin")
-        self._origin = self.profiles.index(origin)
-
         self._begin_dir = self.get_combobox_text("comboBox_begin_gl")
         self._end_dir = self.get_combobox_text("comboBox_end_gl")
 
-        r_lm_dict = self._trad.get_dict("r_lm_dict")
-        self._lm = r_lm_dict[self.get_combobox_text("comboBox_lm")]
-
         super().accept()
 
     def reject(self):

src/View/Geometry/PlotAC.py

@@ -98,6 +98,7 @@ class PlotAC(PamhyrPlot):
             label=self.label_next_plot_selected,
             color=self.color_plot_next, lw=1.6, linestyle='--'
         )
+        self.canvas.axes.set_visible(False)
 
     def draw_gl(self):
         if self._current_data_update:
@@ -106,12 +107,16 @@ class PlotAC(PamhyrPlot):
             profile_id = 0
 
         profile = self.data.profile(profile_id)
+        if profile is None:
+            return
+
         station = profile.get_station()
         elevation = profile.z()
         gl = profile.names()
 
         self.annotation = []
         self.complete_gl, self.incomplete_gl = self.data.compute_guidelines()
+
         lcomplete = list(self.complete_gl)
         lincomplete = list(self.incomplete_gl)
 
@@ -160,6 +165,9 @@ class PlotAC(PamhyrPlot):
             self.draw()
             return
 
+        if self.data is None:
+            return
+
         self.update_current()
         self.update_gl()
 
@@ -171,6 +179,10 @@ class PlotAC(PamhyrPlot):
             previous_id = profile_id - 1
             next_id = profile_id + 1
 
+            self.previous_plot_selected.set_visible(False)
+            self.plot_selected.set_visible(False)
+            self.next_plot_selected.set_visible(False)
+
             self.previous_plot_selected.set_data([], [])
             self.plot_selected.set_data([], [])
             self.next_plot_selected.set_data([], [])
@@ -180,18 +192,23 @@ class PlotAC(PamhyrPlot):
                     self.data.profile(previous_id).get_station(),
                     self.data.profile(previous_id).z()
                 )
+                self.previous_plot_selected.set_visible(True)
 
             if 0 <= profile_id < self.data.number_profiles:
                 self.plot_selected.set_data(
                     self.data.profile(profile_id).get_station(),
                     self.data.profile(profile_id).z()
                 )
+                self.plot_selected.set_visible(True)
 
             if 0 <= next_id < self.data.number_profiles:
                 self.next_plot_selected.set_data(
                     self.data.profile(next_id).get_station(),
                     self.data.profile(next_id).z()
                 )
+                self.next_plot_selected.set_visible(True)
+
+            self.canvas.axes.set_visible(True)
 
     def update_full(self):
         self.draw()

src/View/Geometry/PlotKPZ.py

@@ -1,303 +0,0 @@
-# PlotKPC.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# -*- coding: utf-8 -*-
-
-import logging
-
-from tools import timer
-from View.Tools.PamhyrPlot import PamhyrPlot
-
-logger = logging.getLogger()
-
-
-class PlotKPZ(PamhyrPlot):
-    def __init__(self, canvas=None, trad=None,
-                 study=None, data=None, toolbar=None,
-                 parent=None):
-        self._study = study
-
-        super(PlotKPZ, self).__init__(
-            canvas=canvas,
-            trad=trad,
-            data=data,
-            toolbar=toolbar,
-            parent=parent
-        )
-
-        self._isometric_axis = False
-
-        self.line_kp_zgl = []
-        self.line_kp_zmin = None
-        self.line_kp_zmin_zmax = None
-        self.line_kp_zmin_zmax_highlight = None
-
-        self.label_x = self._trad["unit_kp"]
-        self.label_y = self._trad["unit_height"]
-
-        self.before_plot_selected = None
-        self.plot_selected = None
-        self.after_plot_selected = None
-
-    @timer
-    def draw(self):
-        self.init_axes()
-
-        if self.data is None:
-            return
-
-        if len(self.data.profiles) == 0:
-            return
-
-        profiles_defined = any(
-            filter(
-                lambda profile: len(profile) > 0,
-                self.data.profiles
-            )
-        )
-
-        if not profiles_defined:
-            self._init = False
-            return
-
-        self.draw_z_line()
-        self.draw_z_line_highlight()
-        self.draw_current()
-        self.draw_gl()
-        self.draw_bottom()
-        self.draw_profiles_hs(self._data)
-
-        self.idle()
-        self._init = True
-
-    def draw_z_line(self):
-        kp = self.data.get_kp_complete_profiles()
-        z_min = self.data.get_z_min()
-        z_max = self.data.get_z_max()
-
-        self.line_kp_zmin_zmax = self.canvas.axes.vlines(
-            x=kp, ymin=z_min, ymax=z_max,
-            color=self.color_plot,
-            lw=1.
-        )
-
-    def draw_z_line_highlight(self):
-        if self._highlight_data is not None:
-            kp = self.data.get_kp_complete_profiles()
-            z_min = self.data.get_z_min()
-            z_max = self.data.get_z_max()
-
-            kp_min, kp_max = self._highlight_data
-
-            indexes = list(
-                map(
-                    lambda x: x[0],
-                    filter(
-                        lambda x: kp_min <= x[1] <= kp_max,
-                        enumerate(kp)
-                    )
-                )
-            )
-
-            def indexes_filter(data): return list(
-                map(
-                    lambda x: x[1],
-                    filter(
-                        lambda x: x[0] in indexes,
-                        enumerate(data)
-                    )
-                )
-            )
-
-            ikp = indexes_filter(kp)
-            imin = indexes_filter(z_min)
-            imax = indexes_filter(z_max)
-
-            self.line_kp_zmin_zmax_highlight = self.canvas.axes.vlines(
-                x=ikp,
-                ymin=imin, ymax=imax,
-                color=self.color_plot_highlight,
-                lw=1.
-            )
-
-    def draw_current(self):
-        kp = self.data.get_kp_complete_profiles()
-        z_min = self.data.get_z_min()
-        z_max = self.data.get_z_max()
-
-        self.plot_selected, = self.canvas.axes.plot(
-            (kp[0], kp[0]),
-            (z_min[0], z_max[0]),
-            color=self.color_plot_current, lw=1.5
-        )
-        self.plot_selected.set_visible(False)
-
-        self.before_plot_selected, = self.canvas.axes.plot(
-            (kp[0], kp[0]),
-            (z_min[0], z_max[0]),
-            color=self.color_plot_previous, lw=1.5, linestyle='--'
-        )
-        self.before_plot_selected.set_visible(False)
-
-        self.after_plot_selected, = self.canvas.axes.plot(
-            (kp[0], kp[0]),
-            (z_min[0], z_max[0]),
-            color=self.color_plot_next, lw=1.5, linestyle='--'
-        )
-        self.after_plot_selected.set_visible(False)
-
-    def draw_gl(self):
-        kp = self.data.get_kp_complete_profiles()
-
-        ind = 0
-        self.line_kp_zgl = []
-        for z in self.data.get_guidelines_z():
-            # Is incomplete guideline?
-            if len(z) != len(kp):
-                continue
-
-            self.line_kp_zgl.append(
-                self.canvas.axes.plot(
-                    kp, z, lw=1.,
-                    color=self.colors[ind % len(self.colors)],
-                    linestyle=self.linestyle[ind // len(self.colors)]
-                )
-            )
-            ind += 1
-
-    def draw_bottom(self):
-        kp = self.data.get_kp_complete_profiles()
-        z_min = self.data.get_z_min()
-
-        self.line_kp_zmin, = self.canvas.axes.plot(
-            kp, z_min,
-            linestyle=":", lw=1.5,
-            color='lightgrey'
-        )
-
-    def draw_profiles_hs(self, reach):
-        lhs = filter(
-            lambda hs: hs._input_reach.reach is reach,
-            self._study.river.hydraulic_structures.lst
-        )
-
-        for hs in lhs:
-            x = hs.input_kp
-            z_min = reach.get_z_min()
-            z_max = reach.get_z_max()
-
-            self.canvas.axes.plot(
-                [x, x],
-                [min(z_min), max(z_max)],
-                linestyle="--",
-                lw=1.,
-                color=self.color_plot_previous,
-            )
-
-            self.canvas.axes.annotate(
-                " > " + hs.name,
-                (x, max(z_max)),
-                horizontalalignment='left',
-                verticalalignment='top',
-                annotation_clip=True,
-                fontsize=9, color=self.color_plot_previous,
-            )
-
-    @timer
-    def update(self):
-        if not self._init:
-            self.draw()
-            return
-
-        self.update_gl()
-        self.update_current()
-
-        self.update_idle()
-
-    def update_current(self):
-        if self._current_data_update:
-            ind = self._current_data
-            before = ind - 1
-            after = ind + 1
-
-            self.before_plot_selected.set_visible(False)
-            self.plot_selected.set_visible(False)
-            self.after_plot_selected.set_visible(False)
-
-            if 0 <= before < self.data.number_profiles:
-                profile = self.data.profile(before)
-                if len(profile) > 0:
-                    kp_i = profile.kp
-                    z_min_i = profile.z_min()
-                    z_max_i = profile.z_max()
-
-                    self.before_plot_selected.set_data(
-                        (kp_i, kp_i),
-                        (z_min_i, z_max_i)
-                    )
-                    self.before_plot_selected.set_visible(True)
-
-            if 0 <= ind < self.data.number_profiles:
-                profile = self.data.profile(ind)
-                if len(profile) > 0:
-                    kp_i = profile.kp
-                    z_min_i = profile.z_min()
-                    z_max_i = profile.z_max()
-
-                    self.plot_selected.set_data(
-                        (kp_i, kp_i),
-                        (z_min_i, z_max_i)
-                    )
-                    self.plot_selected.set_visible(True)
-
-            if 0 <= after < self.data.number_profiles:
-                profile = self.data.profile(after)
-                if len(profile) > 0:
-                    kp_i = profile.kp
-                    z_min_i = profile.z_min()
-                    z_max_i = profile.z_max()
-
-                    self.after_plot_selected.set_data(
-                        (kp_i, kp_i),
-                        (z_min_i, z_max_i)
-                    )
-                    self.after_plot_selected.set_visible(True)
-
-    def update_gl(self):
-        if self._current_data_update:
-            return
-
-        kp = self.data.get_kp_complete_profiles()
-        z_min = self.data.get_z_min()
-        z_max = self.data.get_z_max()
-
-        self.line_kp_zmin.set_data(kp, z_min)
-
-        self.line_kp_zmin_zmax.remove()
-        self.line_kp_zmin_zmax = self.canvas.axes.vlines(
-            x=kp,
-            ymin=z_min, ymax=z_max,
-            color='r', lw=1.
-        )
-
-        z_complete = self.data.get_guidelines_z()
-        try:
-            for i in range(len(self.line_kp_zgl)):
-                self.line_kp_zgl[i][0].set_data(
-                    kp, z_complete[i]
-                )
-        except Exception as e:
-            logger.warning(f"Failed to update graphic KPZ: {e}")

src/View/Geometry/PlotRKZ.py

@@ -0,0 +1,372 @@
+# PlotRKC.py -- Pamhyr
+# Copyright (C) 2023-2024  INRAE
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# -*- coding: utf-8 -*-
+
+import logging
+
+from tools import timer
+from View.Tools.PamhyrPlot import PamhyrPlot
+from PyQt5.QtWidgets import QApplication
+from PyQt5.QtCore import (
+    Qt, QItemSelectionModel,
+    QItemSelection, QItemSelectionRange,
+)
+
+logger = logging.getLogger()
+
+
+class PlotRKZ(PamhyrPlot):
+    def __init__(self, canvas=None, trad=None,
+                 study=None, data=None, toolbar=None,
+                 table=None, parent=None):
+        self._study = study
+
+        super(PlotRKZ, self).__init__(
+            canvas=canvas,
+            trad=trad,
+            data=data,
+            toolbar=toolbar,
+            table=table,
+            parent=parent
+        )
+
+        self._isometric_axis = False
+
+        self.line_rk_zgl = []
+        self.line_rk_zmin = None
+        self.line_rk_zmin_zmax = None
+        self.line_rk_zmin_zmax_highlight = None
+
+        self.label_x = self._trad["unit_rk"]
+        self.label_y = self._trad["unit_height"]
+
+        self.before_plot_selected = None
+        self.plot_selected = None
+        self.after_plot_selected = None
+        self.parent = parent
+        self._table = table
+        self._colors = []
+
+    def onpick(self, event):
+        if event.mouseevent.inaxes != self.canvas.axes:
+            return
+        if event.mouseevent.button.value != 1:
+            return
+
+        modifiers = QApplication.keyboardModifiers()
+        if modifiers not in [Qt.ControlModifier,
+                             Qt.NoModifier,
+                             Qt.ShiftModifier]:
+            return
+
+        ind, point = self._closest_rk(event)
+        if self.parent._table is None:
+            return
+        self.parent._table.blockSignals(True)
+        if modifiers == Qt.ControlModifier:
+            rows = list(
+                set(
+                    (i.row() for i in self.parent.tableView.selectedIndexes())
+                )
+            )
+            if ind in rows:
+                rows.remove(ind)
+            else:
+                rows.append(ind)
+            self._select_in_table(rows)
+        elif modifiers == Qt.ShiftModifier:
+            rows = sorted(list(
+                set(
+                    (i.row() for i in self.parent.tableView.selectedIndexes())
+                )
+            ))
+            if len(rows) > 0:
+                i1 = min(rows[0], rows[-1], ind)
+                i2 = max(rows[0], rows[-1], ind)
+            else:
+                i1 = ind
+                i2 = ind
+            self._select_range_in_table(i1, i2)
+        else:
+            self._select_in_table([ind])
+        self.parent._table.blockSignals(False)
+
+        return
+
+    def _closest_rk(self, event):
+
+        s = event.artist.get_segments()
+        x = [i[0, 0] for i in s]
+        mx = event.mouseevent.xdata
+        points = enumerate(x)
+
+        def dist_mouse(point):
+            x = point[1]
+            d = abs(mx - x)
+            return d
+
+        closest = min(
+            points, key=dist_mouse
+        )
+
+        return closest
+
+    def _select_in_table(self, ind):
+        if self._table is None:
+            return
+
+        self._table.setFocus()
+        selection = self._table.selectionModel()
+        index = QItemSelection()
+
+        if len(ind) == 0:
+            return
+
+        for i in ind:
+            index.append(QItemSelectionRange(self._table.model().index(i, 0)))
+
+        selection.select(
+            index,
+            QItemSelectionModel.Rows |
+            QItemSelectionModel.ClearAndSelect |
+            QItemSelectionModel.Select
+        )
+
+        if len(ind) > 0:
+            self._table.scrollTo(self._table.model().index(ind[-1], 0))
+
+    def _select_range_in_table(self, ind1, ind2):
+        if self._table is not None:
+            self._table.setFocus()
+            selection = self._table.selectionModel()
+            index = QItemSelection(self._table.model().index(ind1, 0),
+                                   self._table.model().index(ind2, 0))
+            selection.select(
+                index,
+                QItemSelectionModel.Rows |
+                QItemSelectionModel.ClearAndSelect |
+                QItemSelectionModel.Select
+            )
+            self._table.scrollTo(self._table.model().index(ind2, 0))
+
+    @timer
+    def draw(self):
+        self.init_axes()
+
+        if self.data is None:
+            return
+
+        if len(self.data.profiles) == 0:
+            return
+
+        profiles_defined = any(
+            filter(
+                lambda profile: len(profile) > 0,
+                self.data.profiles
+            )
+        )
+
+        if not profiles_defined:
+            self._init = False
+            return
+
+        self.draw_z_line()
+        self.draw_lr()
+        self.draw_gl()
+        self.draw_bottom()
+        self.draw_profiles_hs(self._data)
+
+        self.idle()
+        self._init = True
+
+    def draw_z_line(self):
+        rk = self.data.get_rk_complete_profiles()
+        z_min = self.data.get_z_min()
+        z_max = self.data.get_z_max()
+
+        self._colors, self._style = self.color_hightlight()
+
+        self.line_rk_zmin_zmax = self.canvas.axes.vlines(
+            x=rk, ymin=z_min, ymax=z_max,
+            color=self._colors,
+            linestyle=self._style,
+            lw=1.,
+            picker=10,
+        )
+
+    def color_hightlight(self):
+        rows = sorted(list(
+            set(
+                (i.row() for i in self.parent.tableView.selectedIndexes())
+            )
+        ))
+        colors = [self.color_plot for row in range(len(self._data))]
+        style = ["-" for row in range(len(self._data))]
+        if len(rows) > 0:
+            for row in rows:
+                colors[row] = self.color_plot_current
+            if rows[0] > 0:
+                colors[rows[0]-1] = self.color_plot_previous
+                style[rows[0]-1] = "--"
+            if rows[-1] < len(self._data)-1:
+                colors[rows[-1]+1] = self.color_plot_next
+                style[rows[-1]+1] = "--"
+        return colors, style
+
+    def draw_lr(self):
+        rk = self.data.get_rk_complete_profiles()
+        lz = []
+        rz = []
+
+        self.line_lr = []
+        for z in self.data.get_z():
+            lz.append(z[0])
+            rz.append(z[-1])
+
+        line = self.canvas.axes.plot(
+            rk, lz,
+            color=self.color_plot_river_bottom,
+            linestyle="dotted",
+            lw=1.,
+        )
+        self.line_lr.append(line)
+
+        line = self.canvas.axes.plot(
+            rk, rz,
+            color=self.color_plot_river_bottom,
+            linestyle="dotted",
+            lw=1.,
+        )
+        self.line_lr.append(line)
+
+    def draw_gl(self):
+        rk = self.data.get_rk_complete_profiles()
+
+        ind = 0
+        self.line_rk_zgl = []
+        for z in self.data.get_guidelines_z():
+            # Is incomplete guideline?
+            if len(z) != len(rk):
+                continue
+
+            self.line_rk_zgl.append(
+                self.canvas.axes.plot(
+                    rk, z, lw=1.,
+                    color=self.colors[ind % len(self.colors)],
+                    linestyle=self.linestyle[ind // len(self.colors)]
+                )
+            )
+            ind += 1
+
+    def draw_bottom(self):
+        rk = self.data.get_rk_complete_profiles()
+        z_min = self.data.get_z_min()
+
+        self.line_rk_zmin, = self.canvas.axes.plot(
+            rk, z_min,
+            linestyle=":", lw=1.5,
+            color='lightgrey'
+        )
+
+    def draw_profiles_hs(self, reach):
+        lhs = filter(
+            lambda hs: hs._input_reach.reach is reach,
+            filter(
+                lambda hs: hs._input_reach is not None,
+                self._study.river.hydraulic_structures.lst
+            )
+        )
+
+        for hs in lhs:
+            x = hs.input_rk
+            if x is not None:
+                z_min = reach.get_z_min()
+                z_max = reach.get_z_max()
+
+                self.canvas.axes.plot(
+                    [x, x],
+                    [min(z_min), max(z_max)],
+                    linestyle="--",
+                    lw=1.,
+                    color=self.color_plot_previous,
+                )
+
+                self.canvas.axes.annotate(
+                    " > " + hs.name,
+                    (x, max(z_max)),
+                    horizontalalignment='left',
+                    verticalalignment='top',
+                    annotation_clip=True,
+                    fontsize=9, color=self.color_plot_previous,
+                )
+
+    @timer
+    def update(self):
+        if not self._init:
+            self.draw()
+            return
+
+        self.update_lr()
+        self.update_gl()
+        self.update_current()
+
+        self.update_idle()
+
+    def update_current(self):
+        if self._current_data_update:
+            self._colors, self._style = self.color_hightlight()
+            self.line_rk_zmin_zmax.set_colors(self._colors)
+            self.line_rk_zmin_zmax.set_linestyle(self._style)
+
+    def update_gl(self):
+        if self._current_data_update:
+            return
+
+        rk = self.data.get_rk_complete_profiles()
+        z_min = self.data.get_z_min()
+        z_max = self.data.get_z_max()
+
+        self.line_rk_zmin.set_data(rk, z_min)
+
+#        TODO comprendre à quoi sert ce bout de code
+#        ========>
+#        self.line_rk_zmin_zmax.remove()
+#        self._colors, self._style = self.color_hightlight()
+#        self.line_rk_zmin_zmax = self.canvas.axes.vlines(
+#            x=rk,
+#            ymin=z_min,
+#            ymax=z_max,
+#            color=self._colors,
+#            linestyle = self._style,
+#            lw=1.
+#        )
+#        <========
+
+        z_complete = self.data.get_guidelines_z()
+        try:
+            for i in range(len(self.line_rk_zgl)):
+                self.line_rk_zgl[i][0].set_data(
+                    rk, z_complete[i]
+                )
+        except Exception as e:
+            logger.warning(f"Failed to update graphic RKZ: {e}")
+
+    def update_lr(self):
+        for line in self.line_lr:
+            line[0].remove()
+
+        self.draw_lr()

src/View/Geometry/PlotXY.py

@@ -18,22 +18,27 @@
 
 from tools import timer, trace
 from View.Tools.PamhyrPlot import PamhyrPlot
+from matplotlib import collections
+import numpy as np
 
 from PyQt5.QtCore import (
-    QCoreApplication
+    QCoreApplication, Qt, QItemSelectionModel,
+    QItemSelection, QItemSelectionRange,
 )
+from PyQt5.QtWidgets import QApplication
 
 _translate = QCoreApplication.translate
 
 
 class PlotXY(PamhyrPlot):
     def __init__(self, canvas=None, trad=None, data=None, toolbar=None,
-                 parent=None):
+                 table=None, parent=None):
         super(PlotXY, self).__init__(
             canvas=canvas,
             trad=trad,
             data=data,
             toolbar=toolbar,
+            table=table,
             parent=parent
         )
 
@@ -46,6 +51,116 @@ class PlotXY(PamhyrPlot):
         self.before_plot_selected = None
         self.plot_selected = None
         self.after_plot_selected = None
+        self.parent = parent
+        self.line_xy_collection = None
+        self._table = table
+        self._colors = []
+        self._style = []
+
+    def onpick(self, event):
+        if event.mouseevent.inaxes != self.canvas.axes:
+            return
+        if event.mouseevent.button.value != 1:
+            return
+
+        modifiers = QApplication.keyboardModifiers()
+        if modifiers not in [Qt.ControlModifier,
+                             Qt.NoModifier,
+                             Qt.ShiftModifier]:
+            return
+
+        ind, point = self._closest_section(event)
+        if self._table is None:
+            return
+        self._table.blockSignals(True)
+        if modifiers == Qt.ControlModifier:
+            rows = list(
+                set(
+                    (i.row() for i in self.parent.tableView.selectedIndexes())
+                )
+            )
+            if ind in rows:
+                rows.remove(ind)
+                self._select_in_table(rows)
+            else:
+                self._select_in_table(rows + [ind])
+        elif modifiers == Qt.ShiftModifier:
+            rows = list(
+                set(
+                    (i.row() for i in self.parent.tableView.selectedIndexes())
+                )
+            )
+            if len(rows) > 0:
+                i1 = min(rows[0], rows[-1], ind)
+                i2 = max(rows[0], rows[-1], ind)
+            else:
+                i1 = ind
+                i2 = ind
+            self._select_range_in_table(i1, i2)
+        else:
+            self._select_in_table([ind])
+        self._table.blockSignals(False)
+
+        return
+
+    def _closest_section(self, event):
+        axes = self.canvas.axes
+        mx = event.mouseevent.xdata
+        my = event.mouseevent.ydata
+        bx, by = axes.get_xlim(), axes.get_ylim()
+        ratio = (bx[0] - bx[1]) / (by[0] - by[1])
+
+        segments = event.artist.get_segments()
+        ind = event.ind
+
+        points = []
+        for i in ind:
+            points = points + [[i, j] for j in segments[i]]
+
+        def dist_mouse(point):
+            x, y = point[1]
+            d2 = (((mx - x) / ratio) ** 2) + ((my - y) ** 2)
+            return d2
+
+        closest = min(
+            points, key=dist_mouse
+        )
+
+        return closest
+
+    def _select_in_table(self, ind):
+        if self._table is None:
+            return
+        self._table.setFocus()
+        selection = self._table.selectionModel()
+        index = QItemSelection()
+        if len(ind) == 0:
+            return
+        for i in ind:
+            index.append(QItemSelectionRange(self._table.model().index(i, 0)))
+        selection.select(
+            index,
+            QItemSelectionModel.Rows |
+            QItemSelectionModel.ClearAndSelect |
+            QItemSelectionModel.Select
+        )
+
+        if len(ind) > 0:
+            self._table.scrollTo(self._table.model().index(ind[-1], 0))
+
+    def _select_range_in_table(self, ind1, ind2):
+        if self._table is not None:
+            self._table.setFocus()
+            selection = self._table.selectionModel()
+            index = QItemSelection(self._table.model().index(ind1, 0),
+                                   self._table.model().index(ind2, 0))
+            selection.select(
+                index,
+                QItemSelectionModel.Rows |
+                QItemSelectionModel.ClearAndSelect |
+                QItemSelectionModel.Select
+            )
+            self._table.scrollTo(self._table.model().index(ind2, 0))
 
     @timer
     def draw(self):
@@ -63,33 +178,42 @@ class PlotXY(PamhyrPlot):
         self.draw_xy()
         self.draw_lr()
         self.draw_gl()
-        self.draw_current()
 
         self.idle()
         self._init = True
 
     def draw_xy(self):
-        kp = self.data.get_kp_complete_profiles()
-
-        kp_min, kp_max = (-1, -1)
-        if self._highlight_data is not None:
-            kp_min, kp_max = self._highlight_data
-
-        def color_hightlight(kp):
-            if kp_min <= kp <= kp_max:
-                return self.color_plot_highlight
-            return self.color_plot
-
         self.line_xy = []
-        for x, y, kp in zip(self.data.get_x(),
-                            self.data.get_y(),
-                            kp):
-            line = self.canvas.axes.plot(
-                x, y,
-                color=color_hightlight(kp),
-                **self.plot_default_kargs
+        for xy in zip(self.data.get_x(), self.data.get_y()):
+            self.line_xy.append(np.column_stack(xy))
+
+        self._colors, self._style = self.color_hightlight()
+        self.line_xy_collection = collections.LineCollection(
+            self.line_xy,
+            colors=self._colors,
+            linestyle=self._style,
+            picker=10
+        )
+        self.canvas.axes.add_collection(self.line_xy_collection)
+
+    def color_hightlight(self):
+        rows = sorted(list(
+            set(
+                (i.row() for i in self.parent.tableView.selectedIndexes())
             )
-            self.line_xy.append(line)
+        ))
+        colors = [self.color_plot for row in range(len(self._data))]
+        style = ["-" for row in range(len(self._data))]
+        if len(rows) > 0:
+            for row in rows:
+                colors[row] = self.color_plot_current
+            if rows[0] > 0:
+                colors[rows[0]-1] = self.color_plot_previous
+                style[rows[0]-1] = "--"
+            if rows[-1] < len(self._data)-1:
+                colors[rows[-1]+1] = self.color_plot_next
+                style[rows[-1]+1] = "--"
+        return colors, style
 
     def draw_lr(self):
         lx = []
@@ -136,33 +260,6 @@ class PlotXY(PamhyrPlot):
             self.line_gl.append(line)
             ind += 1
 
-    def draw_current(self):
-        # Previous profile
-        self.before_plot_selected, = self.canvas.axes.plot(
-            self.data.profile(0).x(),
-            self.data.profile(0).y(),
-            color=self.color_plot_previous, linestyle="--",
-            **self.plot_default_kargs
-        )
-        self.before_plot_selected.set_visible(False)
-
-        # Current profile
-        self.plot_selected, = self.canvas.axes.plot(
-            self.data.profile(0).x(),
-            self.data.profile(0).y(),
-            color=self.color_plot_current, **self.plot_default_kargs
-        )
-        self.plot_selected.set_visible(False)
-
-        # Next profile
-        self.after_plot_selected, = self.canvas.axes.plot(
-            self.data.profile(0).x(),
-            self.data.profile(0).y(),
-            color=self.color_plot_next, linestyle='--',
-            **self.plot_default_kargs
-        )
-        self.after_plot_selected.set_visible(False)
-
     @timer
     def update(self):
         if not self._init:
@@ -183,21 +280,24 @@ class PlotXY(PamhyrPlot):
         x_complete = list(self.data.get_guidelines_x())
         y_complete = list(self.data.get_guidelines_y())
 
-        for i in range(self.data.number_profiles):
-            if i < len(self.line_xy):
-                self.line_xy[i][0].set_data(
-                    self.data.profile(i).x(),
-                    self.data.profile(i).y()
-                )
-            else:
-                self.line_xy.append(
-                    self.canvas.axes.plot(
-                        self.data.profile(i).x(),
-                        self.data.profile(i).y(),
-                        color='r',
-                        **self.plot_default_kargs
-                    )
-                )
+#        TODO comprendre à quoi sert ce bout de code
+#        ========>
+#        for i in range(self.data.number_profiles):
+#            if i < len(self.line_xy):
+#                self.line_xy[i][0].set_data(
+#                    self.data.profile(i).x(),
+#                    self.data.profile(i).y()
+#                )
+#            else:
+#                self.line_xy.append(
+#                    self.canvas.axes.plot(
+#                        self.data.profile(i).x(),
+#                        self.data.profile(i).y(),
+#                        color='r',
+#                        **self.plot_default_kargs
+#                    )
+#                )
+#        <========
 
         for i in range(len(x_complete)):
             if i < len(self.line_gl):
@@ -215,32 +315,9 @@ class PlotXY(PamhyrPlot):
 
     def update_current(self):
         if self._current_data_update:
-            ind = self._current_data
-            before = ind - 1
-            after = ind + 1
-
-            self.before_plot_selected.set_visible(False)
-            self.plot_selected.set_visible(False)
-            self.after_plot_selected.set_visible(False)
-
-            if 0 <= before < self.data.number_profiles:
-                self.before_plot_selected.set_data(
-                    self.data.profile(before).x(),
-                    self.data.profile(before).y()
-                )
-                self.before_plot_selected.set_visible(True)
-
-            if 0 <= ind < self.data.number_profiles:
-                self.plot_selected.set_data(self.data.profile(ind).x(),
-                                            self.data.profile(ind).y())
-                self.plot_selected.set_visible(True)
-
-            if 0 <= after < self.data.number_profiles:
-                self.after_plot_selected.set_data(
-                    self.data.profile(after).x(),
-                    self.data.profile(after).y()
-                )
-                self.after_plot_selected.set_visible(True)
+            self._colors, self._style = self.color_hightlight()
+            self.line_xy_collection.set_colors(self._colors)
+            self.line_xy_collection.set_linestyle(self._style)
 
     def update_lr(self):
         for line in self.line_lr:

src/View/Geometry/Profile/Plot.py

@@ -24,10 +24,12 @@ from tools import timer, trace
 from View.Tools.PamhyrPlot import PamhyrPlot
 
 from PyQt5.QtCore import (
-    Qt, QCoreApplication, QItemSelectionModel
+    Qt, QCoreApplication, QItemSelectionModel,
+    QItemSelection, QItemSelectionRange,
 )
 
 from PyQt5.QtWidgets import QApplication
+from matplotlib.widgets import RectangleSelector
 
 _translate = QCoreApplication.translate
 
@@ -46,6 +48,7 @@ class Plot(PamhyrPlot):
         )
 
         self._table = table
+        self._parent = parent
         self._z_note = None
         self._z_line = None
         self._z_fill_between = None
@@ -53,7 +56,7 @@ class Plot(PamhyrPlot):
         self.line_xy = []
         self.line_gl = []
 
-        self.label_x = self._trad["unit_kp"]
+        self.label_x = self._trad["unit_rk"]
         self.label_y = self._trad["unit_height"]
 
         self.before_plot_selected = None
@@ -68,40 +71,86 @@ class Plot(PamhyrPlot):
             None                # Hydrolic values (z, wet_area,
                                 # wet_preimeter, water_width)
         )
+        self._onpickevent = None
+        self._rect_select = RectangleSelector(
+            ax=self.canvas.axes,
+            onselect=self.rect_select_callback,
+            useblit=True,
+            button=[1],  # don't use middle nor right button
+            minspanx=2.0,
+            minspany=2.0,
+            spancoords='pixels',
+            interactive=False
+        )
+
+    def onrelease(self, event):
+        # we need to do that to prevent conflicst
+        # between onpick and rect_select_callback
+        modifiers = QApplication.keyboardModifiers()
+        points, hyd = self.highlight
+        if self._onpickevent is not None:
+            ind, point = self._closest_point(self._onpickevent)
+            if modifiers == Qt.ControlModifier:
+                rows = self._parent.index_selected_rows()
+                if ind in rows:
+                    rows.remove(ind)
+                    del (points[ind])
+                    self.highlight = (points, hyd)
+                    self._select_in_table(rows)
+                else:
+                    self.highlight = (points+[point], hyd)
+                    self._select_in_table(rows+[ind])
+            elif modifiers == Qt.ShiftModifier:
+                rows = self._parent.index_selected_rows()
+                if len(rows) > 0:
+                    i1 = min(rows[0], rows[-1], ind)
+                    i2 = max(rows[0], rows[-1], ind)
+                    p = [
+                            [self.data.points[i].x, self.data.points[i].y]
+                            for i in range(i1, i2)
+                        ]
+                else:
+                    i1 = ind
+                    i2 = ind
+                    p = [point]
+                self.highlight = (p, hyd)
+                self._select_range_in_table(i1, i2)
+            else:
+                self.highlight = ([point], hyd)
+                self._select_in_table([ind])
+
+        self._onpickevent = None
 
     def onpick(self, event):
         if event.mouseevent.inaxes != self.canvas.axes:
             return
-
-        modifiers = QApplication.keyboardModifiers()
-        if modifiers != Qt.ControlModifier:
+        if event.mouseevent.button.value != 1:
             return
 
-        _, hyd = self.highlight
+        modifiers = QApplication.keyboardModifiers()
+        if modifiers not in [Qt.ControlModifier,
+                             Qt.NoModifier,
+                             Qt.ShiftModifier]:
+            return
 
-        ind, point = self._closer_point(event)
-
-        self.highlight = ([point], hyd)
-        self._select_in_table(ind)
-
-        self.update()
+        self._onpickevent = event
         return
 
     def onclick(self, event):
         if event.inaxes != self.canvas.axes:
             return
-
-        modifiers = QApplication.keyboardModifiers()
-        if modifiers != Qt.ShiftModifier:
+        if event.button.value == 1:
             return
 
         points, _ = self.highlight
 
         z = self._get_z_from_click(event)
-        if z < self.data.z_min():
+        if z < self.data.z_min() or event.button.value == 2:
+            self.highlight = (points, None)
+            self.update()
             return
 
-        a, p, w = self._compute_hydrolics(z)
+        a, p, w = self._compute_hydraulics(z)
 
         logger.debug(f"{z, a, p, w}")
 
@@ -110,7 +159,7 @@ class Plot(PamhyrPlot):
         self.update()
         return
 
-    def select_points_from_indexes(self, indexes):
+    def select_points_from_indices(self, indices):
         data = self.data
         _, hyd = self.highlight
 
@@ -118,7 +167,7 @@ class Plot(PamhyrPlot):
             map(
                 lambda e: e[1],
                 filter(
-                    lambda e: e[0] in indexes,
+                    lambda e: e[0] in indices,
                     enumerate(
                         zip(data.get_station(), data.z())
                     )
@@ -133,9 +182,13 @@ class Plot(PamhyrPlot):
         if self._table is not None:
             self._table.blockSignals(True)
             self._table.setFocus()
-
             selection = self._table.selectionModel()
-            index = self._table.model().index(ind, 0)
+            index = QItemSelection()
+            if len(ind) > 0:
+                for i in ind:
+                    index.append(QItemSelectionRange(
+                        self._table.model().index(i, 0))
+                    )
             selection.select(
                 index,
                 QItemSelectionModel.Rows |
@@ -143,10 +196,27 @@ class Plot(PamhyrPlot):
                 QItemSelectionModel.Select
             )
 
-            self._table.scrollTo(index)
+            if len(ind) > 0:
+                self._table.scrollTo(self._table.model().index(ind[-1], 0))
             self._table.blockSignals(False)
 
-    def _closer_point(self, event):
+    def _select_range_in_table(self, ind1, ind2):
+        if self._table is not None:
+            self._table.blockSignals(True)
+            self._table.setFocus()
+            selection = self._table.selectionModel()
+            index = QItemSelection(self._table.model().index(ind1, 0),
+                                   self._table.model().index(ind2, 0))
+            selection.select(
+                index,
+                QItemSelectionModel.Rows |
+                QItemSelectionModel.ClearAndSelect |
+                QItemSelectionModel.Select
+            )
+            self._table.scrollTo(self._table.model().index(ind2, 0))
+            self._table.blockSignals(False)
+
+    def _closest_point(self, event):
         points_ind = event.ind
         axes = self.canvas.axes
         bx, by = axes.get_xlim(), axes.get_ylim()
@@ -166,22 +236,62 @@ class Plot(PamhyrPlot):
 
         def dist_mouse(point):
             x, y = point[1]
-            d = sqrt(
-                    (((mx - x) / ratio) ** 2) +
-                    ((my - y) ** 2)
-            )
-            return d
+            d2 = ((mx - x) / ratio) ** 2 + ((my - y) ** 2)
+            return d2
 
-        closer = min(
+        closest = min(
             points, key=dist_mouse
         )
 
-        return closer
+        return closest
 
     def _get_z_from_click(self, event):
         return event.ydata
 
-    def _compute_hydrolics(self, z):
+    def rect_select_callback(self, eclick, erelease):
+
+        points, hyd = self.highlight
+        x1, y1 = eclick.xdata, eclick.ydata
+        x2, y2 = erelease.xdata, erelease.ydata
+
+        if (max(abs(x1-x2), abs(y1-y2)) < 0.001):
+            return
+        modifiers = QApplication.keyboardModifiers()
+
+        x1, y1 = eclick.xdata, eclick.ydata
+        x2, y2 = erelease.xdata, erelease.ydata
+
+        inds, points2 = self._points_in_rectangle(x1, y1, x2, y2)
+        self._onclickevent = None
+        if modifiers == Qt.ControlModifier:
+            rows = self._parent.index_selected_rows()
+            if all(i in rows for i in inds):
+                for ind in sorted(inds, reverse=True):
+                    rows.remove(ind)
+                    del (points[ind])
+                self.highlight = (points, hyd)
+                self._select_in_table(rows)
+            else:
+                self.highlight = (points+points2, hyd)
+                self._select_in_table(rows+inds)
+        else:
+            self.highlight = (points2, hyd)
+            self._select_in_table(inds)
+        return
+
+    def _points_in_rectangle(self, x1, y1, x2, y2):
+        # TODO: use lambdas
+        listi = []
+        listp = []
+        station = self.data._get_station(self.data.points)
+        for i, p in enumerate(self.data.points):
+            if (min(x1, x2) < station[i] < max(x1, x2)
+                    and min(y1, y2) < p.z < max(y1, y2)):
+                listi.append(i)
+                listp.append((station[i], p.z))
+        return listi, listp
+
+    def _compute_hydraulics(self, z):
         profile = self.data
 
         points = profile.wet_points(z)
@@ -210,7 +320,7 @@ class Plot(PamhyrPlot):
         self.profile_line2D, = self.canvas.axes.plot(
             x, y, color=self.color_plot,
             lw=1.5, markersize=7, marker='+',
-            picker=30
+            picker=10
         )
 
         self.draw_annotation(x, y)
@@ -269,12 +379,16 @@ class Plot(PamhyrPlot):
                     x, y,
                     color=self.color_plot_highlight,
                     lw=1.5, markersize=7, marker='+',
-                    picker=30
                 )
             )
 
         if hyd is not None:
             self.draw_highligth_z_line(*hyd)
+        else:
+            if self._z_note is not None:
+                self._z_note.set_visible(False)
+                self._z_line[0].set_visible(False)
+                self._z_fill_between.set_visible(False)
 
     def draw_highligth_z_line(self, z, a, p, w):
         text = (
@@ -299,6 +413,7 @@ class Plot(PamhyrPlot):
                 xlim, [z, z],
                 color=self.color_plot_river_water
             )
+            self._z_line[0].set_visible(True)
 
             self._z_note = self.canvas.axes.annotate(
                 text, pos,
@@ -310,12 +425,15 @@ class Plot(PamhyrPlot):
                 fontweight='bold',
                 alpha=0.7
             )
+            self._z_note.set_visible(True)
         else:
             self.draw_highligth_z_line_fill(x, y, z)
 
             self._z_line[0].set_data(xlim, [z, z])
             self._z_note.set_position(pos)
             self._z_note.set_text(text)
+            self._z_line[0].set_visible(True)
+            self._z_note.set_visible(True)
 
     def draw_highligth_z_line_fill(self, x, y, z):
         if self._z_fill_between is not None:

src/View/Geometry/Profile/Table.py

@@ -82,16 +82,6 @@ class GeometryProfileTableModel(PamhyrTableModel):
                     elif value == self._data.z_max():
                         return QColor("blue")
 
-                if role == Qt.ToolTipRole:
-                    if value == self._data.z_min():
-                        return _translate("MainWindowProfile",
-                                          "La cote du fond",
-                                          "Z minimale")
-                    elif value == self._data.z_max():
-                        return _translate("MainWindowProfile",
-                                          "La cote maximale",
-                                          "Z maximale")
-
             if index.column() == 3:
                 value = self._data.point(index.row()).name
 
@@ -104,16 +94,6 @@ class GeometryProfileTableModel(PamhyrTableModel):
                     if role == Qt.ForegroundRole:
                         return QColor("darkRed")
 
-                    if role == Qt.ToolTipRole:
-                        if value.strip().upper() == "RG":
-                            return _translate(
-                                "MainWindowProfile", "Rive gauche"
-                            )
-                        else:
-                            return _translate(
-                                "MainWindowProfile", "Rive droite"
-                            )
-
         return QVariant()
 
     def setData(self, index, value, role=Qt.EditRole):
@@ -250,11 +230,11 @@ class GeometryProfileTableModel(PamhyrTableModel):
         self.endMoveRows()
         self.layoutChanged.emit()
 
-    def purge(self):
+    def purge(self, np_purge):
 
         self._undo.push(
             PurgeCommand(
-                self._data, 24
+                self._data, np_purge
             )
         )
 

src/View/Geometry/Profile/Window.py

@@ -20,8 +20,9 @@ import copy
 import sys
 import csv
 from time import time
+import logging
 
-from tools import trace, timer
+from tools import trace, timer, logger_exception
 from Modules import Modules
 
 from PyQt5.QtGui import (
@@ -46,9 +47,12 @@ from View.Tools.Plot.PamhyrCanvas import MplCanvas
 from View.Geometry.Profile.Plot import Plot
 from View.Geometry.Profile.Table import GeometryProfileTableModel
 from View.Geometry.Profile.Translate import GeometryProfileTranslate
+from View.Geometry.PurgeDialog import PurgeDialog
 
 _translate = QCoreApplication.translate
 
+logger = logging.getLogger()
+
 
 class ProfileWindow(PamhyrWindow):
     _pamhyr_ui = "GeometryCrossSection"
@@ -60,7 +64,7 @@ class ProfileWindow(PamhyrWindow):
         trad = GeometryProfileTranslate()
         name = (
             trad[self._pamhyr_name] +
-            f" - {self._profile.name} {self._profile.kp}"
+            f" - {self._profile.name} {self._profile.rk}"
         )
 
         super(ProfileWindow, self).__init__(
@@ -111,7 +115,8 @@ class ProfileWindow(PamhyrWindow):
             data=self._profile,
             trad=self._trad,
             toolbar=self._toolbar,
-            table=self.find(QTableView, "tableView")
+            table=self.find(QTableView, "tableView"),
+            parent=self
         )
         self._plot.draw()
 
@@ -142,7 +147,7 @@ class ProfileWindow(PamhyrWindow):
 
     def update_points_selection(self):
         rows = self.index_selected_rows()
-        self._plot.select_points_from_indexes(rows)
+        self._plot.select_points_from_indices(rows)
 
     def update(self):
         self.update_plot()
@@ -165,7 +170,6 @@ class ProfileWindow(PamhyrWindow):
         if Modules.GEOMETRY not in key:
             return
 
-        logger.debug("TOTO")
         self._tablemodel.layoutChanged.emit()
         self._update(redraw=True, propagate=False)
 
@@ -258,6 +262,19 @@ class ProfileWindow(PamhyrWindow):
         self._tablemodel.purge()
         self.update()
 
+    def purge(self):
+        try:
+            dlg = PurgeDialog(
+                trad=self._trad,
+                parent=self
+            )
+            if dlg.exec():
+                self._tablemodel.purge(dlg.np_purge)
+                self._plot.draw()
+        except Exception as e:
+            logger_exception(e)
+            return
+
     def reverse(self):
         self._tablemodel.reverse()
         self.update()

src/View/Geometry/PurgeDialog.py

@@ -0,0 +1,60 @@
+# PurgeDialog.py -- Pamhyr
+# Copyright (C) 2023-2024  INRAE
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# -*- coding: utf-8 -*-
+
+from View.Tools.PamhyrWindow import PamhyrDialog
+
+from PyQt5.QtGui import (
+    QKeySequence,
+)
+
+from PyQt5.QtCore import (
+    Qt, QVariant, QAbstractTableModel,
+)
+
+from PyQt5.QtWidgets import (
+    QUndoStack, QShortcut, QSpinBox,
+)
+
+
+class PurgeDialog(PamhyrDialog):
+    _pamhyr_ui = "PurgeOptions"
+    _pamhyr_name = "Purge"
+
+    def __init__(self, trad=None, parent=None):
+        super(PurgeDialog, self).__init__(
+            title=trad[self._pamhyr_name],
+            trad=trad,
+            options=[],
+            parent=parent
+        )
+
+        self._init_default_values()
+
+    def _init_default_values(self):
+        self._np_purge = 24
+
+    @property
+    def np_purge(self):
+        return self._np_purge
+
+    def accept(self):
+        self._np_purge = self.get_spin_box("spinBox_np_purge")
+        super().accept()
+
+    def reject(self):
+        self.close()

src/View/Geometry/Table.py

@@ -55,8 +55,8 @@ class GeometryReachTableModel(PamhyrTableModel):
             return self._data.profile(index.row()).name
 
         if role == Qt.DisplayRole and index.column() == 1:
-            kp = self._data.profile(index.row()).kp
-            return f"{kp:.4f}"
+            rk = self._data.profile(index.row()).rk
+            return f"{rk:.4f}"
 
         if role == Qt.DisplayRole and index.column() == 2:
             return str(self._data.profile(index.row()).nb_points)
@@ -94,9 +94,9 @@ class GeometryReachTableModel(PamhyrTableModel):
 
                 if index.column() == 1:
                     self._undo.push(
-                        SetKPCommand(
+                        SetRKCommand(
                             self._data, index.row(),
-                            self._data.profile(index.row()).kp,
+                            self._data.profile(index.row()).rk,
                             value
                         )
                     )
@@ -247,23 +247,23 @@ class GeometryReachTableModel(PamhyrTableModel):
         self.layoutAboutToBeChanged.emit()
         self.layoutChanged.emit()
 
-    def update_kp(self, mesher, data):
+    def update_rk(self, mesher, data):
         self.layoutAboutToBeChanged.emit()
 
         self._undo.push(
             MeshingCommand(
-                self._data, mesher, data, "update_kp"
+                self._data, mesher, data, "update_rk"
             )
         )
 
         self.layoutAboutToBeChanged.emit()
         self.layoutChanged.emit()
 
-    def purge(self):
+    def purge(self, np_purge):
 
         self._undo.push(
             PurgeCommand(
-                self._data, 24
+                self._data, np_purge
             )
         )
         self.layoutChanged.emit()

src/View/Geometry/Translate.py

@@ -33,12 +33,12 @@ class GeometryTranslate(MainTranslate):
 
         self._dict["open_file"] = _translate("Geometry", "Open a file")
         self._dict["file_st"] = _translate(
-            "Geometry", "File mage geometry (*.ST *.st)")
+            "Geometry", "Mage geometry file (*.ST *.st)")
         self._dict["file_m"] = _translate(
-            "Geometry", "File mage meshed geometry (*.M *.m)")
+            "Geometry", "Mage meshed geometry file (*.M *.m)")
         self._dict["file_shp"] = _translate(
             "Geometry", "Shapefile (*.SHP *.shp)")
-        self._dict["file_all"] = _translate("Geometry", "All file (*)")
+        self._dict["file_all"] = _translate("Geometry", "All files (*)")
 
         self._dict["cross_section"] = _translate("Geometry", "cross-section")
         self._dict["cross_sections"] = _translate("Geometry", "cross-sections")
@@ -61,7 +61,7 @@ class GeometryTranslate(MainTranslate):
 
         self._sub_dict["table_headers"] = {
             "name": self._dict["name"],
-            "kp": self._dict["unit_kp"],
+            "rk": self._dict["unit_rk"],
             "poins": _translate("Geometry", "Points"),
         }
 
@@ -70,7 +70,7 @@ class GeometryTranslate(MainTranslate):
             "2": _translate("Geometry", "the second guide-line"),
             "3": _translate(
                 "Geometry",
-                "the means between the two guide-lines"
+                "the mean over the two guide-lines"
             ),
         }
 

src/View/Geometry/UndoCommand.py

@@ -56,16 +56,16 @@ class SetNameCommand(SetDataCommand):
         self._reach.profile(self._index).name = self._new
 
 
-class SetKPCommand(SetDataCommand):
+class SetRKCommand(SetDataCommand):
     def __init__(self, reach, index, old_value, new_value):
         self.type = float
-        super(SetKPCommand, self).__init__(reach, index, old_value, new_value)
+        super(SetRKCommand, self).__init__(reach, index, old_value, new_value)
 
     def undo(self):
-        self._reach.profile(self._index).kp = self._old
+        self._reach.profile(self._index).rk = self._old
 
     def redo(self):
-        self._reach.profile(self._index).kp = self._new
+        self._reach.profile(self._index).rk = self._new
 
 
 class AddCommand(QUndoCommand):
@@ -243,8 +243,8 @@ class MeshingCommand(QUndoCommand):
 
     def redo(self):
         if self._new_profiles is None:
-            if self._command == "update_kp":
-                self._mesher.update_kp(
+            if self._command == "update_rk":
+                self._mesher.update_rk(
                     self._reach,
                     **self._data
                 )

src/View/Geometry/UpdateRKDialog.py

@@ -1,4 +1,4 @@
-# MeshingDialog.py -- Pamhyr
+# UpdateRKDialog.py -- Pamhyr
 # Copyright (C) 2023-2024  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
@@ -28,16 +28,16 @@ from PyQt5.QtCore import (
 
 from PyQt5.QtWidgets import (
     QDialogButtonBox, QComboBox, QUndoStack, QShortcut,
-    QDoubleSpinBox,
+    QDoubleSpinBox, QButtonGroup,
 )
 
 
-class UpdateKPDialog(PamhyrDialog):
-    _pamhyr_ui = "UpdateKPOptions"
-    _pamhyr_name = "UpdateKP"
+class UpdateRKDialog(PamhyrDialog):
+    _pamhyr_ui = "UpdateRKOptions"
+    _pamhyr_name = "UpdateRK"
 
     def __init__(self, reach, trad=None, parent=None):
-        super(UpdateKPDialog, self).__init__(
+        super(UpdateRKDialog, self).__init__(
             title=trad[self._pamhyr_name],
             trad=trad,
             options=[],
@@ -50,16 +50,22 @@ class UpdateKPDialog(PamhyrDialog):
         self._init_default_values()
 
     def _init_default_values(self):
-        self._space_step = 50.0
-        self._lplan = False
-        self._lm = "3"
-        self._linear = False
-        self._begin_cs = -1
-        self._end_cs = -1
+        gl, _ = self._reach.compute_guidelines()
+        self._gl = list(gl)
+
         self._begin_dir = "un"
         self._end_dir = "np"
+
+        lower_gl = list(map(str.lower, self._gl))
+        for i, gl in enumerate(lower_gl):
+            if gl == "rd":
+                self._begin_dir = self._gl[i]
+            elif gl == "rg":
+                self._end_dir = self._gl[i]
+
+        self._orientation = 0
         self._origin = self._reach.profile(0)
-        self._origin_value = self._reach.profile(0).kp
+        self._origin_value = self._reach.profile(0).rk
 
         self._init_default_values_profiles()
         self._init_default_values_guidelines()
@@ -69,14 +75,25 @@ class UpdateKPDialog(PamhyrDialog):
 
         self.combobox_add_items("comboBox_origin", profiles)
 
-        self.find(QComboBox, "comboBox_origin").currentIndexChanged.connect(
-            self.changed_profile)
+        self.find(QComboBox, "comboBox_origin")\
+            .currentIndexChanged\
+            .connect(
+                self.changed_profile
+            )
+
+        buttonbox = self.find(QButtonGroup, "buttonGroup_orientation")
+
+        for button in buttonbox.buttons():
+            name = button.objectName()
+            i = int(name.split('_')[-1])
+
+            buttonbox.setId(button, i)
 
     def changed_profile(self):
         origin = self.get_combobox_text("comboBox_origin")
         self.set_double_spin_box(
             "doubleSpinBox_origin",
-            self._reach.profile(self.profiles.index(origin)).kp
+            self._reach.profile(self.profiles.index(origin)).rk
         )
 
     @property
@@ -95,18 +112,15 @@ class UpdateKPDialog(PamhyrDialog):
         name = profile.name
 
         if name == "":
-            name = f"{profile.kp}"
+            name = f"{profile.rk}"
         else:
-            name += f" ({profile.kp})"
+            name += f" ({profile.rk})"
 
         return name
 
     def _init_default_values_guidelines(self):
-        gl, _ = self._reach.compute_guidelines()
-        gl = list(gl)
-
-        bgl = ['un'] + gl + ['np']
-        egl = ['un'] + gl + ['np']
+        bgl = ['un'] + self._gl + ['np']
+        egl = ['un'] + self._gl + ['np']
 
         self.combobox_add_items("comboBox_begin_gl", bgl)
         self.combobox_add_items("comboBox_end_gl", egl)
@@ -114,6 +128,10 @@ class UpdateKPDialog(PamhyrDialog):
         self.set_combobox_text("comboBox_begin_gl", self._begin_dir)
         self.set_combobox_text("comboBox_end_gl", self._end_dir)
 
+    @property
+    def orientation(self):
+        return self._orientation
+
     @property
     def origin(self):
         return self._origin
@@ -133,11 +151,12 @@ class UpdateKPDialog(PamhyrDialog):
     def accept(self):
         origin = self.get_combobox_text("comboBox_origin")
         self._origin = self.profiles.index(origin)
-
         self._origin_value = self.get_double_spin_box("doubleSpinBox_origin")
-
         self._begin_dir = self.get_combobox_text("comboBox_begin_gl")
         self._end_dir = self.get_combobox_text("comboBox_end_gl")
+        self._orientation = self.get_checked_id_button_group(
+            "buttonGroup_orientation"
+        )
 
         super().accept()