Friction: SQL: Fix type name.

src/Meshing/Mage.py

@@ -287,12 +287,14 @@ class MeshingWithMageMailleurTT(AMeshingTool):
             return reach
 
         with tempfile.TemporaryDirectory() as tmp:
+            logger.debug(f"temp file: {tmp}")
             st_file = self.export_reach_to_st(reach, tmp)
             m_file = st_file.rsplit(".ST", 1)[0] + ".M"
 
             proc = QProcess()
             proc.setWorkingDirectory(tmp)
 
+            logger.debug(f"! mailleurTT {st_file} {m_file} {str(step)}")
             proc.start(
                 self._exe_path(), [st_file, m_file, str(step)]
             )

src/Model/Friction/Friction.py

@@ -43,12 +43,12 @@ class Friction(SQLSubModel):
         execute("""
           CREATE TABLE friction(
             id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-            ind INTERGER NOT NULL,
+            ind INTEGER NOT NULL,
             begin_kp REAL NOT NULL,
             end_kp REAL NOT NULL,
             reach INTEGER NOT NULL,
-            begin_strickler INTERGER,
-            end_strickler INTERGER,
+            begin_strickler INTEGER NOT NULL,
+            end_strickler INTEGER NOT NULL,
             FOREIGN KEY(reach) REFERENCES river_reach(id),
             FOREIGN KEY(begin_strickler) REFERENCES stricklers(id),
             FOREIGN KEY(end_strickler) REFERENCES stricklers(id)

src/Model/HydraulicStructures/HydraulicStructures.py

@@ -200,7 +200,10 @@ class HydraulicStructure(SQLSubModel):
 
     @input_kp.setter
     def input_kp(self, input_kp):
-        self._input_kp = float(input_kp)
+        if input_kp is not None:
+            input_kp = float(input_kp)
+
+        self._input_kp = input_kp
         self._status.modified()
 
     @property

src/Solver/Mage.py

@@ -507,6 +507,8 @@ class Mage(CommandLineSolver):
                     name = bhs.name
                     if name == "":
                         name = f"HS_{bhs.id:>3}".replace(" ", "0")
+                    else:
+                        name = name.replace(" ", "_")
 
                     f.write(
                         f"{sin_dict[bhs._type]} " +
@@ -1198,9 +1200,10 @@ class Mage8(Mage):
             logger.info(f"read_gra: ... end with {len(ts)} timestamp read")
 
     @timer
-    def results(self, study, repertory, qlog=None):
+    def results(self, study, repertory, qlog=None, name=None):
         self._study = study
-        name = study.name.replace(" ", "_")
+        if name is None:
+            name = study.name.replace(" ", "_")
 
         results = super(Mage8, self).results(study, repertory, qlog, name=name)
         self.read_gra(study, repertory, results, qlog, name=name)

src/View/Geometry/Translate.py

@@ -29,9 +29,9 @@ class GeometryTranslate(PamhyrTranslate):
 
         self._dict["open_file"] = _translate("Geometry", "Open a file")
         self._dict["file_st"] = _translate(
-            "Geometry", "File mage geometry (*.ST)")
+            "Geometry", "File mage geometry (*.ST *.st)")
         self._dict["file_m"] = _translate(
-            "Geometry", "File mage meshed geometry (*.M)")
+            "Geometry", "File mage meshed geometry (*.M *.m)")
         self._dict["file_all"] = _translate("Geometry", "All file (*)")
 
         self._dict["reach"] = _translate("Geometry", "reach")

src/View/Geometry/Window.py

@@ -530,16 +530,16 @@ class GeometryWindow(PamhyrWindow):
     def _undo(self):
         self._table.undo()
         self.select_current_profile()
-        self.update_plot_ac()
-        self.update_plot_xy()
-        self.update_plot_kpc()
+        # self.update_plot_ac()
+        # self.update_plot_xy()
+        # self.update_plot_kpc()
 
     def _redo(self):
         self._table.redo()
         self.select_current_profile()
-        self.update_plot_ac()
-        self.update_plot_xy()
-        self.update_plot_kpc()
+        # self.update_plot_ac()
+        # self.update_plot_xy()
+        # self.update_plot_kpc()
 
     def export_to_file(self):
         settings = QSettings(

src/View/MainWindow.py

@@ -454,9 +454,21 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
             "", "Pamhyr(*.pamhyr)"
         )
 
-        if file_name.rsplit(".", 1)[-1] == ".pamhyr":
+        logger.debug(f"Save study as : {repr(file_name)}")
+        if file_name == "":
+            return
+
+        if file_name.rsplit(".", 1)[-1] == "pamhyr":
+            logger.debug(
+                "Pamhyr extention is present : " +
+                f"{repr(file_name)}"
+            )
             self._study.filename = file_name
         else:
+            logger.debug(
+                "Pamhyr extention is not present : " +
+                f"{repr(file_name + '.pamhyr')}"
+            )
             self._study.filename = file_name + ".pamhyr"
 
         sql_request_count = self._study.sql_save_request_count()
@@ -843,15 +855,19 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
             if self._last_results is None:
                 results = solver.results(
                     self._study,
-                    self._solver_workdir(solver)
+                    self._solver_workdir(solver),
                 )
 
         # Open from file
         if type(results) is str:
             logger.info(f"Open results from {os.path.dirname(results)}")
+
+            name = os.path.basename(results).replace(".BIN", "")
+
             results = solver.results(
                 self._study,
                 os.path.dirname(results),
+                name=name
             )
 
         # No results available
@@ -918,6 +934,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
 
         if dialog.exec_():
             file_name = dialog.selectedFiles()
+            logger.info(f"Select results: {file_name}")
             self.open_solver_results(
                 self._last_solver,
                 results=file_name[0]

src/View/Network/GraphWidget.py

@@ -174,7 +174,8 @@ class EdgeItem(QGraphicsItem):
             return
 
         # Select color
-        color = Qt.darkBlue
+        # color = Qt.darkBlue
+        color = Qt.black
         if self.graph.selected_item() == self:
             color = Qt.red
         elif self.graph.current_edge() == self:

src/View/ui/MainWindow.ui

@@ -264,8 +264,8 @@
    </property>
    <property name="font">
     <font>
-     <weight>75</weight>
-     <bold>true</bold>
+     <weight>50</weight>
+     <bold>false</bold>
     </font>
    </property>
    <property name="shortcut">