wolfhece 2.1.48__py3-none-any.whl → 2.1.50__py3-none-any.whl

wolfhece/PyDraw.py

@@ -6543,6 +6543,8 @@ class WolfMapViewer(wx.Frame):
                 if myobj in curlist:
                     curlist.pop(curlist.index(myobj))
 
+            myobj.hide_properties()
+
     def upobj(self):
 
         """Up selected item into general tree"""

wolfhece/PyVertex.py

@@ -750,7 +750,7 @@ class cloud_vertices(Element_To_Draw):
         import geopandas as gpd
 
         # read data
-        gdf = gpd.read_file(fn, bbox=bbox)
+        gdf:gpd.GeoDataFrame = gpd.read_file(fn, bbox=bbox)
 
         # Bouclage sur les éléments du Shapefile
         if targetcolumn in gdf.columns:
@@ -768,15 +768,17 @@ class cloud_vertices(Element_To_Draw):
 
         elif 'geometry' in gdf.columns:
 
-            k=0
-            for index, row in gdf.iterrows():
+            try:
+                for k, (xx,yy) in enumerate(zip(gdf.get_coordinates()['x'], gdf.get_coordinates()['y'])):
 
-                point = row['geometry']
-                curvert = wolfvertex(point.x, point.y)
-                curdict = self.myvertices[k] = {}
-                curdict['vertex'] = curvert
-                k += 1
+                    curvert = wolfvertex(xx, yy)
+                    curdict = self.myvertices[k] = {}
+                    curdict['vertex'] = curvert
 
+            except Exception as e:
+                logging.error(_('Geometry not found (MultiPoint or Point) -- Please check your shapefile : ')+fn)
+                logging.error(e)
+                return
 
         else:
 

wolfhece/PyVertexvectors.py

@@ -885,6 +885,21 @@ if :\n \
         self.myprops.SetSizeHints(500,800)
         self.myprops.Show()
 
+        self.myprops.SetTitle(_('Vector properties - {}'.format(self.parent.myname)))
+        self.myprops.Center()
+        self.myprops.Raise()
+
+    def show_properties(self):
+        """ Show the properties -- alias of show() """
+
+        self.show()
+
+    def hide_properties(self):
+        """ Hide the properties """
+
+        if self.myprops is not None:
+            self.myprops.Hide()
+
     def _convert_fontname2int(self, fontname:str) -> int:
 
         if fontname.lower() in 'arial.ttf':
@@ -1002,6 +1017,18 @@ class vector:
         if fromshapely is not None:
             self.import_shapelyobj(fromshapely)
 
+    def show_properties(self):
+        """ Show the properties """
+
+        if self.myprop is not None:
+            self.myprop.show()
+
+    def hide_properties(self):
+        """ Hide the properties """
+
+        if self.myprop is not None:
+            self.myprop.hide_properties()
+
     def get_mapviewer(self):
         """ Return the mapviewer """
 
@@ -1652,7 +1679,7 @@ class vector:
             logging.warning(_('No mapviewer available for legend plot'))
             return
 
-        if self.myprop.legendvisible:
+        if self.myprop.legendvisible and self.myprop.used:
 
             self.textimage = Text_Image_Texture(self.myprop.legendtext,
                                                 self.get_mapviewer(), # mapviewer de l'instance Zones qui contient le vecteur
@@ -1671,7 +1698,7 @@ class vector:
             logging.warning(_('No mapviewer available for image plot'))
             return
 
-        if self.myprop.imagevisible:
+        if self.myprop.imagevisible and self.myprop.used:
 
             if self.myprop.textureimage is None:
                 self.myprop.load_unload_image()
@@ -2325,7 +2352,9 @@ class zone:
                  is2D:bool=True,
                  fromshapely:Union[LineString,Polygon,MultiLineString, MultiPolygon]=None) -> None:
 
+        self.myprop = None
         self.myprops = None
+
         self.myname = ''        # name of the zone
         self.idgllist = -99999  # id of the zone in the gllist
         self.active_vector=None # current active vector
@@ -3526,6 +3555,7 @@ class zone:
         """
         Compute statistics on values dict resulting from 'get_values_linked_polygons'
         """
+
         for curpol in vals.values():
             medianlist  =curpol['median'] = []
             meanlist = curpol['mean'] = []
@@ -3570,7 +3600,10 @@ class zone:
                         p95.append(None)
                         p5.append(None)
 
