wolfhece 2.1.45__py3-none-any.whl → 2.1.46__py3-none-any.whl

wolfhece/PyDraw.py

@@ -7508,6 +7508,8 @@ class WolfMapViewer(wx.Frame):
             if self.active_array.nb_blocks > 0:
                 txt += ' ; Nb blocks : {:d}'.format(self.active_array.nb_blocks)
 
+            txt += ' ; Type : ' + self.active_array.dtype_str
+
             self.StatusBar.SetStatusText(txt)
 
 
@@ -8393,6 +8395,8 @@ class WolfMapViewer(wx.Frame):
                     if not altdown:
                         newarray.mask_outsidepoly(self.active_vector)
 
+                    newarray.nullify_border(width=1)
+
                     self.add_object('array', newobj = newarray, id = self.active_array.idx + '_crop')
 
                     self.Refresh()

wolfhece/apps/version.py

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

wolfhece/scenario/config_manager.py

@@ -746,6 +746,7 @@ class Config_Manager_2D_GPU:
                     new_zones.add_zone(new_zone)
 
                     curarray = WolfArray(curtif)
+                    curarray.nullify_border(width=1)
                     sux, sux, curvect, interior = curarray.suxsuy_contour()
                     new_zone.add_vector(curvect, forceparent=True)
                     curvect.set_legend_to_centroid(curtif.name)
@@ -1481,6 +1482,10 @@ class UI_Manager_2D_GPU():
         logging.info(_('Creating vecz ...'))
         mydata = self._treelist.GetItemData(self._selected_item)
 
+        if not 'path' in mydata:
+            logging.error(_('Please select a scenario to analyze !'))
+            return
+
         # création du fichier vrt
         new_zones = self._parent.create_vec(mydata['path'])
         logging.info(_('... done !'))

wolfhece/wolf_array.py

@@ -4613,6 +4613,36 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         return dtype
 
+    @property
+    def dtype_str(self):
+        """
+        Return the numpy dtype corresponding to the WOLF type, as a string
+
+        Pay ettention to the difference between :
+            - LOGICAL : Fortran and VB6
+            - Bool : Python
+
+        In VB6, logical is stored as int16
+        In Fortran, there are Logical*1, Logical*2, Logical*4, Logical*8
+        In Python, bool is one byte
+        In Numpy, np.bool_ is one byte
+        """
+
+        if self.wolftype in [WOLF_ARRAY_FULL_DOUBLE, WOLF_ARRAY_SYM_DOUBLE, WOLF_ARRAY_CSR_DOUBLE]:
+            dtype = _('float64 - 8 bytes poer values')
+        elif self.wolftype in [WOLF_ARRAY_FULL_SINGLE, WOLF_ARRAY_FULL_SINGLE_3D, WOLF_ARRAY_MB_SINGLE]:
+            dtype = _('float32 - 4 bytes per values')
+        elif self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_MB_INTEGER, WOLF_ARRAY_MNAP_INTEGER]:
+            dtype = _('int32 - 4 bytes per values')
+        elif self.wolftype in [WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2]:
+            dtype = _('int16 - 2 bytes per values')
+        elif self.wolftype == WOLF_ARRAY_FULL_INTEGER8:
+            dtype = _('int8 - 1 byte per values')
+        elif self.wolftype == WOLF_ARRAY_FULL_LOGICAL:
+            dtype = _('int16 - 2 bytes per values')
+
+        return dtype
+
     def loadnap_and_apply(self):
         """
         Load a mask file (aka nap) and apply it to the array;
@@ -7940,22 +7970,33 @@ class WolfArray(Element_To_Draw, header_wolf):
 
     def map_values(self, keys_vals:dict, default:float=None):
         """
