wolfhece 2.1.111__py3-none-any.whl → 2.1.113__py3-none-any.whl

wolfhece/wolf_array.py

@@ -2623,7 +2623,7 @@ class Ops_Array(wx.Frame):
     def OnContourList(self, event:wx.MouseEvent):
         """ Create contour - list of values """
 
-        with wx.TextEntryDialog(None, 'List of specific values separated by comma or tuple (min;max;step)',
+        with wx.TextEntryDialog(None, 'List of specific values separated by comma or tuple (min;max;step)\n\nValues in tuples must be separated by ";"',
                                 'List of values', f'{self.parentarray.array.min()}, {self.parentarray.array.max()}') as dlg:
 
             if dlg.ShowModal() == wx.ID_OK:
@@ -2640,6 +2640,13 @@ class Ops_Array(wx.Frame):
                                 maxval = float(cur[1])
                                 step = float(cur[2])
                                 self._levels.extend(np.arange(minval, maxval, step))
+                            else:
+                                logging.warning('Ignoring tuple with wrong number of values - {}'.format(cur))
+                        else:
+                            try:
+                                self._levels.append(float(cur))
+                            except:
+                                logging.error('Error in chain text to float - {}'.format(cur))
                 elif '(' in txt:
                     cur = txt.replace('(', '').replace(')', '')
                     cur = cur.split(';')
@@ -2648,11 +2655,13 @@ class Ops_Array(wx.Frame):
                         maxval = float(cur[1])
                         step = float(cur[2])
                         self._levels.extend(np.arange(minval, maxval, step))
+                    else:
+                        logging.warning('Ignoring tuple with wrong number of values - {}'.format(cur))
                 else:
                     try:
-                        self._levels = float(txt)
+                        self._levels = [float(txt)]
                     except:
-                        logging.error('Error in chain text to float')
+                        logging.error('Error in chain text to float - {}'.format(txt))
                         return
 
                 if isinstance(self._levels, list):
@@ -3322,7 +3331,10 @@ class SelectionData():
     def nb(self) -> int:
         """ Number of selected nodes """
 
-        return len(self.myselection)
+        if self.myselection == 'all':
+            return self.parent.nbnotnull
+        else:
+            return len(self.myselection)
 
     def Unmasksel(self, resetplot:bool=True):
         """ Unmask selection """
@@ -5190,8 +5202,13 @@ class WolfArray(Element_To_Draw, header_wolf):
         if mapviewer is not None:
             mapviewer.add_object('array', newobj = newarray, ToCheck = True, id = self.idx + '_extracted')
 
-    def crop_array(self, bbox:list[list[float],list[float]]) -> "WolfArray":
-        """ Crop the data based on the bounding box """
+    def crop_array(self, bbox:list[list[float],list[float]], setnull_trx_try:bool = False) -> "WolfArray":
+        """ Crop the data based on the bounding box
+
+        :param bbox: bounding box [[xmin, xmax], [ymin, ymax]]
+        :param setnull_trx_try: set the translation to 0 if True, origx and origy will be set to the lower left corner of the bbox. Default is False
+        """
+
         imin, jmin = self.get_ij_from_xy(bbox[0][0], bbox[1][0])
         imax, jmax = self.get_ij_from_xy(bbox[0][1], bbox[1][1])
 
@@ -5205,12 +5222,16 @@ class WolfArray(Element_To_Draw, header_wolf):
         newheader.nby = jmax-jmin
         newheader.dx  = self.dx
         newheader.dy  = self.dy
-        newheader.origx, newheader.origy = self.get_xy_from_ij(imin, jmin)
+        newheader.origx, newheader.origy = self.get_xy_from_ij(imin, jmin, abs = setnull_trx_try)
         newheader.origx -= self.dx / 2.
         newheader.origy -= self.dy / 2.
         newheader.translx = self.translx
         newheader.transly = self.transly
 
+        if setnull_trx_try:
+            newheader.translx = 0.
+            newheader.transly = 0.
+
         newarray = WolfArray(srcheader=newheader)
 
         newarray.array[:,:] = self.array[imin:imax, jmin:jmax]
@@ -6173,17 +6194,34 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if self.mngselection is None:
             destxy = self.get_xy_inside_polygon(working_vector)
+            if len(destxy)==0:
+                logging.debug(_('No points to interpolate'))
+                return
+
+            destij = self.xy2ij_np(destxy)
+        elif self.mngselection.myselection == 'all':
+            destij = np.where(self.array.mask == False)
+            destij = np.array(destij).transpose()
+
+            if len(destij)==0:
+                logging.debug(_('No points to interpolate'))
+                return
+
+            destxy = self.ij2xy_np(destij)
         else:
             if self.SelectionData.nb == 0:
                 destxy = self.get_xy_inside_polygon(working_vector)
             else:
                 destxy = self.SelectionData.myselection
 
-        if len(destxy)==0:
-            logging.debug(_('No points to interpolate'))
-            return
+            if len(destxy)==0:
+                logging.debug(_('No points to interpolate'))
+                return
+
+            destij = self.xy2ij_np(destxy)
 
-        destij = np.asarray([list(self.get_ij_from_xy(x, y)) for x, y in destxy])
+        # if convert_xy2ij:
+        #     destij = np.asarray([list(self.get_ij_from_xy(x, y)) for x, y in destxy])
 
         xyz = working_vector.asnparray3d()
 
@@ -9414,15 +9452,16 @@ class WolfArray(Element_To_Draw, header_wolf):
         if hasattr(cs, 'collections'):
             # MATPLOTLIB <=3.8
             logging.debug('MATPLOTLIB <=3.8')
-            logging.info(_('DEPRECATED: MATPLOTLIB <=3.8 -- You should consider upgrading to a more recent version of Matplotlib'))
+            logging.debug(_('DEPRECATED: MATPLOTLIB <=3.8 -- You should consider upgrading to a more recent version of Matplotlib'))
+            logging.debug(_('Take care Basemap may not be available in recent versions of mpl_toolkits'))
             for collection, level in zip(cs.collections, cs.levels):
                 zone_level = zone(name=f'Contour {level}')
                 for idx, path in enumerate(collection.get_paths()):
                     vector_level = vector(name=f'Contour {level} - {idx}')
+                    zone_level.add_vector(vector_level, forceparent=True)
                     for vertices in path.to_polygons(closed_only=False):
                         for vertex in vertices:
                             vector_level.add_vertex(wolfvertex(vertex[0], vertex[1]))
-                zone_level.add_vector(vector_level, forceparent=True)
                 zones.add_zone(zone_level, forceparent=True)
         else:
             # MATPLOTLIB >3.8
@@ -9431,9 +9470,9 @@ class WolfArray(Element_To_Draw, header_wolf):
                 zone_level = zone(name=f'Contour {level}')
                 for idx, vertices in enumerate(path.to_polygons(closed_only=False)):
                     vector_level = vector(name=f'Contour {level} - {idx}')
+                    zone_level.add_vector(vector_level, forceparent=True)
                     for vertex in vertices:
                         vector_level.add_vertex(wolfvertex(vertex[0], vertex[1]))
-                zone_level.add_vector(vector_level, forceparent=True)
                 zones.add_zone(zone_level, forceparent=True)
 
         return zones

{wolfhece-2.1.111.dist-info → wolfhece-2.1.113.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wolfhece
-Version: 2.1.111
+Version: 2.1.113
 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
@@ -37,7 +37,7 @@ Requires-Dist: owslib
 Requires-Dist: beautifulsoup4
 Requires-Dist: requests
 Requires-Dist: notebook
-Requires-Dist: matplotlib==3.10.*
+Requires-Dist: matplotlib
 Requires-Dist: mkl
 Requires-Dist: python-gettext
 Requires-Dist: shapely
@@ -61,7 +61,6 @@ Requires-Dist: opencv-python
 Requires-Dist: xarray
 Requires-Dist: rasterio
 Requires-Dist: h5py
-Requires-Dist: basemap
 Requires-Dist: exif
 Requires-Dist: pyglm
 Requires-Dist: mqtt

{wolfhece-2.1.111.dist-info → wolfhece-2.1.113.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=upQGIk2ZZXot6jyPjfbIrommg1AHRvb24q-Rz1dySg0,497162
+wolfhece/PyDraw.py,sha256=4VOvHsdTXUP3C0W4qH1mPtBrO31GS1BTb3aPUgkbTDM,497161
 wolfhece/PyGui.py,sha256=Ceaby7kyTFf-eZQy4b6sI_b6y2ssN37bSGWBqOcb5VM,144145
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -35,7 +35,7 @@ wolfhece/gpuview.py,sha256=Jql8pLZ0PpvZ_ScT-U4jsXANZ9j4-m_RWhsLA2HISuQ,24544
 wolfhece/images_tiles.py,sha256=w5BX6kRqA0wW9TWyKrJUIRl-XyqHclq_kp5ET2VA0Sg,3227
 wolfhece/import_ascfiles.py,sha256=6Zl8qBR9c6VtyziookQ8YE9KC0GtW_J9WFt5ubyGp-s,4465
 wolfhece/ins.py,sha256=uUeLMS1n3GPnfJhxl0Z2l-UXpmPUgthuwct282OOEzk,36184
-wolfhece/irm_qdf.py,sha256=KyrIk0Gu50Q702EWxRpwKTWI2KGjtHA1l8CL-Y469O0,26394
+wolfhece/irm_qdf.py,sha256=DMdDEAYbgYxApObm6w-dZbBmA8ec6PghBLXR2lUEZLc,27457
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
 wolfhece/matplotlib_fig.py,sha256=nWhac23K6eQJGXhDFiakmT52j-QUzlMHQmZ2je56GVE,81119
 wolfhece/multiprojects.py,sha256=Sd6Bl6YP33jlR79A6rvSLu23vq8sqbFYL8lWuVPkEpE,21549
@@ -52,7 +52,7 @@ wolfhece/pywalous.py,sha256=mWB7UxlYMIbPxNUDlONQEjcOOy9VSaRU9aYWZ5IFLu8,19164
 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=8CzabYInhFmOjr-Wwfse5L0Ylx3SsjkUylitOSOm4Oo,424148
+wolfhece/wolf_array.py,sha256=FNUmNOFadluyJNrKgPfC5ImKdWjjN--REFvLwF9zCTA,425937
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=ecoXXmmcLuyG1oPqU2dB_k03qMTCLTVQoSq1xi1EalU,17359
 wolfhece/wolf_tiles.py,sha256=-YfTelZjpfgqZXd1yMsGFajz_oDISXkC0zB5fW-8MBY,10486
@@ -80,7 +80,7 @@ wolfhece/apps/curvedigitizer.py,sha256=lEJJwgAfulrrWQc-U6ij6sj59hWN3SZl4Yu1kQxVz
 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=_E5zp4InRVxGzGtcse3-ynBytT7LFkwOrTupyZusKys,389
+wolfhece/apps/version.py,sha256=4Q7M7OW1D3LcR-3enh9owCZ2qPjYd35kSJ83ScOS9r4,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
@@ -218,7 +218,7 @@ wolfhece/locales/base.po,sha256=meU93yWX-AlU13FlIYnuXNnYsxVB9k4O_QoBQ_h2W1I,1026
 wolfhece/locales/base.pot,sha256=laQ4oYGvdH5IaFtgx6TVjnr28_JX9bdSBZFcGndjuGk,1116
 wolfhece/mar/Interface_MAR_WOLF_objet.py,sha256=_PNOrZDr-7CR19x_XHqLB5Si2hk8e469sYCgv3sTJmk,53791
 wolfhece/mar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/mar/commontools.py,sha256=vCmoNI2sMOco6Y4KPpKb7WORq45qFU_lSxbKGV9oZ8A,53824
+wolfhece/mar/commontools.py,sha256=SiSxpv5BFYEBCEydsE4ZmBuot3KTy0UYMx2aa-4fbuQ,52549
 wolfhece/mar/interface_MAR_WOLF.py,sha256=MWeXaHLDT4Eo9jZOAvz013lmpgGYT1v9VUYGAgBgSRU,21454
 wolfhece/math_parser/__init__.py,sha256=Mi7YTrlJtcflyrRdZHHgE-uNPUFfOWmsf8FsOwKBRPI,27961
 wolfhece/math_parser/calculator.py,sha256=DgRJ5OgEK11Tb24zGvYZXiT3PpCTaXX_0IXxrZkyNIg,7449
@@ -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.111.dist-info/METADATA,sha256=2qEAB6gzSOu-t6WAFWuvDKlIbcjK-CghDSUnaL7E5sA,2619
-wolfhece-2.1.111.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-wolfhece-2.1.111.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.111.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.111.dist-info/RECORD,,
+wolfhece-2.1.113.dist-info/METADATA,sha256=eG28qlf_YmdhD6F_H4PUBB_Pz2HBz2AFZAbiEyVid3w,2587
+wolfhece-2.1.113.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+wolfhece-2.1.113.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.113.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.113.dist-info/RECORD,,