-    def plot_linked_polygons(self, fig:Figure, ax:Axes, linked_arrays:dict, linked_vec:dict[str,"Zones"]=None, linestyle:str='-', onlymedian:bool=False, withtopography:bool = True, ds:float = None):
+    def plot_linked_polygons(self, fig:Figure, ax:Axes,
+                             linked_arrays:dict, linked_vec:dict[str,"Zones"]=None,
+                             linestyle:str='-', onlymedian:bool=False,
+                             withtopography:bool = True, ds:float = None):
         """
         Création d'un graphique sur base des polygones
 
@@ -3591,6 +3624,7 @@ class zone:
         :param ds: pas spatial le long de l'axe
 
         """
+
         colors=['red','blue','green','darkviolet','fuchsia','lime']
 
         #Vérifie qu'au moins une matrice liée est fournie, sinon rien à faire
@@ -3790,16 +3824,19 @@ class zone:
 
     def reset_listogl(self):
         """
-        Reset des liste OpenGL
+        Reset OpenGL lists.
+
+        Force deletion of the OpenGL list.
+        If the object is newly plotted, the lists will be recreated.
         """
+
         if self.idgllist!=-99999:
             glDeleteLists(self.idgllist,1)
             self.idgllist=-99999
 
     def deepcopy_zone(self, name: str =None, parent: str= None):
-        """
-        Return a deep copy of the zone.
-        """
+        """ Return a deep copy of the zone"""
+
         if name is None:
             name =  self.myname + '_copy'
             if parent:
@@ -3817,9 +3854,10 @@ class zone:
     def show_properties(self):
         """ Show properties of the zone --> will be applied to all vectors int he zone """
 
-        locvec = vector()
-        locvec.myprop.show()
-        self.myprops = locvec.myprop.myprops
+        if self.myprops is None:
+            locvec = vector()
+            locvec.show_properties()
+            self.myprops = locvec.myprop.myprops
 
         self.myprops[('Legend','X')] = 99999.
         self.myprops[('Legend','Y')] = 99999.
@@ -3827,11 +3865,31 @@ class zone:
         self.myprops.Populate()
         self.myprops.set_callbacks(self._callback_prop, self._callback_destroy_props)
 
+        self.myprops.SetTitle(_('Zone properties - {}'.format(self.myname)))
+        self.myprops.Center()
+        self.myprops.Raise()
+
+    def hide_properties(self):
+        """ Hide the properties window """
+
+        if self.myprops is not None:
+            # window for general properties
+            self.myprops.Hide()
+
+        for curvect in self.myvectors:
+            curvect.hide_properties()
+
+
     def _callback_destroy_props(self):
+        """ Callback to destroy the properties window """
+
+        if self.myprops is not None:
+            self.myprops.Destroy()
 
         self.myprops = None
 
     def _callback_prop(self):
+        """ Callback to update properties """
 
         if self.myprops is None:
             logging.warning(_('No properties available'))
@@ -3848,6 +3906,7 @@ class zone:
         """
         Set the legend to the centroid of the zone
         """
+
         for curvec in self.myvectors:
             curvec.set_legend_to_centroid()
 
@@ -3914,6 +3973,8 @@ class Zones(wx.Frame, Element_To_Draw):
 
         Element_To_Draw.__init__(self, idx, plotted, mapviewer, need_for_wx)
 
+        self._myprops = None # common properties of all zones
+
         self.loaded=True
 
         self.active_vector:vector = None
@@ -4521,7 +4582,18 @@ class Zones(wx.Frame, Element_To_Draw):
           si parent est d'un autre type, il faut s'assurer que les options/actions sont consistantes
 
         """
-        self.showstructure(parent,forceupdate)
+        self.showstructure(parent, forceupdate)
+
+    def hide_properties(self):
+        """ Hide the properties window """
+
+        self.Hide()
+
+        if self._myprops is not None:
+            self._myprops.Hide()
+
+        for curzone in self.myzones:
+            curzone.hide_properties()
 
     def showstructure(self, parent=None, forceupdate=False):
         """
@@ -4547,6 +4619,8 @@ class Zones(wx.Frame, Element_To_Draw):
                 self.init_ui()
 
             self.Show()
