wolfhece 2.1.108__py3-none-any.whl → 2.1.109__py3-none-any.whl

wolfhece/apps/version.py

@@ -5,7 +5,7 @@ class WolfVersion():
 
         self.major = 2
         self.minor = 1
-        self.patch = 108
+        self.patch = 109
 
     def __str__(self):
 

wolfhece/lazviewer/laz_viewer.py

@@ -23,6 +23,7 @@ from ..PyWMS import getWalonmap
 from ..PyTranslate import _
 from ..color_constants import Colors
 from ..PyParams import Wolf_Param
+from ..matplotlib_fig import Matplotlib_Figure as mplfig
 
 """
 Importation et visualisation de données LAS et LAZ
@@ -620,6 +621,27 @@ class xyz_laz_grids():
 
         return fig,ax
 
+    def plot_laz_wx(self, xy:Union[LineString, list[list[float], list[float]]], length_buffer=5., show=True):
+        """
+        Dessin des points LAZ sur un graphique Matplotlib
+        """
+
+        (up_s, up_z, up_color), (down_s, down_z, down_color) = self.scan_around(xy, length_buffer)
+
+        figmpl = mplfig()
+        figmpl.presets()
+        fig = figmpl.fig
+        ax = figmpl.cur_ax
+
+        logging.info(_('Plotting'))
+        ax.scatter(up_s,   up_z,  c=up_color  ,marker='.')
+        ax.scatter(down_s, down_z,c=down_color,marker='+')
+
+        if show:
+            figmpl.Show()
+
+        return figmpl
+
     def create_from_laz(self, dir_laz:str, shape:str, ds:float = 50, force_format = np.float64):
 
         try:

wolfhece/matplotlib_fig.py

@@ -1053,6 +1053,7 @@ class Matplotlib_Figure(wx.Frame):
         self.ax_dict:dict[str,Axes] = {}    # dict of axes
         self.ax:list[Axes] = []             # list of axes -- always flatten
         self.shown_props = None     # shown properties
+        self._shiftdown = False
 
         self.apply_layout(layout)   # apply the layout
         pass
@@ -1192,6 +1193,7 @@ class Matplotlib_Figure(wx.Frame):
         self._canvas.mpl_connect('motion_notify_event', self.UpdateStatusBar)
         self._canvas.mpl_connect('button_press_event', self.OnClickCanvas)
         self._canvas.mpl_connect('key_press_event', self.OnKeyCanvas)
+        self._canvas.mpl_connect('key_release_event', self.OnKeyRelease)
 
         # Toolbar - Matplotlib
         # --------------------
@@ -1280,6 +1282,9 @@ class Matplotlib_Figure(wx.Frame):
         self._add_row = wx.Button(win, -1, 'Add rows')
         self._add_row.Bind(wx.EVT_BUTTON, self.add_row_to_grid)
 
+        self._new_line = wx.Button(win, -1, 'New line')
+        self._new_line.Bind(wx.EVT_BUTTON, self.onnew_line)
+
         self._add_line = wx.Button(win, -1, 'Add line')
         self._add_line.Bind(wx.EVT_BUTTON, self.onadd_line)
 
@@ -1287,10 +1292,19 @@ class Matplotlib_Figure(wx.Frame):
         self._del_line.Bind(wx.EVT_BUTTON, self.ondel_line)
 
         self._sizer_xls.Add(self._xls, 1, wx.EXPAND)
-        self._sizer_xls.Add(self._update_xy, 0, wx.EXPAND)
-        self._sizer_xls.Add(self._add_row, 0, wx.EXPAND)
-        self._sizer_xls.Add(self._add_line, 0, wx.EXPAND)
-        self._sizer_xls.Add(self._del_line, 0, wx.EXPAND)
+
+        self._sizer_update_add = wx.BoxSizer(wx.HORIZONTAL)
+        self._sizer_add_remove = wx.BoxSizer(wx.HORIZONTAL)
+
+        self._sizer_xls.Add(self._sizer_update_add, 0, wx.EXPAND)
+        self._sizer_xls.Add(self._sizer_add_remove, 0, wx.EXPAND)
+
+        self._sizer_update_add.Add(self._update_xy, 1, wx.EXPAND)
+        self._sizer_update_add.Add(self._add_row, 1, wx.EXPAND)
+
+        self._sizer_add_remove.Add(self._new_line, 1, wx.EXPAND)
+        self._sizer_add_remove.Add(self._add_line, 1, wx.EXPAND)
+        self._sizer_add_remove.Add(self._del_line, 1, wx.EXPAND)
 
         # Properties sizer
         # ---------------
@@ -1519,6 +1533,12 @@ class Matplotlib_Figure(wx.Frame):
 
         if event.key == 'escape':
             self._axes_properties[int(self._ax_current.GetSelection())].reset_selection()
+        elif event.key == 'shift':
+            self._shiftdown = True
+
+    def OnKeyRelease(self, event:KeyEvent):
+        if event.key == 'shift':
+            self._shiftdown = False
 
     def OnClickCanvas(self, event:MouseEvent):
 
@@ -1533,21 +1553,33 @@ class Matplotlib_Figure(wx.Frame):
             idx= ax.get_figure().axes.index(event.inaxes)
             x, y = event.xdata, event.ydata
 
-            dist_min = 1e6
-            line_min = None
+            if rclick and not self._shiftdown:
 
-            for line in ax.get_lines():
-                xy = line.get_xydata()
-                dist = np.linalg.norm(xy - np.array([x,y]), axis=1)
-                idx_min = np.argmin(dist)
-                if dist[idx_min] < dist_min:
-                    dist_min = dist[idx_min]
-                    line_min = line
+                dist_min = 1e6
+                line_min = None
 
-            self._ax_current.SetSelection(idx)
-            self._fill_lines_ax(idx = ax.get_lines().index(line_min))
-            self._axes_properties[idx].select_line(ax.get_lines().index(line_min))
-            self.fill_grid_with_xy(line_min)
+                for line in ax.get_lines():
+                    xy = line.get_xydata()
+                    if xy.shape[0] == 0:
+                        continue
+
+                    dist = np.linalg.norm(xy - np.array([x,y]), axis=1)
+                    idx_min = np.argmin(dist)
+                    if dist[idx_min] < dist_min:
+                        dist_min = dist[idx_min]
+                        line_min = line
+
+                self._ax_current.SetSelection(idx)
+                self._fill_lines_ax(idx = ax.get_lines().index(line_min))
+                self._axes_properties[idx].select_line(ax.get_lines().index(line_min))
+                self.fill_grid_with_xy(line_min)
+
+            if rclick and self._shiftdown:
+                xy = self.cur_line.get_xydata()
+                xy = np.vstack((xy, [x,y]))
+                self.cur_line.set_data(xy[:,0], xy[:,1])
+                self.fill_grid_with_xy(self.cur_line)
+                self._canvas.draw()
 
             self.show_curline_properties()
 
@@ -1609,6 +1641,17 @@ class Matplotlib_Figure(wx.Frame):
         xy = self._get_xy_from_grid(self._xls)
         self.add_line(xy, self.cur_ax)
 
+    def onnew_line(self, event):
+        """ Add a plot to the current ax """
+
+        curline = self.cur_line
+        if curline is not None:
+            xy = curline.get_xydata()
+            xy = np.asarray([[xy[0,0],xy[0,1]]])
+        else:
+            xy = np.asarray([[0,0]])
+        self.add_line(xy, self.cur_ax)
+
     def _get_xy_from_grid(self, grid:CpGrid, colx:int= 0, coly:int= 1):
         """ Get the xy from a grid """
 
@@ -1637,23 +1680,29 @@ class Matplotlib_Figure(wx.Frame):
         cur_ax_prop:Matplotlib_ax_properties = self._axes_properties[idx_ax]
         cur_ax_prop._lines.append(Matplolib_line_properties(ax.get_lines()[-1], cur_ax_prop))
         cur_ax_prop._lines[-1].add_props_to_sizer(self._collaps_pane.GetPane(), self._sizer_grid_props)
+
+        self._fill_lines_ax(len(ax.get_lines())-1)
+
         self.update_layout()
+        self._canvas.SetFocus()
 
     def ondel_line(self, event):
         """ Remove a plot from the current ax """
 
+        if self._line_current.GetSelection() == -1:
+            return
+
         dlg = wx.MessageDialog(self, _('Do you want to remove the selected line?\n\nSuch action is irrevocable !\n\nPlease consider to set "Visible" to "False" to hide data'), _('Remove line'), wx.YES_NO | wx.ICON_QUESTION | wx.NO_DEFAULT)
 
         ret = dlg.ShowModal()
         if ret == wx.ID_NO:
             return
 
-        if self._line_current.GetSelection() == -1:
-            return
-
         idx = self._line_current.GetSelection()
         self.del_line(idx)
 
+        self._fill_lines_ax()
+
     def del_line(self, idx:int):
         """ Delete a line """
 

wolfhece/pybridges.py

@@ -48,10 +48,18 @@ class stored_values_coords(Enum):
     X = (0, 'CoordX')
     Y = (1, 'CoordY')
 
-class zones_in_file(Enum):
+class zones_in_file_fr_vec(Enum):
     PARTS = '3 zones'
     RIVER = 'entier'
-    SECTION = 'section'
+
+class zones_in_file(Enum):
+    PARTS = _('bridge_position')
+    RIVER = _('river')
+    DECK = _('deck')
+    ROOF = _('roof')
+    PIER = _('pier')
+    CROSS_SECTIONS = _('crosssections')
+    EXTRACTION = _('extraction')
 
 class operators(Enum):
     MEDIAN = 'median'
@@ -66,6 +74,16 @@ class parts_values(Enum):
     UPSTREAM    = _('upstream')
     DOWNSTREAM  = _('downstream')
 
+class rivers_values(Enum):
+    RIVERBED     = _('riverbed')
+    LEFTBANK    = _('leftbank')
+    RIGHTBANK  = _('rightbank')
+
+class cs_values(Enum):
+    UPSTREAM   = _('upstream')
+    MIDDLE     = _('middle')
+    DOWNSTREAM = _('downstream')
+
 class Bridge(Zones):
     """
     Bridge class
