wolfhece 2.2.43__py3-none-any.whl → 2.2.44__py3-none-any.whl

wolfhece/PyDraw.py

@@ -101,7 +101,7 @@ except ImportError as e:
     raise ImportError("Error importing wolf_texture, xyz_file, mesh2d, PyPalette, wolfresults_2D, PyTranslate, PyVertex, RatingCurve, wolf_array, PyParams, mesh2d.bc_manager, PyVertexvectors, Results2DGPU, PyCrosssections, GraphNotebook, lazviewer, picc, wolf_zi_db, math_parser.calculator, wintab. Please check your installation.")
 
 try:
-    from .dike import DikeWolf, Wolf_Param_dike
+    from .dike import DikeWolf, InjectorWolf as InjectorDike
 except:
     logging.warning(_("Missing package. Install wolfpydike module via pip."))
 
@@ -620,6 +620,7 @@ class draw_type(Enum):
     DROWNING = 'drowning'
     DIKE = 'dike'
     PICTURECOLLECTION = 'picture_collection'
+    INJECTOR = 'injector'
 
 class Colors_1to9(wx.Frame):
 
@@ -2143,6 +2144,7 @@ class WolfMapViewer(wx.Frame):
     mydrownings: list[Drowning_victim_Viewer]
     mydikes: list[DikeWolf]
     mypicturecollections: list[PictureCollection]
+    myinjectors: list[InjectorDike]
 
     mymplfigs:list[MplFigViewer]
 
@@ -2179,6 +2181,7 @@ class WolfMapViewer(wx.Frame):
     active_laz : Wolf_LAZ_Data
     active_drowning: Drowning_victim_Viewer
     active_dike : DikeWolf
+    active_injector : InjectorDike
     active_picturecollection: PictureCollection
     active_alaro: IRM_Alaro
 
@@ -2622,6 +2625,7 @@ class WolfMapViewer(wx.Frame):
         self.active_weir = None
         self.active_laz = None
         self.active_dike = None
+        self.active_injector = None
         self.active_picturecollection = None
         self.active_qdfidf = None
         self.active_alaro = None
@@ -2689,6 +2693,7 @@ class WolfMapViewer(wx.Frame):
         self.myitemswmsfore = self.treelist.AppendItem(self.root, _("WMS-foreground"))
         self.myitemsdrowning = self.treelist.AppendItem(self.root,_("Drowning"))
         self.myitemsdike    = self.treelist.AppendItem(self.root, _("Dikes"))
+        self.myitemsinjector= self.treelist.AppendItem(self.root, _("Injectors"))
         self.myitemspictcollection = self.treelist.AppendItem(self.root, _("Pictures"))
 
         width, height = self.GetClientSize()
@@ -3766,7 +3771,12 @@ class WolfMapViewer(wx.Frame):
         if self.menudike is None:
             self.menudike = wx.Menu()
 
-            self.menudike_launchsimu = self.menudike.Append(wx.ID_ANY, _("Launch simulation"), _("Launch simulation"))
+            self.menudike_launchsimu = self.menudike.Append(wx.ID_ANY, _("Launch lumped simulation"), _("Launch lumped simulation"))
+
+            self.menudike.AppendSeparator()
+
+            self.menudike_setinjector = self.menudike.Append(wx.ID_ANY, _("Set injector"), _("Set injector"))
+            self.menudike_launch2Dsimu = self.menudike.Append(wx.ID_ANY, _("Launch 2D-coupled simulation"), _("Launch 2D-coupled simulation"))
 
             self.menudike.AppendSeparator()
 
@@ -4305,9 +4315,17 @@ class WolfMapViewer(wx.Frame):
             LEVELS = 1
             BREACHWIDTH = 2
 
-        if itemlabel == _("Launch simulation"):
+        if itemlabel == _("Launch lumped simulation"):
+
+            self.active_dike.run_lumped()
+
+        elif itemlabel == _("Set injector"):
 
-            self.active_dike.run()
+            self.active_dike.set_injector()
+
+        elif itemlabel == _("Launch 2D-coupled simulation"):
+
+            self.active_dike.run_2Dcoupled()
 
         elif itemlabel == _("Show triangulation"):
 
@@ -6165,6 +6183,7 @@ class WolfMapViewer(wx.Frame):
         self.mylazdata = []
         self.mydrownings = []
         self.mydikes = []