+            self.Center()
+            self.Raise()
 
     def init_ui(self):
         """
@@ -6056,10 +6130,11 @@ class Zones(wx.Frame, Element_To_Draw):
     def _edit_all_properties(self):
         """ Show properties of the zone --> will be applied to all vectors int he zone """
 
-        locvec = vector()
-        locvec.myprop.show()
+        if self._myprops is None:
+            locvec = vector()
+            locvec.show_properties()
 
-        self._myprops = locvec.myprop.myprops
+            self._myprops = locvec.myprop.myprops
 
         self._myprops[('Legend','X')] = 99999.
         self._myprops[('Legend','Y')] = 99999.
@@ -6067,6 +6142,10 @@ class Zones(wx.Frame, Element_To_Draw):
         self._myprops.Populate()
         self._myprops.set_callbacks(self._callback_prop, self._callback_destroy_props)
 
+        self._myprops.SetTitle(_('Properties for all vectors in {}'.format(self.myname)))
+        self._myprops.Center()
+        self._myprops.Raise()
+
 
     def OnRDown(self, event:TreeListEvent):
         """
@@ -6080,7 +6159,7 @@ class Zones(wx.Frame, Element_To_Draw):
                 self._edit_all_properties()
 
             elif isinstance(self.last_active, vector):
-                self.active_vector.myprop.show()
+                self.active_vector.show_properties()
 
             elif isinstance(self.last_active, zone):
                 self.active_zone.show_properties()

wolfhece/apps/version.py

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

wolfhece/drawing_obj.py

@@ -92,6 +92,13 @@ class Element_To_Draw:
         logging.warning('No properties to show for this object !')
         pass
 
+    def hide_properties(self):
+        """
+        Generic function to hide properties of the object
+        """
+        logging.warning('No properties to hide for this object !')
+        pass
+
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """
         Plot data in OpenGL context
@@ -126,5 +133,5 @@ class Element_To_Draw:
         """
         if self.mapviewer is None:
             return False
-        
+
         return self.mapviewer.SetCurrentContext()

wolfhece/wolf_array.py

@@ -2321,6 +2321,15 @@ class Ops_Array(wx.Frame):
 
         self.myzones.showstructure()
 
+    def hide_properties(self):
+        """ Hide the properties panel """
+
+        try:
+            self.myzones.hide_properties()
+            self.Hide()
+        except Exception as e:
+            logging.error('Error in hide_properties : %s' % e)
+
     def OnLoadvec(self, event:wx.MouseEvent):
         """ Load vector file """
 
@@ -4545,6 +4554,15 @@ class WolfArray(Element_To_Draw, header_wolf):
             self.myops.SetTitle(_('Operations on array: ') + self.idx)
             self.myops.Show()
 
+            self.myops.Center()
+            self.myops.Raise()
+
+    def hide_properties(self):
+        """ Hide the properties window """
+
+        if self.wx_exists and self.myops is not None:
+            self.myops.hide_properties()
+
     @property
     def nullvalue(self) -> float:
         """ Return the null value """

{wolfhece-2.1.48.dist-info → wolfhece-2.1.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.48
+Version: 2.1.50
 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.48.dist-info → wolfhece-2.1.50.dist-info}/RECORD

@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=uL1DJVmDI2xVSE7H6n3icn3QbsPtTHeg8E-6wkDloKw,476914
 wolfhece/PyConfig.py,sha256=FB8u0belXOXTb03Ln6RdVWvMgjzi3oGPCmw2dWa3lNg,8332
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=t3U7YQwBA5OYh-Pf0tffZCv9Ha9SH3S-XAhFXVOpeBs,390808
+wolfhece/PyDraw.py,sha256=_Rfx59LMopR0Cx00d1RRF5Gb-WNxfA2v2RjkOfm84Yo,390847
 wolfhece/PyGui.py,sha256=aRWv9tBpRl7sKEd2gHWj8Bss0ZOKbGlUYIehWHFm8WY,105008
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -15,8 +15,8 @@ wolfhece/PyPalette.py,sha256=5TvXF5wWDxP4e70zO9B0UMgVP9c0oAzerM28aoJ1CTg,27982
 wolfhece/PyParams.py,sha256=wwgmP-_7wiiPLTcyX8a5jR6FyC1D2c4oBPc1VWQqtSA,97383
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
-wolfhece/PyVertex.py,sha256=vJ-NbnhPiTuFvDfAF7wfrEzVmladx5Ts0zKsyfySV3Q,40390
-wolfhece/PyVertexvectors.py,sha256=9MT7Qa37dnItmL4ml9O0NUY4SAee2SMWLd2FfL1oMTg,233710
+wolfhece/PyVertex.py,sha256=MtZVjIWIi62QX_oqNosb56xPgjhOGVeGz-XsD82tsNg,40614
+wolfhece/PyVertexvectors.py,sha256=KMXJB_zFi54I73jk_fGtSTxqTQhnCwngeEjJyLdgGDo,235914
 wolfhece/PyWMS.py,sha256=fyyzm2HFwq8aRwVYHKiBatcZOeKnFi6DWhv4nfscySQ,4602
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -27,7 +27,7 @@ wolfhece/__init__.py,sha256=FRDE8PiJAWxX9PMXsShRMZ8YADAY4WIgKMRh52rmhiw,23
 wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
 wolfhece/cli.py,sha256=3S1Hbp2tOl51LwLcloAm1DqV9QuUWJx_Ui_vdKNtGxo,2915
 wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,37121