@@ -105,108 +123,230 @@ class Bridge(Zones):
 
     """
 
+    @classmethod
+    def new_bridge(cls, name:str):
+        """
+        Create a new bridge with name
+        """
+        new_bridge = cls()
+        new_bridge.myname = name
+
+        position = zone(name = zones_in_file.PARTS.value, parent= new_bridge)
+        new_bridge.add_zone(position)
+
+        new_bridge.centralpart = vector(name = parts_values.CENTRAL.value)
+        position.add_vector(new_bridge.centralpart, forceparent=True)
+
+        new_bridge.upstream = vector(name = parts_values.UPSTREAM.value)
+        position.add_vector(new_bridge.upstream, forceparent=True)
+
+        new_bridge.downstream = vector(name = parts_values.DOWNSTREAM.value)
+        position.add_vector(new_bridge.downstream, forceparent=True)
+
+        river = zone(name = zones_in_file.RIVER.value, parent= new_bridge)
+        new_bridge.add_zone(river)
+
+        new_bridge.leftbank = vector(name = rivers_values.LEFTBANK.value)
+        new_bridge.riverbed = vector(name = rivers_values.RIVERBED.value)
+        new_bridge.rightbank = vector(name = rivers_values.RIGHTBANK.value)
+
+        river.add_vector(new_bridge.leftbank, forceparent=True)
+        river.add_vector(new_bridge.riverbed, forceparent=True)
+        river.add_vector(new_bridge.rightbank, forceparent=True)
+
+        new_bridge.add_zone(zone(name = zones_in_file.DECK.value, parent= new_bridge))
+        new_bridge.add_zone(zone(name = zones_in_file.ROOF.value, parent= new_bridge))
+        new_bridge.add_zone(zone(name = zones_in_file.PIER.value, parent= new_bridge))
+        new_bridge.add_zone(zone(name = zones_in_file.CROSS_SECTIONS.value, parent= new_bridge))
+        new_bridge.add_zone(zone(name = zones_in_file.EXTRACTION.value, parent= new_bridge))
+
+        return new_bridge
+
     def __init__(self, myfile='', ds:float=5., ox: float = 0, oy: float = 0, tx: float = 0, ty: float = 0, parent=None, is2D=True, wx_exists:bool = False):
         super().__init__(myfile, ox, oy, tx, ty, parent, is2D, wx_exists)
         self.init_ui()
 
-        self.myname = splitext(basename(myfile))[0]
+        self.centralpart = None
+        self.upstream = None
+        self.downstream = None
 
-        # recherche de la zone du fichier contenant les 3 parties de l'ouvrage
-        curzone = self.get_zone(zones_in_file.PARTS.value)
-        if curzone is None:
-            curzone = self.get_zone(0)
-            curzone.myname = zones_in_file.PARTS.value # on force le nom de la zone pour éviter de refaire le test ailleurs
-        if curzone is None:
-            raise Warning(_('Bad file : {}'.format(myfile)))
+        self.riverbed = None
+        self.leftbank = None
+        self.rightbank = None
 
-        # attribution des vecteurs pour les différentes parties de l'ouvrage
+        self.polygons_zone = None
 
-        self.centralpart       = curzone.get_vector('tablier') # 4 vertices from Upstream Left to Dowstream Left passing by Upstream Right and Downstream Right
-        if self.centralpart is None:
-            self.centralpart       = curzone.get_vector('seuil') # 4 vertices from Upstream Left to Dowstream Left passing by Upstream Right and Downstream Right
+        if myfile != '':
+            self.myname = splitext(basename(myfile))[0]
+            extension = splitext(basename(myfile))[1]
 
-        self.upstream   = curzone.get_vector('amont')   # 4 vertices from Upstream Left Deck  to Upstream Right Deck passing by Upstream Left Bank and Upstream Right Bank
-        self.downstream = curzone.get_vector('aval')    # 4 vertices from Downstream Left Deck Left to Downstream Right Deck passing by Downstream Left Bank and Downstream Right Bank
 
-        xydeck = self.centralpart.asnparray()
+            if extension == '.vec':
 
-        # point central de l'ouvrage
-        self.centerx = np.mean(xydeck[:,0]) # X coordinate of the deck
-        self.centery = np.mean(xydeck[:,1]) # X coordinate of the deck
-        self.curvi = 0                      # s curvilinear coordinate of the deck along a support polyline
+                # recherche de la zone du fichier contenant les 3 parties de l'ouvrage
+                curzone = self.get_zone(zones_in_file_fr_vec.PARTS.value)
+                if curzone is None:
+                    curzone = self.get_zone(0)
+                    curzone.myname = zones_in_file_fr_vec.PARTS.value # on force le nom de la zone pour éviter de refaire le test ailleurs
+                if curzone is None:
+                    raise Warning(_('Bad file : {}'.format(myfile)))
 
-        """
-        Si certaines parties ne sont pas attribuées, il peut s'agir d'une mauvaise appellation.
-        Dans ce cas, on attribue sur base de la position dans la zone
-        """
-        assert curzone.nbvectors==3, _('Bad number of parts')
-
-        if self.centralpart is None:
-            self.centralpart = curzone.get_vector(0)
-        if self.upstream is None:
-            self.upstream = curzone.get_vector(1)
-        if self.downstream is None:
-            self.downstream = curzone.get_vector(2)
-
-        if self.centralpart is None:
-            raise Warning(_('Bad file : {}'.format(myfile)))
-        if self.upstream is None:
-            raise Warning(_('Bad file : {}'.format(myfile)))
-        if self.downstream is None:
-            raise Warning(_('Bad file : {}'.format(myfile)))
-
-        curzone = self.get_zone(zones_in_file.RIVER.value)
-        if curzone is None:
-            curzone = self.get_zone(1)
-            curzone.myname = zones_in_file.RIVER.value # on force le nom de la zone pour éviter de refaire le test ailleurs
-        if curzone is None:
-            raise Warning(_('Bad file : {}'.format(myfile)))
-
-        self.riverbed = curzone.get_vector('parallèle')    # vertices from upstream to downstream
-        if self.riverbed is None:
-            self.riverbed = curzone.get_vector(1)
-        if self.riverbed is None:
-            raise Warning(_('Bad file : {}'.format(myfile)))
-
-        self.riverbed.reverse()
-
-        self.leftbank = curzone.get_vector(2)    # vertices from upstream to downstream
-        if self.leftbank is None:
-            raise Warning(_('Bad file : {}'.format(myfile)))
-
-        self.leftbank.reverse()
-
-        self.rightbank = curzone.get_vector(0)    # vertices from upstream to downstream
-        if self.rightbank is None:
-            raise Warning(_('Bad file : {}'.format(myfile)))
-
-        self.rightbank.reverse()
-
-        curzone.myvectors = [self.leftbank, self.riverbed, self.rightbank] #inverse order to be up -> down
-
-        #création des polygones de rivière
-        curzone.create_polygon_from_parallel(ds)
-        self.polygons_zone:zone
-        self.polygons_zone = self.get_zone(-1)
-        self.polygons_curvi = {}
-        for curvert in self.polygons_zone.myvectors:
-            self.polygons_curvi[curvert.myname] = curvert.myvertices[0].z
+                # attribution des vecteurs pour les différentes parties de l'ouvrage
+
+                self.centralpart       = curzone.get_vector('tablier') # 4 vertices from Upstream Left to Dowstream Left passing by Upstream Right and Downstream Right
+                if self.centralpart is None:
+                    self.centralpart       = curzone.get_vector('seuil') # 4 vertices from Upstream Left to Dowstream Left passing by Upstream Right and Downstream Right
+
+                self.upstream   = curzone.get_vector('amont')   # 4 vertices from Upstream Left Deck  to Upstream Right Deck passing by Upstream Left Bank and Upstream Right Bank
+                self.downstream = curzone.get_vector('aval')    # 4 vertices from Downstream Left Deck Left to Downstream Right Deck passing by Downstream Left Bank and Downstream Right Bank
+
+                xydeck = self.centralpart.asnparray()
+
+                # point central de l'ouvrage
+                self.centerx = np.mean(xydeck[:,0]) # X coordinate of the deck
+                self.centery = np.mean(xydeck[:,1]) # X coordinate of the deck
+                self.curvi = 0                      # s curvilinear coordinate of the deck along a support polyline
+
+                """
+                Si certaines parties ne sont pas attribuées, il peut s'agir d'une mauvaise appellation.
+                Dans ce cas, on attribue sur base de la position dans la zone
+                """
+                assert curzone.nbvectors==3, _('Bad number of parts')
+
+                if self.centralpart is None:
+                    self.centralpart = curzone.get_vector(0)
+                if self.upstream is None:
+                    self.upstream = curzone.get_vector(1)
+                if self.downstream is None:
+                    self.downstream = curzone.get_vector(2)
+
+                if self.centralpart is None:
+                    raise Warning(_('Bad file : {}'.format(myfile)))
+                if self.upstream is None:
+                    raise Warning(_('Bad file : {}'.format(myfile)))
+                if self.downstream is None:
+                    raise Warning(_('Bad file : {}'.format(myfile)))
+
+                curzone = self.get_zone(zones_in_file_fr_vec.RIVER.value)
+                if curzone is None:
+                    curzone = self.get_zone(1)
+                    curzone.myname = zones_in_file_fr_vec.RIVER.value # on force le nom de la zone pour éviter de refaire le test ailleurs
+                if curzone is None:
+                    raise Warning(_('Bad file : {}'.format(myfile)))
 
-        for vec in self.polygons_zone.myvectors:
-            vec.myprop.used=False # cache les polygones pour ne pas surcharger l'affichage éventuel
+                self.riverbed = curzone.get_vector('parallèle')    # vertices from upstream to downstream
+                if self.riverbed is None:
+                    self.riverbed = curzone.get_vector(1)
+                if self.riverbed is None:
+                    raise Warning(_('Bad file : {}'.format(myfile)))
+
+                self.riverbed.reverse()
+
+                self.leftbank = curzone.get_vector(2)    # vertices from upstream to downstream
+                if self.leftbank is None:
+                    raise Warning(_('Bad file : {}'.format(myfile)))
+
+                self.leftbank.reverse()
+
+                self.rightbank = curzone.get_vector(0)    # vertices from upstream to downstream
+                if self.rightbank is None:
+                    raise Warning(_('Bad file : {}'.format(myfile)))
+
+                self.rightbank.reverse()
+
+            elif extension == '.vecz':
+
+                zone_names = [curzone.myname for curzone in self.myzones]
+
+                # test if all zones are present
+                for curkey in zones_in_file:
+                    if curkey.value not in zone_names:
+                        logging.warning(_('Zone {} not found in file {}'.format(curkey.value, myfile)))
+
+
+                if zones_in_file.PARTS.value in zone_names:
+                    # recherche de la zone du fichier contenant les 3 parties de l'ouvrage
+                    curzone = self.get_zone(zones_in_file.PARTS.value)
+
+                    vec_names = [curvec.myname for curvec in curzone.myvectors]
+                    for curkey in parts_values:
+                        if curkey.value not in vec_names:
+                            logging.error(_('Vector {} not found in zone {}'.format(curkey.value, zones_in_file.PARTS.value)))
+
+                    # attribution des vecteurs pour les différentes parties de l'ouvrage
+                    self.centralpart    = curzone.get_vector(parts_values.CENTRAL.value) # 4 vertices from Upstream Left to Dowstream Left passing by Upstream Right and Downstream Right
+                    self.upstream       = curzone.get_vector(parts_values.UPSTREAM.value)   # 4 vertices from Upstream Left Deck  to Upstream Right Deck passing by Upstream Left Bank and Upstream Right Bank
+                    self.downstream     = curzone.get_vector(parts_values.DOWNSTREAM.value)    # 4 vertices from Downstream Left Deck Left to Downstream Right Deck passing by Downstream Left Bank and Downstream Right Bank
+
+                xydeck = self.centralpart.asnparray()
+
+                # point central de l'ouvrage
+                self.centerx = np.mean(xydeck[:,0]) # X coordinate of the deck
+                self.centery = np.mean(xydeck[:,1]) # X coordinate of the deck
+                self.curvi = 0                      # s curvilinear coordinate of the deck along a support polyline
+
+                if self.centralpart is None:
+                    raise Warning(_('Bad file : {}'.format(myfile)))
+                if self.upstream is None:
+                    raise Warning(_('Bad file : {}'.format(myfile)))
+                if self.downstream is None:
+                    raise Warning(_('Bad file : {}'.format(myfile)))
+
+                if zones_in_file.RIVER.value in zone_names:
+                    curzone = self.get_zone(zones_in_file.RIVER.value)
+
+                    self.riverbed = curzone.get_vector(rivers_values.RIVERBED.value)    # vertices from upstream to downstream
+                    self.leftbank = curzone.get_vector(rivers_values.LEFTBANK.value)    # vertices from upstream to downstream
+                    self.rightbank = curzone.get_vector(rivers_values.RIGHTBANK.value)    # vertices from upstream to downstream
+
+                if self.riverbed is None:
+                    raise Warning(_('Bad file : {}'.format(myfile)))
+                if self.leftbank is None:
+                    raise Warning(_('Bad file : {}'.format(myfile)))
+                if self.rightbank is None:
+                    raise Warning(_('Bad file : {}'.format(myfile)))
+
+        self.create_polygon_river(ds)
+        self.force_plot()
+
+        self.colorize()
+
+    def force_plot(self):
 
         vecs = [self.centralpart, self.upstream, self.downstream, self.riverbed, self.leftbank, self.rightbank]
         vec: vector
         for vec in vecs:
-            vec.myprop.used=True
+            if vec is not None:
+                vec.myprop.used=True
 
-        self.colorize()
+    def create_polygon_river(self, ds:float=5.):
+        """ Create river polygons """
+
+        if self.leftbank is not None and self.riverbed is not None and self.rightbank is not None:
+
+            self.polygons_zone = zone(name= "polygons_river")
+            self.add_zone(self.polygons_zone, forceparent=True)
+            self.polygons_zone.myvectors = [self.leftbank, self.riverbed, self.rightbank] #inverse order to be up -> down
+
+            #création des polygones de rivière
+            self.polygons_zone.create_polygon_from_parallel(ds)
+
+            self.polygons_zone = self.get_zone(-1)
+            self.polygons_curvi = {}
+            for curvert in self.polygons_zone.myvectors:
+                self.polygons_curvi[curvert.myname] = curvert.myvertices[0].z
+
+            for vec in self.polygons_zone.myvectors:
+                vec.myprop.used=False # cache les polygones pour ne pas surcharger l'affichage éventuel
 
     def colorize(self):
         """Colorisation des polygones pour l'interface graphique"""
