src/Meshing/Internal.py

@@ -120,7 +120,6 @@ class InternalMeshing(AMeshingTool):
                 ptr += 1  # next profile, original
                 for k in range(len(reach.profiles[ptr0].points)):
                     p.add()
-                    p.points[k].name = reach.profiles[ptr0].points[k].name
                     p.points[k].x = reach.profiles[ptr0].points[k].x + \
                         dj*(reach.profiles[ptr].points[k].x -
                             reach.profiles[ptr0].points[k].x)
@@ -145,11 +144,19 @@ class InternalMeshing(AMeshingTool):
         # len1 and 2: number of intervals
         # len1: target len
 
-        start1 = sect1.named_point_index(tag1)
-        start2 = sect2.named_point_index(tag1)
+        if tag1 == '':  # left end point
+            start1 = 0
+            start2 = 0
+        else:
+            start1 = sect1.named_point_index(tag1)
+            start2 = sect2.named_point_index(tag1)
 
-        end1 = sect1.named_point_index(tag2)
-        end2 = sect2.named_point_index(tag2)
+        if tag2 == '':  # right end point
+            end1 = sect1.nb_points-1
+            end2 = sect2.nb_points-1
+        else:
+            end1 = sect1.named_point_index(tag2)
+            end2 = sect2.named_point_index(tag2)
 
         len1 = end1 - start1
         len2 = end2 - start2
@@ -185,6 +192,10 @@ class InternalMeshing(AMeshingTool):
             for i in range(len1-len2):
                 p = sect2.point(start2).copy()
                 sect2.insert_point(start2, p)
+                if tag1 == '':  # left end point
+                    sect2.point(start2).name = ''
+                if tag2 == '':  # left end point
+                    sect2.point(start2+1).name = ''
                 len2 += 1
         elif ltot1 < 0.0001:
             sect2.add_npoints(len1-len2)
@@ -248,10 +259,8 @@ class InternalMeshing(AMeshingTool):
                 p = sect2.point(start2+len2).copy()
                 sect2.insert_point(start2+len2, p)
                 sect2.point(start2+len2).name = ''
-        if tag1 != "un":
-            sect2.point(start2).name = tag1
-        if tag2 != "np":
-            sect2.point(start2+len2).name = tag2
+        sect2.point(start2).name = tag1
+        sect2.point(start2+len2).name = tag2
         sect2.modified()
 
     def update_rk(self, reach,

src/View/Results/PlotAC.py

@@ -150,17 +150,8 @@ class PlotAC(PamhyrPlot):
         self.annotation = []
         self.cgl, self.igl = reach.geometry.compute_guidelines()
 
-        # we make sure that the lines are in the left-to-right order
-        lcomplete = [
-            x.name
-            for x in profile.geometry.named_points()
-            if x.name in self.cgl
-        ]
-        lincomplete = [
-            x.name
-            for x in profile.geometry.named_points()
-            if x.name in self.igl
-        ]
+        lcomplete = list(self.cgl)
+        lincomplete = list(self.igl)
 
         self.color_complete_gl = self.colors
         self.color_incomplete_gl = 2 * ["grey"]
@@ -180,7 +171,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(