wolfhece 2.1.2__py3-none-any.whl → 2.1.5__py3-none-any.whl

wolfhece/PyDraw.py

@@ -3141,7 +3141,7 @@ class WolfMapViewer(wx.Frame):
                     if cur is not self:
                         cur.update()
 
-    def zoom_on_id(self, id:str, draw_type:draw_type = draw_type.ARRAYS, forceupdate=True, canvas_height=1024):
+    def zoom_on_id(self, id:str, drawtype:draw_type = draw_type.ARRAYS, forceupdate=True, canvas_height=1024):
         """
         Zoom on id
 
@@ -3150,19 +3150,19 @@ class WolfMapViewer(wx.Frame):
 
         """
 
-        if draw_type not in [draw_type.ARRAYS, draw_type.VECTORS]:
+        if drawtype not in [draw_type.ARRAYS, draw_type.VECTORS]:
             logging.warning(_('Draw type must be either ARRAYS or VECTORS'))
             return
 
-        obj = self.get_obj_from_id(id, draw_type)
+        obj = self.get_obj_from_id(id, drawtype)
 
         if obj is None:
-            logging.warning(_('No object found with id {} and drawtype {}'.format(id, draw_type)))
+            logging.warning(_('No object found with id {} and drawtype {}'.format(id, drawtype)))
             return
 
-        if draw_type == draw_type.ARRAYS:
+        if drawtype == draw_type.ARRAYS:
             self.zoom_on_array(obj, forceupdate=forceupdate, canvas_height=canvas_height)
-        elif draw_type == draw_type.VECTORS:
+        elif drawtype == draw_type.VECTORS:
             self.zoom_on_vector(obj, forceupdate=forceupdate, canvas_height=canvas_height)
 
     def zoom_on_array(self, array:WolfArray, forceupdate=True, canvas_height=1024):
