src/Meshing/Internal.py

@@ -166,6 +166,7 @@ class InternalMeshing(AMeshingTool):
         for i in range(len1):
             ltot1 += sect1.point(start1+i).dist(sect1.point(start1+i+1))
             alpha.append(ltot1)
+        alpha = list(map(lambda x: x/ltot1, alpha))  # target ratios
         for i in range(len2):
             ltot2 += sect2.point(start2+i).dist(sect2.point(start2+i+1))
             beta.append(ltot2)
@@ -180,7 +181,6 @@ class InternalMeshing(AMeshingTool):
             sect2.add_npoints(len1-len2)
             len2 = len1
         else:  # regular case
-            alpha = list(map(lambda x: x/ltot1, alpha))  # target ratios
             beta = list(map(lambda x: x/ltot2, beta))  # current ratios
             for i in range(len1 - len2):
                 beta.append(1.0)

src/Model/Pollutants/Pollutants.py

@@ -419,8 +419,7 @@ class Pollutants(SQLSubModel):
             return new
 
         table = execute(
-            "SELECT pamhyr_id, deleted, enabled, name, scenario " +
+            "SELECT pamhyr_id, deleted, enabled, name, scenario FROM pollutants " +
-            "FROM pollutants " +
             f"WHERE scenario = {scenario.id} " +
             f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))})"
         )

src/View/Geometry/PlotAC.py

@@ -143,7 +143,7 @@ class PlotAC(PamhyrPlot):
                 ]
             else:
                 color = self.color_incomplete_gl[
-                    lincomplete.index(txt) % len(self.color_incomplete_gl)
+                    lincomplete.index(txt)
                 ]
 
             annotation = self.canvas.axes.annotate(

src/View/Geometry/Translate.py

@@ -97,15 +97,3 @@ class GeometryTranslate(MainTranslate):
         self._dict["format_not_exportable"] = _translate(
             "Geometry", "The format of the file is not exportable."
         )
-        self._dict["update_rk_error"] = _translate(
-            "Geometry",
-            "RK update can't be executed."
-        )
-        self._dict["update_rk_empty_profiles"] = _translate(
-            "Geometry",
-            "Some profiles don't contain any point."
-        )
-        self._dict["update_rk_empty_profiles_info"] = _translate(
-            "Geometry",
-            "Profiles concerned:"
-        )

src/View/Geometry/Window.py

@@ -371,29 +371,6 @@ class GeometryWindow(PamhyrWindow):
                 parent=self
             )
             if dlg.exec():