-        self.centralpart.myprop.color = getIfromRGB((0,255,0))
-        self.upstream.myprop.color = getIfromRGB((255,0,0))
-        self.downstream.myprop.color = getIfromRGB((0,0,255))
+
+        if self.centralpart is not None and self.upstream is not None and self.downstream is not None:
+
+            self.centralpart.myprop.color = getIfromRGB((0,255,0))
+            self.upstream.myprop.color = getIfromRGB((255,0,0))
+            self.downstream.myprop.color = getIfromRGB((0,0,255))
 
     def get_distance(self, x:float, y:float):
         """
@@ -260,7 +400,7 @@ class Bridge(Zones):
         ATTENTION : si linked_arrays est un dictionnaire, alors un niveau supérieur est ajouté sur base des clés de ce dictionnaire, dans ce cas, self.linked est un dict et non une liste
 
         """
-        curzone = self.get_zone(zones_in_file.PARTS.value)
+        curzone = self.get_zone(zones_in_file_fr_vec.PARTS.value)
 
         if isinstance(linked_arrays, dict):
 
@@ -1314,8 +1454,8 @@ class Weir(Bridge):
 
     def colorize(self):
         self.centralpart.myprop.color = getIfromRGB((102,102,255))
-        self.upstream.myprop.color = getIfromRGB((255,0,127))
-        self.downstream.myprop.color = getIfromRGB((102,0,204))
+        self.upstream.myprop.color    = getIfromRGB((255,0,127))
+        self.downstream.myprop.color  = getIfromRGB((102,0,204))
 
 class Weirs(Bridges):
 