@@ -6129,11 +6129,11 @@ class WolfMapViewer(wx.Frame):
 
         """
 
-        keys = self.get_list_keys(draw_type, checked_state=None)
+        keys = self.get_list_keys(drawtype, checked_state=None)
         if id.lower() in keys:
             try:
                 idx = keys.index(id.lower())
-                return self.get_list_objects(draw_type, checked_state=None)[idx]
+                return self.get_list_objects(drawtype, checked_state=None)[idx]
             except:
                 return None
 

wolfhece/PyGui.py

@@ -69,8 +69,7 @@ class GenMapManager(wx.Frame):
                 # the garbage collector don't remove it
                 # before us (WolfLauncher has no parent
                 # so it dangles).
-                self._MySplash = WolfLauncher(
-                    play_sound=self._configuration[ConfigurationKeys.PLAY_WELCOME_SOUND])
+                self._MySplash = WolfLauncher(play_sound=self._configuration[ConfigurationKeys.PLAY_WELCOME_SOUND])
                 # Don't pollute the call to wf.Frame.__init__
                 kw.pop(SPLASH_PARAM, None)
 
@@ -148,41 +147,63 @@ class MapManager(GenMapManager):
     def __init__(self,*args, **kw):
         super().__init__(*args, **kw)
 
-        icon = wx.Icon()
-        icon.CopyFromBitmap(wx.Bitmap("wolf_logo.bmp", wx.BITMAP_TYPE_ANY))
-        self.SetIcon(icon)
+        icon = wx.EmptyIcon()
+
+        icon_path = Path(__file__).parent / "apps/wolf_logo.bmp"
+
+        icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
 
         self.setup_mapviewer(title = 'Wolf - main data manager', wolfparent=self)
 
-        dir_hydro = join(getcwd(),'data\\hydrometry')
+        try:
+            self.mylogs.GetFrame().SetIcon(icon)
+        except:
+            logging.error("No icon for the log window")
+
+        try:
+            self.mapviewer.mytooltip.SetIcon(icon)
+        except:
+            logging.error("No icon for the tooltip window")
+
+        try:
+            self.mapviewer.SetIcon(icon)
+        except:
+            logging.error("No icon for the mapviewer window")
+
+        # dir_hydro = join(getcwd(),'data\\hydrometry')
+        dir_hydro = Path(__file__).parent / "data/hydrometry"
         if not exists(dir_hydro):
             makedirs(dir_hydro, exist_ok=True)
 
-        self.SPWhydrometry = hydrometry_wolfgui(dir=dir_hydro, idx = 'SPW hydrometry', mapviewer=self.mapviewer, parent = self, plotted=False)
-        self.picc          = Picc_data(data_dir=Path(r'data/PICC'), mapviewer=self.mapviewer)
-        self.cadaster      = Cadaster_data(data_dir=Path(r'data/Cadaster'), mapviewer=self.mapviewer)
-        self.landmaps      = PlansTerrier(mapviewer=self.mapviewer, parent = self, idx='LandMaps', plotted=True)
-        self.mapviewer.menu_walous()
+        try:
+            self.SPWhydrometry = hydrometry_wolfgui(dir=dir_hydro, idx = 'SPW hydrometry', mapviewer=self.mapviewer, parent = self, plotted=False)
+            self.picc          = Picc_data(data_dir=Path(r'data/PICC'), mapviewer=self.mapviewer)
+            self.cadaster      = Cadaster_data(data_dir=Path(r'data/Cadaster'), mapviewer=self.mapviewer)
+            self.landmaps      = PlansTerrier(mapviewer=self.mapviewer, parent = self, idx='LandMaps', plotted=True)
+
+            self.mapviewer.add_object(which='other',
+                                    newobj=self.SPWhydrometry,
+                                    ToCheck=False,
+                                    id='SPW hydrometry')
+
+            self.mapviewer.add_object(which='other',
+                                    newobj=self.picc,
+                                    ToCheck=False,
+                                    id='PICC data')
+
+            self.mapviewer.add_object(which='other',
+                                    newobj=self.cadaster,
+                                    ToCheck=False,
+                                    id='Cadaster data')
+
+            self.mapviewer.add_object(which='other',
+                                    newobj=self.landmaps,
+                                    ToCheck=False,
+                                    id='Land maps')
+        except:
+            logging.error("Can't load some data (hydrometry, picc, cadaster, landmaps) -- Please check the data directories and/or report the issue")
 
-        self.mapviewer.add_object(which='other',
-                                  newobj=self.SPWhydrometry,
-                                  ToCheck=False,
-                                  id='SPW hydrometry')
-
-        self.mapviewer.add_object(which='other',
-                                  newobj=self.picc,
-                                  ToCheck=False,
-                                  id='PICC data')
-
-        self.mapviewer.add_object(which='other',
-                                  newobj=self.cadaster,
-                                  ToCheck=False,
-                                  id='Cadaster data')
-
-        self.mapviewer.add_object(which='other',
-                                  newobj=self.landmaps,
-                                  ToCheck=False,
-                                  id='Land maps')
+        self.mapviewer.menu_walous()
 
 class GPU2DModel(GenMapManager):
 

wolfhece/apps/splashscreen.py

@@ -25,7 +25,7 @@ class WolfLauncher(SplashScreen):
         mask = wx.Mask(mybitmap, wx.Colour(255,0,204))
         mybitmap.SetMask(mask)
         splash = SPLASH_CENTRE_ON_SCREEN | SPLASH_TIMEOUT
-        duration = 2000 # milliseconds
+        duration = 1000 # milliseconds
 
         # Call the constructor with the above arguments
         # in exactly the following order.

wolfhece/apps/version.py

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

{wolfhece-2.1.2.dist-info → wolfhece-2.1.5.dist-info}/METADATA

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

{wolfhece-2.1.2.dist-info → wolfhece-2.1.5.dist-info}/RECORD

@@ -6,8 +6,8 @@ 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=IOw6MBqsBCgsgmlomqRpPPscb27lapkCx6_tfvnZFh0,376860
-wolfhece/PyGui.py,sha256=TTRvqRiZ0gTaxOfDTMVLFYQ56QvdDMS032fRXcXxvUs,104024
+wolfhece/PyDraw.py,sha256=2pGgV1VwE-zfCiJnrPbJrjKfCG41ARhGTo_sF_kpd-s,376852
+wolfhece/PyGui.py,sha256=vyqeacfPXvMZJXBo5GLn1ZsygA8HhKBeZJR6UCWGVSg,104777
 wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
 wolfhece/PyPalette.py,sha256=_Nm2Lc4UxYlZgK8ifZDioG8a0at8oiteYC0x_4XugFc,24384
@@ -65,8 +65,8 @@ wolfhece/apps/__init__.py,sha256=OzzKItATWV0mDkz_LC2L3w5sgT2rt8ExXXCbR_FwvlY,24
 wolfhece/apps/check_install.py,sha256=jrKR-njqnpIh6ZJqvP6KbDUPVCfwTNQj4glQhcyzs9o,630
 wolfhece/apps/curvedigitizer.py,sha256=avWERHuVxPnJBOD_ibczwW_XG4vAenqWS8W1zjhBox8,4898
 wolfhece/apps/isocurrent.py,sha256=4XnNWPa8mYUK7V4zdDRFrHFIXNG2AN2og3TqWKKcqjY,3811
-wolfhece/apps/splashscreen.py,sha256=m9hMTqzhSUcTudApyNNjoAK9e2u5vgEkJVV79xmfM1s,2118
-wolfhece/apps/version.py,sha256=8FWwKWXkTZJMeOYjVCu-NBqI7zTtYTAJV6YcWW87LJE,387
+wolfhece/apps/splashscreen.py,sha256=LkEVMK0eCc84NeCWD3CGja7fuQ_k1PrZdyqD3GQk_8c,2118
+wolfhece/apps/version.py,sha256=qThNbWPus4Eoal744IqgA9Y2OXgnS7Y9UIsQeVikGzc,387
 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
@@ -264,8 +264,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.2.dist-info/METADATA,sha256=rIXLM3y8Jweh0AI8rdzYq-iDSgIdL7Y53wNqzzRfm-Q,2281
-wolfhece-2.1.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wolfhece-2.1.2.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.2.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.2.dist-info/RECORD,,
+wolfhece-2.1.5.dist-info/METADATA,sha256=kKeoABb_oeKVIscNeEIVN3yTgy83__gUhVILC8tSi90,2281
+wolfhece-2.1.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wolfhece-2.1.5.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.1.5.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.5.dist-info/RECORD,,