-                empty_profiles = [
-                    profile for profile in self._reach.profiles
-                    if profile.number_points == 0
-                ]
-                if empty_profiles:
-                    profile_names = ", ".join(
-                        profile.name or str(profile.num)
-                        for profile in empty_profiles
-                    )
-                    self.message_box(
-                        (
-                            self._trad["update_rk_error"] +
-                            "\n" +
-                            self._trad["update_rk_empty_profiles"]
-                        ),
-                        (
-                            self._trad["update_rk_empty_profiles_info"] +
-                            f" {profile_names}"
-                        ),
-                        window_title=self._trad["warning"]
-                    )
-                    return
-
                 data = {
                     "origin": dlg.origin,
                     "directrices": [dlg.begin_dir, dlg.end_dir],

src/lang/fr.ts

@@ -771,12 +771,12 @@ Cette fonctionnalité nécessite un bief muni d'une géométrie.</translation>
         <translation>Dernière modification :</translation>
     </message>
     <message>
-        <location filename="../View/ui/CustomPlotValuesSelectionDialog.ui" line="37"/>
+        <location filename="../View/ui/CustomPlotValuesSelectionDialog.ui" line="27"/>
         <source>X axis:</source>
         <translation>Axe X :</translation>
     </message>
     <message>
-        <location filename="../View/ui/CustomPlotValuesSelectionDialog.ui" line="48"/>
+        <location filename="../View/ui/CustomPlotValuesSelectionDialog.ui" line="38"/>
         <source>Y axis:</source>
         <translation>Axe Y :</translation>
     </message>
@@ -943,12 +943,12 @@ Cette fonctionnalité nécessite un bief muni d'une géométrie.</translation>
     <message>
         <location filename="../View/ui/InitialConditions_Dialog_Generator_Height.ui" line="25"/>
         <source>Upstream height (m)</source>
-        <translation type="obsolete">Cote à l'amont (m)</translation>
+        <translation>Cote à l'amont (m)</translation>
     </message>
     <message>
         <location filename="../View/ui/InitialConditions_Dialog_Generator_Height.ui" line="73"/>
         <source>Downstream height (m)</source>
-        <translation type="obsolete">Cote à l'aval (m)</translation>
+        <translation>Cote à l'aval (m)</translation>
     </message>
     <message>
         <location filename="../View/ui/InitialConditions_Dialog_Generator_Height.ui" line="107"/>
@@ -991,7 +991,7 @@ Cette fonctionnalité nécessite un bief muni d'une géométrie.</translation>
         <translation>Débit (m³/s)</translation>
     </message>
     <message>
-        <location filename="../View/ui/CustomExportAdisDialog.ui" line="49"/>
+        <location filename="../View/ui/CustomExportAdisDialog.ui" line="59"/>
         <source>Pollutant:</source>
         <translation>Polluant:</translation>
     </message>
@@ -1040,21 +1040,6 @@ Cette fonctionnalité nécessite un bief muni d'une géométrie.</translation>
         <source>Image coordinates</source>
         <translation type="obsolete">Coordonnées de l'image</translation>
     </message>
-    <message>
-        <location filename="../View/ui/CustomPlotValuesSelectionDialog.ui" line="59"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../View/ui/InitialConditions_Dialog_Generator_Height.ui" line="25"/>
-        <source>Upstream elevation (m)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../View/ui/InitialConditions_Dialog_Generator_Height.ui" line="73"/>
-        <source>Downstream elevation (m)</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Documentation</name>
@@ -1572,33 +1557,12 @@ Cette fonctionnalité nécessite un bief muni d'une géométrie.</translation>
     <message>
         <location filename="../View/Geometry/Translate.py" line="94"/>
         <source>Warning</source>
-        <translation>Avertissement</translation>
+        <translation type="unfinished">Avertissement</translation>
     </message>
     <message>
         <location filename="../View/Geometry/Translate.py" line="97"/>
         <source>The format of the file is not exportable.</source>
-        <translation>Le format de fichier n'est pas exportable.</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../View/Geometry/Translate.py" line="100"/>
-        <source>RK update can&apos;t be executed
-Some profiles don&apos;t contain any point.</source>
-        <translation type="obsolete">La mise à jour du PK ne peut pas être exécutée\nDes profils ne contiennent aucun points.</translation>
-    </message>
-    <message>
-        <location filename="../View/Geometry/Translate.py" line="108"/>
-        <source>Profiles concerned:</source>
-        <translation>Profils concernés:</translation>
-    </message>
-    <message>
-        <location filename="../View/Geometry/Translate.py" line="100"/>
-        <source>RK update can&apos;t be executed.</source>
-        <translation>La mise à jour du PK ne peut pas être exécutée.</translation>
-    </message>
-    <message>
-        <location filename="../View/Geometry/Translate.py" line="104"/>
-        <source>Some profiles don&apos;t contain any point.</source>
-        <translation>Des profils ne contiennent aucun points.</translation>
     </message>
 </context>
 <context>
@@ -1683,12 +1647,12 @@ Some profiles don&apos;t contain any point.</source>
         <translation>Évaporation</translation>
     </message>
     <message>
-        <location filename="../View/LateralContribution/translate.py" line="65"/>
+        <location filename="../View/LateralContribution/translate.py" line="64"/>
         <source>Start (m)</source>
         <translation>PK de départ (m)</translation>
     </message>
     <message>
-        <location filename="../View/LateralContribution/translate.py" line="66"/>
+        <location filename="../View/LateralContribution/translate.py" line="65"/>
         <source>End (m)</source>
         <translation>PK de fin (m)</translation>
     </message>
@@ -1710,18 +1674,13 @@ Some profiles don&apos;t contain any point.</source>
     <message>
         <location filename="../View/LateralContribution/translate.py" line="55"/>
         <source>Shapefile (*.LAT *.lat)</source>
-        <translation type="obsolete">Shapefile (*.LAT *.lat)</translation>
+        <translation>Shapefile (*.LAT *.lat)</translation>
     </message>
     <message>
-        <location filename="../View/LateralContribution/translate.py" line="58"/>
+        <location filename="../View/LateralContribution/translate.py" line="57"/>
         <source>All files (*)</source>
         <translation>Tous les fichiers (*)</translation>
     </message>
-    <message>
-        <location filename="../View/LateralContribution/translate.py" line="55"/>
-        <source>Mage lateral contributions file (*.LAT *.lat)</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LateralContributionAdisTS</name>
@@ -2899,32 +2858,32 @@ Some profiles don&apos;t contain any point.</source>
         <translation>AdisTS</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="758"/>
+        <location filename="../View/ui/MainWindow.ui" line="761"/>
         <source>Output RK</source>
         <translation>Pk de sortie</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="767"/>
+        <location filename="../View/ui/MainWindow.ui" line="770"/>
         <source>Run AdisTS</source>
         <translation>Lancer AdisTS</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="772"/>
+        <location filename="../View/ui/MainWindow.ui" line="775"/>
         <source>Pollutants</source>
         <translation>Polluants</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="777"/>
+        <location filename="../View/ui/MainWindow.ui" line="780"/>
         <source>D90</source>
         <translation>D90</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="782"/>
+        <location filename="../View/ui/MainWindow.ui" line="785"/>
         <source>DIF</source>
         <translation>DIF</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="798"/>
+        <location filename="../View/ui/MainWindow.ui" line="801"/>
         <source>Open results AdisTS</source>
         <translation>Ouvrir des résultats AdisTS</translation>
     </message>
@@ -3049,7 +3008,7 @@ Some profiles don&apos;t contain any point.</source>
         <translation>Non</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="806"/>
+        <location filename="../View/ui/MainWindow.ui" line="809"/>
         <source>Compare results</source>
         <translation>Comparaison de résultats</translation>
     </message>
@@ -3209,7 +3168,7 @@ Some profiles don&apos;t contain any point.</source>
         <translation>Editer l'arbre des scénarios</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="811"/>
+        <location filename="../View/ui/MainWindow.ui" line="814"/>
         <source>GeoTIFF</source>
         <translation>GeoTIFF</translation>
     </message>
@@ -3473,22 +3432,22 @@ Some profiles don&apos;t contain any point.</source>
 <context>
     <name>Results</name>
     <message>
-        <location filename="../View/Results/Window.py" line="362"/>
+        <location filename="../View/Results/Window.py" line="324"/>
         <source>days</source>
         <translation>jours</translation>
     </message>
     <message>
-        <location filename="../View/Results/Window.py" line="363"/>
+        <location filename="../View/Results/Window.py" line="325"/>
         <source>day</source>
         <translation>jour</translation>
     </message>
     <message>
-        <location filename="../View/Results/PlotXY.py" line="81"/>
+        <location filename="../View/Results/PlotXY.py" line="78"/>
         <source>X (m)</source>
         <translation>X (m)</translation>
     </message>
     <message>
-        <location filename="../View/Results/PlotXY.py" line="82"/>
+        <location filename="../View/Results/PlotXY.py" line="79"/>
         <source>Y (m)</source>
         <translation>Y (m)</translation>
     </message>
@@ -3518,7 +3477,7 @@ Some profiles don&apos;t contain any point.</source>
         <translation>Lecture des résultats</translation>
     </message>
     <message>
-        <location filename="../View/Results/translate.py" line="158"/>
+        <location filename="../View/Results/translate.py" line="151"/>
         <source>Water elevation</source>
         <translation>Cote de l'eau</translation>
     </message>
@@ -3528,12 +3487,12 @@ Some profiles don&apos;t contain any point.</source>
         <translation>Cote maximum de l'eau</translation>
     </message>
     <message>
-        <location filename="../View/Results/translate.py" line="68"/>
+        <location filename="../View/Results/translate.py" line="61"/>
         <source>Reach name</source>
         <translation>Nom du bief</translation>
     </message>
     <message>
-        <location filename="../View/Results/translate.py" line="164"/>
+        <location filename="../View/Results/translate.py" line="157"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
@@ -3588,12 +3547,12 @@ Some profiles don&apos;t contain any point.</source>
         <translation>Masse min</translation>
     </message>
     <message>
-        <location filename="../View/Results/translate.py" line="72"/>
+        <location filename="../View/Results/translate.py" line="65"/>
         <source>Variables names</source>
         <translation>Noms des variables</translation>
     </message>
     <message>
-        <location filename="../View/Results/translate.py" line="85"/>
+        <location filename="../View/Results/translate.py" line="78"/>
         <source>Pollutant name</source>
         <translation>Nom des polluants</translation>
     </message>
@@ -3603,7 +3562,7 @@ Some profiles don&apos;t contain any point.</source>
         <translation type="obsolete">enveloppe</translation>
     </message>
     <message>
-        <location filename="../View/Results/translate.py" line="76"/>
+        <location filename="../View/Results/translate.py" line="69"/>
         <source>Profile name</source>
         <translation>Nom du profil</translation>
     </message>
@@ -3632,16 +3591,6 @@ Some profiles don&apos;t contain any point.</source>
         <source>All files (*)</source>
         <translation type="obsolete">Tous les fichiers (*)</translation>
     </message>
-    <message>
-        <location filename="../View/Results/translate.py" line="59"/>
-        <source>An error occured when writing to file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../View/Results/translate.py" line="62"/>
-        <source>If the file is in use, close it and try again</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Scenarios</name>