{wolfhece-2.1.108.dist-info → wolfhece-2.1.109.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wolfhece
-Version: 2.1.108
+Version: 2.1.109
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: Copyright (c) 2024 University of Liege. All rights reserved.
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.108.dist-info → wolfhece-2.1.109.dist-info}/RECORD

@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=Bb1T8qjgKMChadJYDrHO9uo6CwItiAXScZpYkDXqZF8,11387
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=BEMvFAefHqTJx_IPvuowrfS4l-WJyfNKwoqJtvr8-4s,483898
+wolfhece/PyDraw.py,sha256=qlb1ClUTY9yDtPfXTyT6TnbGqhaLiXL3wd3Ri9AePOc,488365
 wolfhece/PyGui.py,sha256=Ceaby7kyTFf-eZQy4b6sI_b6y2ssN37bSGWBqOcb5VM,144145
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -15,8 +15,8 @@ wolfhece/PyPalette.py,sha256=81n1P-olOe4wElTLv-miSDhqvJU_RHcxgfpHt794dSw,31436
 wolfhece/PyParams.py,sha256=GRp1zZDUJIjs8PtjwScDdov-E9orr1JWOntDazN5AOw,98577
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
-wolfhece/PyVertex.py,sha256=0TATf_Se6E7_P-kR1_DMEzRw_zy8-5cGFnc3yAod7yQ,44754
-wolfhece/PyVertexvectors.py,sha256=KH1IDGVsTCFserTEudu3UUxRqzOKpPzBk-LV7vMBHOM,259661
+wolfhece/PyVertex.py,sha256=qFf8UPvkbwumRRfjpBcgZmqpHtcEtIEoUh30rWFF-lQ,45205
+wolfhece/PyVertexvectors.py,sha256=d84gTrFXonYblgaQMJ9N0GcKWOPd85kJPlV_N9FpwuQ,280672
 wolfhece/PyWMS.py,sha256=WmOzHP02wVcB5RGJAlENL_NzF9rYfvLxslRFyxaEt1Q,6615
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -37,12 +37,12 @@ wolfhece/import_ascfiles.py,sha256=6Zl8qBR9c6VtyziookQ8YE9KC0GtW_J9WFt5ubyGp-s,4
 wolfhece/ins.py,sha256=uUeLMS1n3GPnfJhxl0Z2l-UXpmPUgthuwct282OOEzk,36184
 wolfhece/irm_qdf.py,sha256=KyrIk0Gu50Q702EWxRpwKTWI2KGjtHA1l8CL-Y469O0,26394
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
-wolfhece/matplotlib_fig.py,sha256=JM3wmURaBCWXu-pRKzmjCBm05MPYtFqdUdkU3njiLfY,67812
+wolfhece/matplotlib_fig.py,sha256=SRAAOBz8Y2B9Xc9jA6ZLbVaSw_6oAIBR_We_jdvwvIw,69511
 wolfhece/multiprojects.py,sha256=Sd6Bl6YP33jlR79A6rvSLu23vq8sqbFYL8lWuVPkEpE,21549
 wolfhece/picc.py,sha256=0X_pzhSBoVxgtTfJ37pkOQO3Vbr9yurPaD1nVeurx8k,8531
 wolfhece/pidcontroller.py,sha256=PHYenOdzfyPK2pXAhyRolCxMSMRd2AFza0eVMafpPHk,5205
 wolfhece/pyGui1D.py,sha256=9g7OS3YiKsqy--6y0cBD7x2gaqTTYFXWkxImpgnTA20,121937