-        Apply a mapping to the array
+        Mapping array values to new values defined by a dictionnary.
+
+        First, check if all values are in keys_vals. If not, set to default.
+        If default is None, set to nullvalue.
+
+        :param keys_vals: dictionary of values to map
+        :param default: default value if key not found
         """
 
         vals = self.get_unique_values()
 
-        if default is not None:
-            self.array.data[:,:] = default
-
+        def_keys = []
         for val in vals:
             if val not in keys_vals:
-                logging.warning(f"Value {val} not in keys_vals")
+                logging.warning(_(f"Value {val} not in keys_vals -- Will be set to default or NullValue"))
+                def_keys.append(val)
                 continue
 
         for key, val in keys_vals.items():
             self.array.data[self.array.data == key] = val
 
+        if default is None:
+            default = self.nullvalue
+
+        for key in def_keys:
+            self.array.data[self.array.data == key] = default
+
         self.mask_data(self.nullvalue)
 
         self.reset_plot()

{wolfhece-2.1.45.dist-info → wolfhece-2.1.46.dist-info}/METADATA

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

@@ -6,7 +6,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=mMPowIkidxWrEqQwvsFG__HADLjIu-nVRX0ChllpAUA,390687
+wolfhece/PyDraw.py,sha256=t3U7YQwBA5OYh-Pf0tffZCv9Ha9SH3S-XAhFXVOpeBs,390808
 wolfhece/PyGui.py,sha256=aRWv9tBpRl7sKEd2gHWj8Bss0ZOKbGlUYIehWHFm8WY,105008
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -47,7 +47,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=AUSGolqu-YfyQ2SJp5WCMVD1gppvddHULJ3GrUpBjB4,357128
+wolfhece/wolf_array.py,sha256=8UwY94icIbz2BGHtBBdjoia0ijlriJsLcvuJ0Ji-DTg,358915
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=DS5eobLxrq9ljyebYfpMSQPn8shkUAZZVfqrOKN_QUU,16951
 wolfhece/wolf_tiles.py,sha256=2Ho2I20rHRY81KXxjgLOYISdF4OkJ2d6omeY4shDoGI,10386
@@ -71,7 +71,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=ls80i8D7bLwHlLa8Q9f7hPR0HGZE2sGy0sqH0i67EBs,388
+wolfhece/apps/version.py,sha256=NcO4o6jWbzNyEQy_q5jp-nVRYwCMSE9siAWq3vRNszg,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
@@ -254,7 +254,7 @@ wolfhece/report/reporting.py,sha256=JUEXovx_S4jpYkJEBU0AC-1Qw2OkkWyV3VAp6iOfSHc,
 wolfhece/report/wolf_report.png,sha256=NoSV58LSwb-oxCcZScRiJno-kxDwRdm_bK-fiMsKJdA,592485
 wolfhece/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/scenario/check_scenario.py,sha256=w7_SST4n_uec-MUBK36gbJzz2KC8qT_bVJ_VNyp7cMo,4917
-wolfhece/scenario/config_manager.py,sha256=k5wPR58AQk_xSN1uzKR0DjGume26NrbBFZvAbgMIhlc,85287
+wolfhece/scenario/config_manager.py,sha256=UzInaAtxmTLqUaXAHg17iLcUZRGTrPPLsj2D9kBs6wI,85468
 wolfhece/scenario/imposebc_void.py,sha256=PqA_99hKcaqK5zsK6IRIc5Exgg3WVpgWU8xpwNL49zQ,5571
 wolfhece/scenario/update_void.py,sha256=ay8C_FxfXN627Hx46waaAO6F3ovYmOCTxseUumKAY7c,7474
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
@@ -277,8 +277,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.45.dist-info/METADATA,sha256=y63i_CDK02w9EiVXGhd2JlyrM_GCuI0iP7BTQfkmbAw,2488
-wolfhece-2.1.45.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.45.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.45.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.45.dist-info/RECORD,,
+wolfhece-2.1.46.dist-info/METADATA,sha256=Me3fak5XA8FOqijhfnRwcDvv4O8CNe51c17L0oHxDsY,2488
+wolfhece-2.1.46.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+wolfhece-2.1.46.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.46.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.46.dist-info/RECORD,,