+        self.myinjectors = []
         self.mypicturecollections = []
 
         self.mymplfigs = []
@@ -6172,7 +6191,7 @@ class WolfMapViewer(wx.Frame):
         self.sim_explorers = {}
 
         # liste des éléments modifiable dans l'arbre
-        self.all_lists = [self.myarrays, self.myvectors, self.myclouds, self.mytri, self.myothers, self.myviews, self.myres2D, self.mytiles, self.myimagestiles, self.mypartsystems, self.myviewers3d, self.myviewerslaz, self.mydikes, self.mydrownings]
+        self.all_lists = [self.myarrays, self.myvectors, self.myclouds, self.mytri, self.myothers, self.myviews, self.myres2D, self.mytiles, self.myimagestiles, self.mypartsystems, self.myviewers3d, self.myviewerslaz, self.mydikes, self.mydrownings, self.myinjectors]
 
         self.menu_options = wx.Menu()
         self._change_title = self.menu_options.Append(wx.ID_ANY, _('Change title'), _('Change title of the window'))
@@ -10743,7 +10762,7 @@ class WolfMapViewer(wx.Frame):
                     if ret == wx.ID_OK:
                         obj.saveas(fdlg.GetPath())
 
-        if len(self.myarrays) + len(self.myvectors) + len(self.myclouds) + len(self.mytri) + len(self.myres2D) + len(self.mytiles) + len(self.myimagestiles) + len(self.mypartsystems) + len(self.mydikes) + len(self.mydrownings) == 2 or autoscale:
+        if len(self.myarrays) + len(self.myvectors) + len(self.myclouds) + len(self.mytri) + len(self.myres2D) + len(self.mytiles) + len(self.myimagestiles) + len(self.mypartsystems) + len(self.mydikes) + len(self.mydrownings) + len(self.myinjectors) == 2 or autoscale:
             # Trouve les bornes si un seul élément est présent, sinon on conserve l'état du zoom
             self.Autoscale()
 
@@ -11339,6 +11358,7 @@ class WolfMapViewer(wx.Frame):
                                  'drowning',
                                  'imagestiles',
                                  'dike',
+                                 'injector',
                                  'picture_collection'] = 'array',
                    filename='',
                    newobj=None,
@@ -12100,6 +12120,14 @@ class WolfMapViewer(wx.Frame):
             self.mydikes.append(newobj)
             self.active_dike = newobj
 
+        elif which.lower() == 'injector':
+
+            curdict = self.myinjectors
+            curtree = self.myitemsinjector
+
+            self.myinjectors.append(newobj)
+            self.active_injector = newobj
+
         # ID chooser
         if id == '':
             dlg = wx.TextEntryDialog(self, 'ID ? (case insensitive)', 'Choose an identifier', '')
@@ -12304,7 +12332,7 @@ class WolfMapViewer(wx.Frame):
 
         if drawing_type is None:
             # return all_lists
-            return self.myarrays + self.myvectors + self.myclouds + self.mytri + self.mypartsystems + self.myothers + self.myviews + self.myres2D + self.mydikes + self.mydrownings + self.mypicturecollections
+            return self.myarrays + self.myvectors + self.myclouds + self.mytri + self.mypartsystems + self.myothers + self.myviews + self.myres2D + self.mydikes + self.mydrownings + self.myinjectors + self.mypicturecollections
 
         if drawing_type == draw_type.ARRAYS:
             return self.myarrays
@@ -12336,6 +12364,8 @@ class WolfMapViewer(wx.Frame):
             return self.mydrownings
         elif drawing_type == draw_type.DIKE:
             return self.mydikes
+        elif drawing_type == draw_type.INJECTOR:
+            return self.myinjectors
         elif drawing_type == draw_type.PICTURECOLLECTION:
             return self.mypicturecollections
         else:
@@ -12542,6 +12572,9 @@ class WolfMapViewer(wx.Frame):
             elif myobj is self.active_dike:
                 self.active_dike = None
                 self.set_label_selecteditem('')
+            elif myobj is self.active_injector:
+                self.active_injector = None
+                self.set_label_selecteditem('')
 
     def upobj(self):
         """Up selected item into general tree"""
@@ -12674,6 +12707,8 @@ class WolfMapViewer(wx.Frame):
                     self.selected_object.save()
                 elif isinstance(self.selected_object, DikeWolf):
                     self.selected_object.save()
