wolfhece 2.1.14__py3-none-any.whl → 2.1.16__py3-none-any.whl

wolfhece/PyDraw.py

@@ -121,7 +121,7 @@ class DragdropFileTarget(wx.FileDropTarget):
             ext = Path(filename).suffix
 
             if ext.lower() in ['.bin', '.npy', '.hbin', '.qxin','.qybin', '.top',
-                               '.kbin', '.epsbin', '.tif', '.frot', '.topini_fine']:
+                               '.kbin', '.epsbin', '.tif', '.tiff', '.frot', '.topini_fine']:
                 return True
             else:
                 return False
@@ -1181,7 +1181,7 @@ class WolfMapViewer(wx.Frame):
         elif itemlabel ==_("Create video..."):
             if self.active_res2d is not None:
                 self.create_video()
-                
+
         elif itemlabel == _("Setup cache..."):
 
             if self.active_res2d is None:
@@ -2139,7 +2139,7 @@ class WolfMapViewer(wx.Frame):
         Récupère un graphique matplotlib sur base de la fenêtre OpenGL et de la palette de la matrice active
         """
         self.zoom_on(center=center, width=width, height= height, canvas_height=self.canvasheight, forceupdate=True)
-        
+
 
         fig,axes = plt.subplots(1,2, gridspec_kw={'width_ratios': [20, 1]})
         self.display_canvasogl(fig=fig,ax=axes[0])
@@ -3421,7 +3421,7 @@ class WolfMapViewer(wx.Frame):
                 for cur in self.linkedList:
                     if cur is not self:
                         cur.update()
-        
+
     def zoom_on_active_profile(self, size:float=500., forceupdate:bool=True):
         """ Zoom on active profile """
 
@@ -4108,7 +4108,7 @@ class WolfMapViewer(wx.Frame):
 
                     figax = self.active_res2d.plot_h(curblock.SelectionData.myselection,
                                                    unknown, toshow=False, figax=figax)
-            if figax is not None:   
+            if figax is not None:
                 fig, ax = figax
                 fig.show()
 
@@ -5684,9 +5684,9 @@ class WolfMapViewer(wx.Frame):
                         newobj.dx = tmpdx
                         newobj.dy = tmpdy
 
-                        if newobj.SelectionData is not None:
-                            newobj.SelectionData.dx = tmpdx
-                            newobj.SelectionData.dy = tmpdy
+                        # if newobj.SelectionData is not None:
+                        #     newobj.SelectionData.dx = tmpdx
+                        #     newobj.SelectionData.dy = tmpdy
 
                         if cropini[0][0] != 99999. and cropini[1][0]!=99999.:
                             newobj.origx = cropini[0][0]
@@ -9001,7 +9001,7 @@ class Compare_Arrays_Results():
             return Comp_Type.RES2D_GPU, file
 
         else:
-            if file.suffix in ('.bin', '.tif', '.npy', '.npz', '.top', '.frott', '.nap', '.hbin', '.hbinb', '.qxbin', '.qxbinb', '.qybin', '.qybinb', '.inf') :
+            if file.suffix in ('.bin', '.tif', '.tiff', '.npy', '.npz', '.top', '.frott', '.nap', '.hbin', '.hbinb', '.qxbin', '.qxbinb', '.qybin', '.qybinb', '.inf') :
 
                 if file.suffix in ('.bin', '.top', '.frott', '.nap', '.hbin', '.hbinb', '.qxbin', '.qxbinb', '.qybin', '.qybinb', '.inf'):
                     if file.with_suffix(file.suffix + '.txt').exists():

wolfhece/apps/version.py

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

wolfhece/scenario/config_manager.py

@@ -1030,8 +1030,8 @@ class Config_Manager_2D_GPU:
             # check for infiltration zones vs hydrograph
             hydro = cursim.infiltrations_chronology
             nb_zones = len(hydro[0][1])
-            if infiltration.array.data.max() != nb_zones:
-                logging.error(_('You must have {} Infiltration zones but {} are defined!'.format(nb_zones, infiltration.array.data.max())))
+            if infiltration.array.max() != nb_zones:
+                logging.error(_('You must have {} Infiltration zones but {} are defined!'.format(nb_zones, infiltration.array.max())))
                 return
 
             # default reporting period
@@ -1815,11 +1815,21 @@ class UI_Manager_2D_GPU():
                             self._txtctrl.write('\t'+curcol)
                         self._txtctrl.write('\n')
 
-                        for idx, curline in hydro._data.iterrows():
-                            self._txtctrl.write(str(idx))
-                            for curval in curline.values:
-                                self._txtctrl.write('\t' + str(curval))
-                            self._txtctrl.write('\n')
+                        if hydro._data.shape[0]>50:
+                            logging.warning(_('Too many lines in the hydrograph -- only the first 50 will be displayed !'))
+
+                            for idx, curline in hydro._data.iloc[:50].iterrows():
+                                self._txtctrl.write(str(idx))
+                                for curval in curline.values:
+                                    self._txtctrl.write('\t' + str(curval))
+                                self._txtctrl.write('\n')
+
+                        else:
+                            for idx, curline in hydro._data.iterrows():
+                                self._txtctrl.write(str(idx))
+                                for curval in curline.values:
+                                    self._txtctrl.write('\t' + str(curval))
+                                self._txtctrl.write('\n')
 
                 except:
                     with open(mydata, 'r', encoding='utf-8') as file:

wolfhece/wolf_array.py

@@ -4700,6 +4700,9 @@ class WolfArray(Element_To_Draw, header_wolf):
                 self.wolftype = WOLF_ARRAY_FULL_SINGLE
             elif self.array.dtype == np.int32:
                 self.wolftype = WOLF_ARRAY_FULL_INTEGER
+            elif self.array.dtype == np.uint8:
+                self.array = self.array.astype(np.int32)
+                self.wolftype = WOLF_ARRAY_FULL_INTEGER8
 
             self.mask_data(self.nullvalue)
 
@@ -6203,7 +6206,7 @@ class WolfArray(Element_To_Draw, header_wolf):
                 logging.warning(_('No data file : ')+self.filename)
             return
 
-        if self.filename.endswith('.tif'):
+        if self.filename.endswith('.tif') or self.filename.endswith('.tiff'):
             self.import_geotif(which= which_band, crop = self.cropini)
             # self.mask_data(self.nullvalue)
             self.loaded = True

{wolfhece-2.1.14.dist-info → wolfhece-2.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.14
+Version: 2.1.16
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: AGPL-v3 License
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.14.dist-info → wolfhece-2.1.16.dist-info}/RECORD

@@ -6,7 +6,7 @@ wolfhece/ManageParams.py,sha256=Wgt5Zh7QBtyiwTAltPHunSLqt4XuVuRH76GTUrXabS4,219
 wolfhece/Model1D.py,sha256=-cMz-ePSYzrKVVDidiDOz6cojEZ3y6u9gIb7RPwT6Y8,476593
 wolfhece/PyConfig.py,sha256=oGSL1WsLM9uinlNP4zGBLK3uHPmBfduUi7R-VtWuRFA,8034
 wolfhece/PyCrosssections.py,sha256=f4dNYRUGZKePruaaBiTcn5vlrw8TFTj9XwTDrdiF_uU,112450
-wolfhece/PyDraw.py,sha256=mwewDF61NQuG4Yh8p5lkla3-h5QxRD7eBBTS4jfEdMM,379576
+wolfhece/PyDraw.py,sha256=Kfu3uoxwP6ZK9LqE5Br-GBex_bSS6k4F3tfsK-qIZvU,379565
 wolfhece/PyGui.py,sha256=fqy8f3tLt7myJskVvspTQ_ZO7kaiSNKmcfFLrfr4w7M,103174
 wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
@@ -48,7 +48,7 @@ wolfhece/rain_SPWMI.py,sha256=YqsF-yFro3y_a6MfVRFfr-Rxi7NR1gl_i8VX7scmzes,13548
 wolfhece/test_Results2DGPU.py,sha256=NOJ_hFXrcLSQXS1dtsqXRQltqIZtDSHMz_EgAJ2_FHU,307
 wolfhece/textpillow.py,sha256=zEfLrKhfCDyMaVuQOUjHqz6MGKeQ4aewMxOsWi5-wKI,13832
 wolfhece/tools_mpl.py,sha256=q8Yc4aukPPiUcEzREvZRM_em67XqXaahdoaNt0DETfE,266
-wolfhece/wolf_array.py,sha256=lUedE9UgJNR7IoGIwixrDWyKICXt0OFXjkgkmMjbZAw,335654
+wolfhece/wolf_array.py,sha256=vf3S7vIdN0ziYtpHSyQRCjwneQCKlGOdCYpZE3xQcLk,335853
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=llQ7aV8scWXIkhpri9XjaPejzoBJsGfsln2ZnlRbFkU,16270
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
@@ -66,7 +66,7 @@ wolfhece/apps/check_install.py,sha256=jrKR-njqnpIh6ZJqvP6KbDUPVCfwTNQj4glQhcyzs9
 wolfhece/apps/curvedigitizer.py,sha256=avWERHuVxPnJBOD_ibczwW_XG4vAenqWS8W1zjhBox8,4898
 wolfhece/apps/isocurrent.py,sha256=4XnNWPa8mYUK7V4zdDRFrHFIXNG2AN2og3TqWKKcqjY,3811
 wolfhece/apps/splashscreen.py,sha256=LkEVMK0eCc84NeCWD3CGja7fuQ_k1PrZdyqD3GQk_8c,2118
-wolfhece/apps/version.py,sha256=iAAc-eeR7zIz-iR6FeTQIhd8wNdBHE1QcClTeElRpg4,388
+wolfhece/apps/version.py,sha256=Au2GSzDykgzYPAppTSSnywndJOLWVYMTR2cNQ5pYAeU,388
 wolfhece/apps/wolf.py,sha256=gqfm-ZaUJqNsfCzmdtemSeqLw-GVdSVix-evg5WArJI,293
 wolfhece/apps/wolf2D.py,sha256=gWD9ee2-1pw_nUxjgRaJMuSe4kUT-RWhOeoTt_Lh1mM,267
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -246,7 +246,7 @@ wolfhece/report/reporting.py,sha256=LrOUI7j1vPefsGhqag1f2KpKRXR-5cH7SyGIsf6nOG0,
 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=nFiCscEGHyz1YvjmZoKlYrfmW03-nLiDTDdRoeE6MUs,4619
-wolfhece/scenario/config_manager.py,sha256=SValpikuNt_XaJXt8P7kAu6iN_N5YlohyL8ry3iT380,77389
+wolfhece/scenario/config_manager.py,sha256=r3E7ZyOewoB_0M-ox3rIZ3-cO_JIbE1zD4b87pPXn6c,77957
 wolfhece/scenario/imposebc_void.py,sha256=pl7c99HQQMQT7i15fDlOOFYCdOtR5c_XIBOveOTOaLc,5273
 wolfhece/scenario/update_void.py,sha256=MmiDiwWHvuk0mpXOlMeB2ImY-d1Wi3Wfmg9hrDTAraE,7176
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
@@ -267,8 +267,8 @@ wolfhece/sounds/sonsw2.wav,sha256=pFLVt6By0_EPQNt_3KfEZ9a1uSuYTgQSX1I_Zurv9Rc,11
 wolfhece/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yGbU_JsF56jsmms0gh7mxa7tbNQ_SxqhpAZxhm-mTy4,14860
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=wCxGRnE3kzEkWlWA6-3X8ADOFux_B0a5QWJ2GnXTgJw,4709
-wolfhece-2.1.14.dist-info/METADATA,sha256=wY1eN44TVbJRXbZOTfGdkZIwii_vMv1Ytyr1a-NOXyE,2282
-wolfhece-2.1.14.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-wolfhece-2.1.14.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.14.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.14.dist-info/RECORD,,
+wolfhece-2.1.16.dist-info/METADATA,sha256=vRdgkIGgAYvpxLhBEtKJH3C_oax5iHhWg1ryYEr1tC4,2282
+wolfhece-2.1.16.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+wolfhece-2.1.16.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.1.16.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.16.dist-info/RECORD,,