-wolfhece/pybridges.py,sha256=EU_r6yRYDf5zKmwwXEBsGYvTKFbSfE3iTxPwusKR-1I,57398
+wolfhece/pybridges.py,sha256=pNdtk42QiY4I2XPZJux5VsY3PLEPHPegefziu6n3tO4,64298
 wolfhece/pydike.py,sha256=hPBQsmSTW4QAp1wcOzb-TL3L7eet2WT1sJx2q-WNQ-Q,2241
 wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
 wolfhece/pypolygons_scen.py,sha256=vMfAKXKrW6vKR7l9Fl2hEt-jihLwIiMur7qNTNfwRg4,46101
@@ -80,7 +80,7 @@ wolfhece/apps/curvedigitizer.py,sha256=Yps4bcayzbsz0AoVc_dkSk35dEhhn_esIBy1Ziefg
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=B3V4f-GzEEtG_8tFb-c1Mvk7yh9C0Gr4C-hl8heRIVY,389
+wolfhece/apps/version.py,sha256=8TeUFKF4fnleDiIjOTuhQTBUInamT8Zh5Q7qRDvk2x4,389
 wolfhece/apps/wolf.py,sha256=j_CgvsL8rwixbVvVD5Z0s7m7cHZ86gmFLojKGuetMls,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -154,7 +154,7 @@ wolfhece/lagrangian/particles.py,sha256=S52_-3rzgVhift6l4Gznvsf_RTggzvNaD1dPvQUr
 wolfhece/lagrangian/velocity_field.py,sha256=oGVjNm98gEpawreFIrC1lDyC5bEhkk2CsyYAlF1Kq50,10574
 wolfhece/lazviewer/__init__.py,sha256=lz60EpQOBZ-zjvYzff6Y11jzAmC7mjOaxRYAfoqizQs,473
 wolfhece/lazviewer/_add_path.py,sha256=GDwPnzHuGRXGriDNcu1SQ6HetFDGIApeAQZEzYArGvI,605