+                elif isinstance(self.selected_object, InjectorDike):
+                    self.selected_object.save()
 
         elif text==_('Up'):
             self.upobj()
@@ -12845,6 +12880,9 @@ class WolfMapViewer(wx.Frame):
                 elif isinstance(self.selected_object, DikeWolf):
                     self.selected_object.save_as()
 
+                elif isinstance(self.selected_object, InjectorDike):
+                    self.selected_object.save_as()
+
                 elif isinstance(self.selected_object, Wolf_LAZ_Data):
                     filterArray = "Dump (*.dump)|*.dmp|all (*.*)|*.*"
                     fdlg = wx.FileDialog(self, "Choose file name for LAZ data :" + self.selected_object.idx, wildcard=filterArray,
@@ -12873,7 +12911,7 @@ class WolfMapViewer(wx.Frame):
         elif text == _('Properties'):
 
             myobj = self.selected_object
-            if type(myobj) in [WolfArray, WolfArrayMB, WolfArrayMNAP, Zones, Wolfresults_2D, wolfres2DGPU, Particle_system, Picc_data, Cadaster_data, hydrometry_wolfgui, Bridge, Weir, Wolf_LAZ_Data, DikeWolf, Drowning_victim_Viewer]:
+            if type(myobj) in [WolfArray, WolfArrayMB, WolfArrayMNAP, Zones, Wolfresults_2D, wolfres2DGPU, Particle_system, Picc_data, Cadaster_data, hydrometry_wolfgui, Bridge, Weir, Wolf_LAZ_Data, DikeWolf, Drowning_victim_Viewer, InjectorDike]:
                 myobj.show_properties()
 
             elif isinstance(myobj, cloud_vertices):
@@ -14426,6 +14464,20 @@ class WolfMapViewer(wx.Frame):
             logging.info(_('Activating Drowning victim event : ' + nameitem))
             self.active_drowning = myobj
 
+        elif type(myobj) == DikeWolf:
+            logging.info(_('Activating DikeWolf : ' + nameitem))
+            self.active_dike = myobj
+            if myobj.injector is not None:
+                self.active_injector = myobj.injector
+                logging.info(_('Activating InjectorDike : ' + nameitem))
+
+            if ctrl:
+                myobj.show_properties()
+
+        elif type(myobj) == InjectorDike:
+            logging.info(_('Activating InjectorDike : ' + nameitem))
+            self.active_injector = myobj
+
             if ctrl:
                 myobj.show_properties()
 
@@ -15974,6 +16026,7 @@ class WolfMapViewer(wx.Frame):
                 self.active_vertex = None
                 self.active_cloud = None
                 self.active_dike = None
+                self.active_injector = None
 
                 self.active_laz = None
 

wolfhece/PyVertexvectors.py

@@ -585,9 +585,9 @@ class Triangulation(Element_To_Draw):
                 if poly.is_valid:
                     polygons.append(poly)
                 else:
-                    logging.warning('Invalid polygon found in triangulation: {}'.format(poly))
+                    logging.debug('Invalid polygon found in triangulation: {}'.format(poly))
             else:
-                logging.warning('Triangle with {} vertices found in triangulation: {}'.format(len(curtri), curtri))
+                logging.error('Triangle with {} vertices found in triangulation: {}'.format(len(curtri), curtri))
         return polygons
 
     def unuse_triangles_containing_points(self, points:list[Point]):
@@ -1883,6 +1883,10 @@ class vector:
         inside2 = poly.contains(Point([x,y]))
         return inside2
 
+    def contains(self, x:float, y:float) -> bool:
+        """ alias for isinside """
+        return self.isinside(x, y)
+
     def asshapely_pol(self) -> Polygon:
         """
         Conversion des coordonnées en Polygon Shapely
@@ -1948,7 +1952,7 @@ class vector:
 
     def prepare_shapely(self, prepare_shapely:bool = True, linestring:bool = True, polygon:bool = True):
         """
-        Conversion Linestring Shapely et rétention de l'objet afin d'éviter de multiples appel
+        Conversion Linestring Shapely et rétention de l'objet afin d'éviter de multiples appels
         par ex. dans une boucle.
 
         :param prepare_shapely: Préparation de l'objet Shapely pour une utilisation optimisée
@@ -2073,6 +2077,15 @@ class vector:
         else:
             return myinter
 
+    def intersects(self, x:float, y:float) -> bool:
+        """ Check if the point (x, y) intersects with the vector. """
+        point = Point(x, y)
+        return self.linestring.intersects(point)
+
+    def aligned_with(self, x:float, y:float, tolerance:float = 1e-6) -> bool:
+        """ Check if the point (x, y) is aligned with the vector. """
+        return self.intersects(x, y) and self.linestring.distance(Point(x, y)) < tolerance
+
     def reset(self):
         """Remise à zéro"""
         self.myvertices=[]
@@ -3127,34 +3140,36 @@ class vector:
 
     def get_s2d(self) -> np.ndarray:
         """
-        calcul et retour des positions curvilignes 2D
+        Calcule et retourne des positions curvilignes 2D
         """
-        s2d=np.zeros(self.nbvertices)
-        for k in range(1,self.nbvertices):
-            s2d[k]=s2d[k-1]+self.myvertices[k-1].dist2D(self.myvertices[k])
+
+        s2d = np.zeros(self.nbvertices)
+        for k in range(1, self.nbvertices):
+            s2d[k] = s2d[k-1] + self.myvertices[k-1].dist2D(self.myvertices[k])
 
         return s2d
 
     def get_s3d(self) -> np.ndarray:
         """
-        calcul et retour des positions curvilignes 3D
+        Calcule et retourne des positions curvilignes 3D
         """
+
         s3d=np.zeros(self.nbvertices)
         for k in range(1,self.nbvertices):
-            s3d[k]=s3d[k-1]+self.myvertices[k-1].dist3D(self.myvertices[k])
+            s3d[k] = s3d[k-1] + self.myvertices[k-1].dist3D(self.myvertices[k])
 
         return s3d
 
     def get_sz(self, cumul=True):
         """
-        Calcule et retourne la distance horizontale cumulée ou non
+        Calcule et retourne la distance horizontale cumulée ou non.
         de chaque point vis-à-vis du premier point
 
         Utile pour le tracé de sections en travers ou des vérifications de position
 
-        :param cumul: si True, retourne la distance cumulée 2D. si False, retourne la distance 2D entre chaque point et le premier.
+        :param cumul: si True, retourne la distance cumulée 2D le long du vecteur. si False, retourne la distance 2D entre chaque point et le premier.
         """
-        z = np.asarray([self.myvertices[i].z for i in range(self.nbvertices)])
+        z = np.asarray([vert.z for vert in self.myvertices])
 
         nb = len(z)
         s = np.zeros(nb)
@@ -3175,6 +3190,11 @@ class vector:
             for i in range(nb):
                 s[i] = self.myvertices[0].dist2D(self.myvertices[i])
 
+        if self.add_sdatum:
+            s += self.sdatum
+        if self.add_zdatum:
+            z += self.zdatum
+
         return s,z
 
     def update_lengths(self):
@@ -3224,6 +3244,9 @@ class vector:
         cums = np.cumsum(lengthparts)
 
         if adim:
+            if length == 0.:
+                logging.warning(_('Length of vector {} is zero, cannot compute segments').format(self.myname))
+
             cums = cums.copy()/length
             cums[-1]=1.
             lengthparts = lengthparts.copy()/length
@@ -3319,9 +3342,16 @@ class vector:
           - en 3D
           - en adimensionnel
         """
-        k,cums,lengthparts=self.get_segment(s,is3D,adim,frombegin)
 
-        pond = (cums-s)/lengthparts[k]
+        if self.length2D is None or self.length3D is None:
+            self.update_lengths()
+
+        if self.length2D == 0.:
+            pond = 0.
+            k = 0
+        else:
+            k,cums,lengthparts=self.get_segment(s,is3D,adim,frombegin)
+            pond = (cums-s)/lengthparts[k]
 
         return wolfvertex(self.myvertices[k].x*pond+self.myvertices[k+1].x*(1.-pond),
                           self.myvertices[k].y*pond+self.myvertices[k+1].y*(1.-pond),
@@ -3333,6 +3363,7 @@ class vector:
         Nom similaire à la même opération dans Shapely mais qui ne gère, elle, que le 2D
         """
         if s1==s2:
+            logging.debug(_('Substring with same start and end abscissa: s1={} s2={}').format(s1, s2))
             s2+=eps
 
         k1,cums1,lengthparts1=self.get_segment(s1,is3D,adim,True)
@@ -3516,10 +3547,15 @@ class vector:
         copied_vector.myvertices = copy.deepcopy(self.myvertices)
         # FIXME : deepcopy of properties is not working
         # copied_vector.myprop = copy.deepcopy(self.myprop)
-        copied_vector.zdatum = self.zdatum
+
         copied_vector.closed = self.closed
+
+        copied_vector.zdatum = self.zdatum
         copied_vector.add_zdatum = self.add_zdatum
 
+        copied_vector.sdatum = self.sdatum
+        copied_vector.add_sdatum = self.add_sdatum
+
         return copied_vector
 
     def deepcopy(self, name: str = None, parentzone = None) -> 'vector':
@@ -4014,7 +4050,7 @@ class vector:
         inside = [self.polygon.contains(Point(curxy)) for curxy in xy]
 
         return inside
-    
+
     def get_first_point_inside(self, xy: cloud_vertices | np.ndarray):
         """
         Returns the first point (x, y) inside the polygon.
@@ -4025,7 +4061,7 @@ class vector:
         :rtype: tuple[float, float] | None
         """
         self.prepare_shapely(True)
-        
+
         if isinstance(xy, cloud_vertices):
             xy = xy.get_xyz()[:, 0:2]
 
@@ -4090,7 +4126,7 @@ class vector:
     def area(self):
         """ Alias for surface """
         return self.surface
-       
+
     def interpolate_coordinates(self):
         """
         Interpole les valeurs Z des vertices sur base des seules valeurs connues,
@@ -4117,6 +4153,12 @@ class vector:
         self.update_lengths()
         self._reset_listogl()
 
+    def __del__(self):
+        """ Destructor """
+        self._reset_listogl()
+        self.reset_linestring()
+
+
 class zone:
     """
     Objet de gestion d'informations vectorielles
@@ -6824,10 +6866,10 @@ class Zones(wx.Frame, Element_To_Draw):
 
         logging.info(_('Importing shapefile {}'.format(fn)))
         content = gpd.read_file(fn, bbox=bbox)
-        
-        self.import_GeoDataFrame(content=content, colname=colname)        
-    
-    
+
+        self.import_GeoDataFrame(content=content, colname=colname)
+
+
     def import_GeoDataFrame(self, content:gpd.GeoDataFrame,
                             bbox:Polygon = None, colname:str = None):
         """

wolfhece/RatingCurve_xml.py

@@ -343,8 +343,13 @@ class StationCurvesGaugings():
         name=m['KISTERSRatingcurve']['Station']['@Name']
 
         periods = m['KISTERSRatingcurve']['Station']['Parameter']['Periods']['Period']
+        if not isinstance(periods, list):
+            periods = [periods]
 
         rc_list  = m['KISTERSRatingcurve']['Station']['Parameter']['Rc']
+        if isinstance(rc_list, dict):
+            rc_list = [rc_list]
+
         rc_names = [cur_rc['@Name'] for cur_rc in rc_list]
 
         for j in range(len(rc_names)-1):
@@ -446,6 +451,15 @@ class StationCurvesGaugings():
             return
 
         doc=pd.read_excel(fichier_xls)
+
+        if doc.iloc[0,0] == 'Date/Heure':
+            # format du fichier Excel avec les colonnes Date/Heure, Hauteur, Débit
+            doc.columns = ['Date/Heure', 'W [m]', 'Q [m³/s]']
+            # pop the first line
+            doc = doc.iloc[1:]
+            # reindex the DataFrame
+            doc.reset_index(drop=True, inplace=True)
+
         for i in range (len(doc[doc.columns[0]])):
             add_jaugeage=Gauging(doc[doc.columns[0]][i], doc[doc.columns[1]][i], doc[doc.columns[2]][i])
             self.gaugings.append(add_jaugeage)
@@ -702,7 +716,7 @@ class StationsCurvesGaugings():
             self.stations[newstation.code.lower()] = newstation
 
         for r in fichiers_excel:
-            station_id = r.split('_')[0].split('\\')[-1]
+            station_id = r.split('_')[-2].split('\\')[-1]
             if station_id in self.stations.keys():
                 self.stations[station_id]._read_gaugings(r)
             else: