src/Model/SedimentLayer/SedimentLayer.py

@@ -426,7 +426,6 @@ class SedimentLayer(SQLSubModel):
             f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) "
         )
 
-        if table is not None:
         for row in table:
             it = iter(row)
 

src/Solver/RubarBE.py

@@ -74,10 +74,10 @@ class Rubar3(CommandLineSolver):
             ("rubarbe_tf_5", "y"),
             ("rubarbe_tf_6", "n"),
             ("rubarbe_trased", "y"),
-            # ("rubarbe_optfpc", "0"),
+            ("rubarbe_optfpc", "0"),
-            # ("rubarbe_ros", "2650.0"),
+            ("rubarbe_ros", "2650.0"),
-            # ("rubarbe_dm", "0.1"),
+            ("rubarbe_dm", "0.1"),
-            # ("rubarbe_segma", "1.0"),
+            ("rubarbe_segma", "1.0"),
             # Sediment parameters
             ("rubarbe_sediment_ros", "2650.0"),
             ("rubarbe_sediment_por", "0.4"),
@@ -167,7 +167,7 @@ class Rubar3(CommandLineSolver):
             it = iter(params)
 
             line = 0
-            while line < 25:
+            while line < 29:
                 param = next(it)
                 name = param.name
                 value = param.value
@@ -277,20 +277,19 @@ class Rubar3(CommandLineSolver):
 
                     f.write(f"{ind:>4} {rk:>11.3f} {n_points:>4}\n")
 
-                    station = profile.get_station()
+                    for point in profile.points:
-                    for i, point in enumerate(profile.points):
                         label = point.name.lower()
                         if label != "":
                             if label[0] == "r":
                                 label = label[1].upper()
                             else:
-                                label = " "
+                                label = label[1].upper()
                         else:
                             label = " "
 
-                        y = station[i]
+                        y = point.y
                         z = point.z
-                        dcs = 1.0
+                        dcs = 0.001
                         scs = 1.0
                         tmcs = 0.0
 
@@ -445,10 +444,10 @@ class Rubar3(CommandLineSolver):
         z = data[profile.rk][0]
         q = data[profile.rk][1]
 
-        height = z - profile.z_min()
+        # height = z - profile.z_min()
         speed = profile.speed(q, z)
 
-        return height, speed
+        return z, speed
 
     def _export_hydro(self, study, repertory, qlog, name="0"):
         if qlog is not None:
@@ -471,7 +470,7 @@ class Rubar3(CommandLineSolver):
             for bc in bcs:
                 f.write(f"{len(bc)}\n")
                 for d0, d1 in bc.data:
-                    f.write(f"{d1} {d0}\n")
+                    f.write(f"{d0} {d1}\n")
 
     def _export_condav(self, study, repertory, qlog, name="0"):
         if qlog is not None:
@@ -494,7 +493,7 @@ class Rubar3(CommandLineSolver):
             for bc in bcs:
                 f.write(f"{len(bc)}\n")
                 for d0, d1 in bc.data:
-                    f.write(f"{d1} {d0}\n")
+                    f.write(f"{d0} {d1}\n")
 
 
 class RubarBE(Rubar3):

src/View/BoundaryCondition/Edit/Table.py

@@ -250,10 +250,7 @@ class TableModel(PamhyrTableModel):
                         line.startswith("*") or
                         line.startswith("$")):
                     line = line.split()
-                    if bctype == "ZD":
+                    data0.append(float(line[0]) * mult)
-                        data0.append(float(line[0]))
-                    else:
-                        data0.append(old_pamhyr_date_to_timestamp(line[0]))
                     data1.append(line[1])
 
         self.replace_data(data0, data1)

src/View/BoundaryCondition/Edit/translate.py

@@ -41,7 +41,7 @@ class BCETranslate(BCTranslate):
             "BoundaryCondition", "Mage hydrograph file (*.HYD)")
         self._dict["file_lim"] = _translate(
             "BoundaryCondition", "Mage limnigraph file (*.LIM)")