-wolfhece/drawing_obj.py,sha256=znIQY8dkYhnmoq3mEsVkVzd-hSKDbFY6i8TV-Tf37jM,4040
+wolfhece/drawing_obj.py,sha256=7vY04B6r08nurTTFmBXHyR5tVIF1YzAEw_uz4pqTDIw,4233
 wolfhece/flow_SPWMI.py,sha256=XDAelwAY-3rYOR0WKW3fgYJ_r8DU4IP6Y5xULW421tk,20956
 wolfhece/friction_law.py,sha256=MtZJLo-pTj3-Fw-w12z1LSgSIDrH-JGR0iD9wer_fpQ,5498
 wolfhece/gpuview.py,sha256=0Ld8glEijx5OhMEfcwqvUFEQ5ryRXLnzey3Dff_sn-k,24110
@@ -48,7 +48,7 @@ wolfhece/pywalous.py,sha256=yRaWJjKckXef1d9D5devP0yFHC9uc6kRV4G5x9PNq9k,18972
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=cWkTaA4nY9I8-FLNlXBwn0xkvaN1EXw6M9NYUYnTqf8,368492
+wolfhece/wolf_array.py,sha256=HnrviXNSps9LFDERXyeZmI0L2ovFYY4rBHInPBZLRGw,368994
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=DS5eobLxrq9ljyebYfpMSQPn8shkUAZZVfqrOKN_QUU,16951
 wolfhece/wolf_tiles.py,sha256=2Ho2I20rHRY81KXxjgLOYISdF4OkJ2d6omeY4shDoGI,10386
@@ -72,7 +72,7 @@ wolfhece/apps/check_install.py,sha256=SG024u18G7VRLKynbp7DKD1jImtHwuWwN4bJWHm-YH
 wolfhece/apps/curvedigitizer.py,sha256=_hRR2PWow7PU7rTHIbc6ykZ08tCXcK9uy7RFrb4EKkE,5196
 wolfhece/apps/isocurrent.py,sha256=MuwTodHxdc6PrqNpphR2ntYf1NLL2n9klTPndGrOHDQ,4109
 wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=1j6FkD-S6lKIU8cwsITdvdCE6HZVOxDK9aVtSrdT5Vw,388
+wolfhece/apps/version.py,sha256=3OLK8XkmHW4Hi1ttOxzIDZZILVtXKvYakGuhqG-0N4U,388
 wolfhece/apps/wolf.py,sha256=mM6Tyi4DlKQILmO49cDUCip9fYVy-hLXkY3YhZgIeUQ,591
 wolfhece/apps/wolf2D.py,sha256=yPQGee7fsegoQ8GfWKrWEjX1Az_ApL-UWlBiqPvaIyY,565
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -278,8 +278,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.48.dist-info/METADATA,sha256=2S8MGX7bCP41sSY7a9scSmcsfKj2w8uiaMzIY5bIY9k,2548
-wolfhece-2.1.48.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.48.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.48.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.48.dist-info/RECORD,,
+wolfhece-2.1.50.dist-info/METADATA,sha256=hDyP3-DlayT9vmBCHDj-deR_EczWlyXfofxjPknApok,2548
+wolfhece-2.1.50.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+wolfhece-2.1.50.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.50.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.50.dist-info/RECORD,,