-wolfhece/lazviewer/laz_viewer.py,sha256=XQ7vL8NU-igBEFQHSIQjFbKQYnt4sbZ-J6YLmzaxt3s,43426
+wolfhece/lazviewer/laz_viewer.py,sha256=RENRGgW5BYaM97i6a0D5tgqtTswt3bJ7h5LPNqj5QQA,44124
 wolfhece/lazviewer/libs/Qt5Core.dll,sha256=sTJ_ctYFY9KHMNytF-lzH_078zIvnKTjN-71FDkOWPw,4924928
 wolfhece/lazviewer/libs/Qt5Gui.dll,sha256=07BeaOeYByraGkKYeDiSDYLawHM8tyd55pVJlKbZ4Y0,5436416
 wolfhece/lazviewer/libs/Qt5Network.dll,sha256=U-9FiLE9LUKru8r8EQxTnwwlMpwS8JzUtenhkKTCox0,1038336
@@ -293,8 +293,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=8PlMYrb_8jI8h9F0_EagpM
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=ORy7fz4dcp691qKzaOZHrRLZ0uXNhL-LIHxmpDGL6BI,5007
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.108.dist-info/METADATA,sha256=UQSqXkwBsCIxXDUyovyKX-Ild-APC1qGfLJeGmw_llU,2618
-wolfhece-2.1.108.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-wolfhece-2.1.108.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.108.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.108.dist-info/RECORD,,
+wolfhece-2.1.109.dist-info/METADATA,sha256=WNTPztYbROy00T05fggMqd3xndJna-m0pRa9RANfpws,2618
+wolfhece-2.1.109.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+wolfhece-2.1.109.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.109.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.109.dist-info/RECORD,,