-        self._dict["file_ava"] = _translate(
+        self._dict["file_lim"] = _translate(
             "BoundaryCondition", "Mage rating curve file (*.AVA)")
         self._dict["file_all"] = _translate(
             "BoundaryCondition", "All files (*)")

src/View/Frictions/UndoCommand.py

@@ -153,7 +153,6 @@ class ReplaceDataCommand(QUndoCommand):
         self._new_data = new_data
         self._old_rows = list(range(len(frictions)))
         self._new_rows = list(range(len(new_data)))
-        self._new = []
 
         self._old_friction = []
         for row in self._old_rows:
@@ -165,7 +164,6 @@ class ReplaceDataCommand(QUndoCommand):
             self._frictions.insert(row, el)
 
     def redo(self):
-        if len(self._new) == 0:
         self._frictions.delete_i(self._old_rows)
         for row in self._new_rows:
             new = self._frictions.new(row)
@@ -175,10 +173,6 @@ class ReplaceDataCommand(QUndoCommand):
             new.end_rk = d[2]
             new.begin_strickler = d[3]
             new.end_strickler = d[4]
-                self._new.append((row, new))
-        else:
-            for row, el in self._new:
-                self._frictions.insert(row, el)
 
 
 class DelCommand(QUndoCommand):

src/View/InitialConditions/Window.py

@@ -319,10 +319,9 @@ class InitialConditionsWindow(PamhyrWindow):
 
     def _import_from_results(self, results):
         logger.debug(f"import from results: {results}")
-        self._table.import_from_results(results)
+        self._table.import_from_results(row, results)
 
     def _import_from_ini_file(self, file_name):
-        logger.debug(f"import from INI file: {file_name}")
         self._table.read_from_ini(file_name)
 
     def move_up(self):

src/View/LateralContribution/Table.py

@@ -19,7 +19,7 @@
 import logging
 import traceback
 
-from tools import trace, timer, old_pamhyr_date_to_timestamp
+from tools import trace, timer
 
 from PyQt5.QtCore import (
     Qt, QVariant, QAbstractTableModel,
@@ -38,7 +38,7 @@ from View.LateralContribution.UndoCommand import (
     SetNameCommand, SetEdgeCommand, SetTypeCommand,
     SetBeginCommand, SetEndCommand,
     AddCommand, DelCommand, SortCommand,
-    MoveCommand, PasteCommand, DuplicateCommand, ImportCommand,
+    MoveCommand, PasteCommand, DuplicateCommand,
 )
 
 from Model.LateralContribution.LateralContributionTypes import (
@@ -116,10 +116,7 @@ class ComboBoxDelegate(QItemDelegate):
     def setModelData(self, editor, model, index):
         text = str(editor.currentText())
 
-        if self._data is None:
+        if self._mode == "rk":
-            value = text
-        else:
-            if self._mode == "rk" and self._data.reach is not None:
             profiles = list(
                 filter(
                     lambda p: p.display_name() == text,
@@ -322,44 +319,3 @@ class TableModel(PamhyrTableModel):
 
         self.endMoveRows()
         self.layoutChanged.emit()
-
-    def read_from_lat(self, file_name):
-        logger.debug(f"Import lateral contributions from {file_name}")
-        data = []
-        current_reach = -1
-        with open(file_name, encoding="utf-8") as lat_file:
-            for line in lat_file:
-                if not (line.startswith("#") or
-                        line.startswith("*") or
-                        len(line) < 1):
-                    line = line.split()
-                    if line[0] == "$":
-                        current_reach = int(line[1]) - 1
-                        if (current_reach <= len(self._data.enable_edges()) and
-                                current_reach >= 0):
-                            data.append(
-                                [self._data.enable_edges()[current_reach],
-                                 float(line[2]),
-                                 float(line[3])
-                                 ]
-                            )
-                    else:
-                        if (current_reach <= len(self._data.enable_edges()) and
-                                current_reach >= 0):
-                            data[-1].append(
-                                [
-                                    old_pamhyr_date_to_timestamp(line[0]),
-                                    float(line[1])
-                                ]
-                            )
-
-        self.layoutAboutToBeChanged.emit()
-
-        self._undo.push(
-            ImportCommand(
-                self._lst, self._tab, data
-            )
-        )
-
-        self.layoutAboutToBeChanged.emit()
-        self.layoutChanged.emit()

src/View/LateralContribution/UndoCommand.py

@@ -28,10 +28,6 @@ from Model.LateralContribution.LateralContributionList import (
     LateralContributionList
 )
 
-from Model.LateralContribution.LateralContributionTypes import (
-    NotDefined, LateralContrib,
-)
-
 
 class SetNameCommand(QUndoCommand):
     def __init__(self, lcs, tab, index, new_value):
@@ -147,12 +143,12 @@ class DelCommand(QUndoCommand):
         self._tab = tab
         self._rows = rows
 
-        self._lc = []
+        self._bc = []
         for row in rows:
-            self._lc.append(self._lcs.get_tab(self._tab)[row])
+            self._bc.append(self._lcs.get_tab(self._tab)[row])
 
     def undo(self):
-        for el in self._lc:
+        for el in self._bc:
             el.set_as_not_deleted()
 
     def redo(self):
@@ -218,73 +214,36 @@ class MoveCommand(QUndoCommand):
 
 
 class PasteCommand(QUndoCommand):
-    def __init__(self, lcs, tab, row, lc):
+    def __init__(self, lcs, tab, row, bc):
         QUndoCommand.__init__(self)
 
         self._lcs = lcs
         self._tab = tab
         self._row = row
-        self._lc = deepcopy(lc)
+        self._bc = deepcopy(bc)
-        self._lc.reverse()
+        self._bc.reverse()
 
     def undo(self):
-        self._lcs.delete(self._tab, self._lc)
+        self._lcs.delete(self._tab, self._bc)
 
     def redo(self):
-        for lc in self._lc:
+        for bc in self._bc:
-            self._lcs.insert(self._tab, self._row, lc)
+            self._lcs.insert(self._tab, self._row, bc)
-
-
-class ImportCommand(QUndoCommand):
-    def __init__(self, lcs, tab, data):
-        QUndoCommand.__init__(self)
-
-        self._tab = tab
-        self._lcs = lcs
-        self._data = data
-        self._old_rows = list(range(len(self._lcs.get_tab(self._tab))))
-        self._new_rows = list(range(len(self._data)))
-
-        self._new_lc = None
-        self._old_lc = []
-        for row in self._old_rows:
-            self._old_lc.append((row, self._lcs.get(self._tab, row)))
-
-    def undo(self):
-        self._lcs.delete_i(self._tab, self._new_rows)
-        for row, el in self._old_lc:
-            self._lcs.insert(self._tab, row, el)
-
-    def redo(self):
-        self._lcs.delete_i(self._tab, self._old_rows)
-        if self._new_lc is None:
-            self._new_lc = []
-            for row, data in enumerate(self._data):
-                new = LateralContrib(status=self._lcs._status)
-                new.edge = data[0]
-                new.begin_rk = data[1]
-                new.end_rk = data[2]
-                for i, val in enumerate(data[3:]):
-                    new.insert(i, val)
-                self._new_lc.append(new)
-
-        for row, el in enumerate(self._new_lc):
-            self._lcs.insert(self._tab, row, el)
 
 
 class DuplicateCommand(QUndoCommand):
-    def __init__(self, lcs, tab, rows, lc):
+    def __init__(self, lcs, tab, rows, bc):
         QUndoCommand.__init__(self)
 
         self._lcs = lcs
         self._tab = tab
         self._rows = rows
-        self._lc = deepcopy(lc)
+        self._bc = deepcopy(bc)
-        self._lc.reverse()
+        self._bc.reverse()
 
     def undo(self):
-        self._lcs.delete(self._tab, self._lc)
+        self._lcs.delete(self._tab, self._bc)
 
     def redo(self):
-        for lc in self._lcs:
+        for bc in self._lcs:
-            self._lcs.insert(self._tab, self._rows[0], lc)
+            self._lcs.insert(self._tab, self._rows[0], bc)

src/View/LateralContribution/Window.py

@@ -22,7 +22,6 @@ from tools import trace, timer
 
 from View.Tools.PamhyrWindow import PamhyrWindow
 
-from PyQt5 import QtWidgets
 from PyQt5.QtGui import (
     QKeySequence,
 )
@@ -30,7 +29,7 @@ from PyQt5.QtGui import (
 from PyQt5.QtCore import (
     Qt, QVariant, QAbstractTableModel,
     QCoreApplication, QModelIndex, pyqtSlot,
-    QRect, QSettings,
+    QRect,
 )
 
 from PyQt5.QtWidgets import (
@@ -159,8 +158,6 @@ class LateralContributionWindow(PamhyrWindow):
 
     def setup_connections(self):
         if self._study.is_editable():
-            self.find(QAction, "action_import").triggered.connect(
-                self.import_from_file)
             self.find(QAction, "action_add").triggered.connect(self.add)
             self.find(QAction, "action_del").triggered.connect(self.delete)
             self.find(QAction, "action_sort").triggered.connect(self.sort)
@@ -305,26 +302,3 @@ class LateralContributionWindow(PamhyrWindow):
                 parent=self
             )
             win.show()
-
-    def import_from_file(self):
-        options = QFileDialog.Options()
-        settings = QSettings(QSettings.IniFormat,
-                             QSettings.UserScope, 'MyOrg', )
-        options |= QFileDialog.DontUseNativeDialog
-
-        file_types = [
-            self._trad["file_lat"],
-            self._trad["file_all"],
-        ]
-
-        filename, _ = QtWidgets.QFileDialog.getOpenFileName(
-            self,
-            self._trad["open_file"],
-            "",
-            ";; ".join(file_types),
-            options=options
-        )
-
-        if filename != "":
-            tab = self.current_tab()
-            self._table[tab].read_from_lat(filename)

src/View/LateralContribution/translate.py

@@ -52,10 +52,6 @@ class LCTranslate(MainTranslate):
         self._dict["x"] = _translate("Geometry", "X (m)")
         self._dict["y"] = _translate("Geometry", "Y (m)")
         self._dict["z"] = _translate("Geometry", "Z (m)")
-        self._dict["file_lat"] = _translate(
-            "LateralContribution", "Shapefile (*.LAT *.lat)")
-        self._dict["file_all"] = _translate(
-            "LateralContribution", "All files (*)")
 
         self._sub_dict["table_headers"] = {
             "name": self._dict["name"],

src/View/Results/Window.py

@@ -495,7 +495,7 @@ class ResultsWindow(PamhyrWindow):
         table = self.find(QTableView, f"tableView_profile")
         indexes = table.selectedIndexes()
         if len(indexes) == 0:
-            return []
+            return 0
 
         return [i.row() for i in indexes]
 

src/View/ui/EditLateralContribution.ui

@@ -112,18 +112,6 @@
     <string>Sort points</string>
    </property>
   </action>
-  <action name="action_import">
-   <property name="icon">
-    <iconset>
-     <normaloff>ressources/import.png</normaloff>ressources/import.png</iconset>
-   </property>
-   <property name="text">
-    <string>Import</string>
-   </property>
-   <property name="toolTip">
-    <string>Import from file</string>
-   </property>
-  </action>
  </widget>
  <resources/>
  <connections/>

src/View/ui/LateralContributions.ui

@@ -97,7 +97,6 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="action_import"/>
    <addaction name="action_add"/>
    <addaction name="action_del"/>
    <addaction name="action_edit"/>
@@ -163,18 +162,6 @@
     <string>Sort by names</string>
    </property>
   </action>
-  <action name="action_import">
-   <property name="icon">
-    <iconset>
-     <normaloff>ressources/import.png</normaloff>ressources/import.png</iconset>
-   </property>
-   <property name="text">
-    <string>Import</string>
-   </property>
-   <property name="toolTip">
-    <string>Import from file</string>
-   </property>
-  </action>
  </widget>
  <resources/>
  <connections/>

src/tools.py

@@ -264,9 +264,6 @@ def date_dmy_to_timestamp(date: str):
 def old_pamhyr_date_to_timestamp(date: str):
     v = date.split(":")
     if len(v) != 4:
-        if len(v) == 1:  # minutes
-            return int(float(v[0]) * 60)  # Minute to sec
-        else:
         return 0
 
     m = [