wolfhece 2.1.10__py3-none-any.whl → 2.1.12__py3-none-any.whl

wolfhece/PyGui.py

@@ -34,22 +34,28 @@ from .CpGrid import CpGrid
 GEOM_GROUP_NAME = _('Block geometry')
 MAGN_GROUP_NAME = _('Magnetic grid')
 
-# FIXME : Is it necessary to override wx.Frame ? WolfMapManager is a wx.Frame.
-#         Is it sufficient to run a wx.App ?
 class GenMapManager(wx.Frame):
-    mapviewer:WolfMapViewer
-    wx_exists:bool
+    """
+    Default class for a Wolf Map Manager.
+
+    Will be overriden by the specific classes MapManager, GPU2DModel, HydrologyModel, Wolf2DModel.
+
+    It is not suitable for direct use.
+
+    """
 
     def __init__(self, *args, **kw):
         # `args` and `kwargs` represent parameters
         # that have to be passed to `wx.Frame.__init__`
 
-        self.mapviewer = None
-        self.wx_exists = wx.App.Get() is not None # test if wx App is running
+        self.mapviewer:WolfMapViewer = None
+        self.wx_exists:bool = wx.App.Get() is not None # test if wx App is running
         self.mylogs=None
 
         if self.wx_exists:
 
+            super().__init__(parent = None)
+
             if len(args) == 0:
                 # FIXME This is hackish. the parent parameter should be passed explicitely.
                 # I do it this way to not have to recheck the whole project
@@ -73,14 +79,13 @@ class GenMapManager(wx.Frame):
                 # Don't pollute the call to wf.Frame.__init__
                 kw.pop(SPLASH_PARAM, None)
 
-            super().__init__(*args)
+            # super().__init__(*args)
             self.mylogs = create_wxlogwindow(_('Informations'))
 
 
-    def setup_mapviewer(self, title, wolfparent):
-        """
-        Setup of a WolfMapViewer
-        """
+    def setup_mapviewer(self, title:str, wolfparent):
+        """ Setup of a WolfMapViewer """
+
         self.mapviewer = WolfMapViewer(None,
                                        title=title,
                                        wolfparent= wolfparent,
@@ -88,60 +93,15 @@ class GenMapManager(wx.Frame):
         self.mapviewer.add_grid()
         self.mapviewer.add_WMS()
 
-    def get_mapviewer(self):
-        # Retourne une instance WolfMapViewer
+    def get_mapviewer(self) -> WolfMapViewer:
+        """ Retourne une instance WolfMapViewer """
+
         return self.mapviewer
 
-    def get_configuration(self):
-        return self._configuration
+    def get_configuration(self) -> WolfConfiguration:
+        """ Retourne la configuration de Wolf """
 
-    # def add_grid(self, tomapviewer:WolfMapViewer=None):
-    #     """ Add a grid to the mapviewer """
-    #     mygrid=Grid(1000.)
-
-    #     if tomapviewer is None:
-    #         tomapviewer = self.mapviewer
-    #     tomapviewer.add_object('vector',newobj=mygrid,ToCheck=False,id='Grid')
-
-    # def add_WMS(self, tomapviewer:WolfMapViewer=None):
-    #     """ Add WMS layers to the mapviewer """
-    #     if tomapviewer is None:
-    #         tomapviewer = self.mapviewer
-
-    #     xmin=0
-    #     xmax=0
-    #     ymin=0
-    #     ymax=0
-    #     orthos={'IMAGERIE':{'1971':'ORTHO_1971','1994-2000':'ORTHO_1994_2000',
-    #                     '2006-2007':'ORTHO_2006_2007',
-    #                     '2009-2010':'ORTHO_2009_2010',
-    #                     '2012-2013':'ORTHO_2012_2013',
-    #                     '2015':'ORTHO_2015','2016':'ORTHO_2016','2017':'ORTHO_2017',
-    #                     '2018':'ORTHO_2018','2019':'ORTHO_2019','2020':'ORTHO_2020',
-    #                     '2021':'ORTHO_2021'}}
-    #     for idx,(k,item) in enumerate(orthos.items()):
-    #         for kdx,(m,subitem) in enumerate(item.items()):
-    #             tomapviewer.add_object(which='wmsback',
-    #                                         newobj=imagetexture('PPNC',m,k,subitem,
-    #                                                             tomapviewer,xmin,xmax,ymin,ymax,-99999,1024),
-    #                                         ToCheck=False,id='PPNC '+m)
-
-    #     tomapviewer.add_object(which='wmsback',
-    #                               newobj=imagetexture('PPNC','Orthos France','OI.OrthoimageCoverage.HR','',
-    #                                                   tomapviewer,xmin,xmax,ymin,ymax,-99999,1024,France=True,epsg='EPSG:27563'),
-    #                                       ToCheck=False,id='Orthos France')
-
-    #     forelist={'EAU':{'Aqualim':'RES_LIMNI_DGARNE','Alea':'ALEA_INOND','Lidaxes':'LIDAXES','Juillet 2021':'ZONES_INONDEES','Juillet 2021 IDW':'ZONES_INONDEES$IDW'},
-    #                 'LIMITES':{'Secteurs Statistiques':'LIMITES_QS_STATBEL'},
-    #                 'INSPIRE':{'Limites administratives':'AU_wms'},
-    #                 'PLAN_REGLEMENT':{'Plan Percellaire':'CADMAP_2021_PARCELLES'}}
-
-    #     for idx,(k,item) in enumerate(forelist.items()):
-    #         for kdx,(m,subitem) in enumerate(item.items()):
-    #             tomapviewer.add_object(which='wmsfore',
-    #                         newobj=imagetexture('PPNC',m,k,subitem,
-    #                         tomapviewer,xmin,xmax,ymin,ymax,-99999,1024),
-    #                         ToCheck=False,id=m)
+        return self._configuration
 
 class MapManager(GenMapManager):
     def __init__(self,*args, **kw):
@@ -155,11 +115,6 @@ class MapManager(GenMapManager):
 
         self.setup_mapviewer(title = 'Wolf - main data manager', wolfparent=self)
 
-        try:
-            self.mylogs.GetFrame().SetIcon(icon)
-        except:
-            logging.error("No icon for the log window")
-
         try:
             self.mapviewer.mytooltip.SetIcon(icon)
         except:
@@ -170,7 +125,14 @@ class MapManager(GenMapManager):
         except:
             logging.error("No icon for the mapviewer window")
 
-        # dir_hydro = join(getcwd(),'data\\hydrometry')
+        if self.wx_exists:
+            try:
+                self.mylogs.GetFrame().SetIcon(icon)
+            except:
+                logging.error("No icon for the log window")
+
+
+        # Set directory for hydrometry data, relative to the current file
         dir_hydro = Path(__file__).parent / "data/hydrometry"
         if not exists(dir_hydro):
             makedirs(dir_hydro, exist_ok=True)
@@ -241,19 +203,6 @@ class GPU2DModel(GenMapManager):
                                   id='res1',
                                   ToCheck=False)
 
-        """self.files_results_array={}
-        self.files_results_array['H']=[]
-        idx=101
-        while path.exists(self.mydir+'//out'+str(idx)+'r.bin'):
-            self.files_results_array['H'].append(['out'+str(idx)+'r.bin','step '+str(idx)])
-            idx+=1
-
-        for curfile in self.files_results_array['H']:
-            curext=curfile[0]
-            curidx=curfile[1]
-            self.allviews.add_object(which='array',filename=self.mydir+'//'+curext,id=curidx,ToCheck=False)
-        """
-
         self.mapviewer.findminmax(True)
         self.mapviewer.Autoscale(False)
 
@@ -1840,6 +1789,14 @@ class Wolf2DModel(GenMapManager):
         if dlg.ShowModal() == wx.ID_OK:
             try:
                 dx, dy = dlg.GetValue().split(',')
+
+                try:
+                    floatdx = float(dx)
+                    floatdy = float(dy)
+                except:
+                    logging.error(_('Invalid fine resolution'))
+                    return
+
                 self.sim.set_mesh_fine_size(float(dx), float(dy))
                 self._show_glob_properties()
             except:

wolfhece/PyPalette.py

@@ -110,14 +110,25 @@ class wolfpalette(wx.Frame,LinearSegmentedColormap):
 
         return self.nb,self.values,self._segmentdata,self.colorsflt
 
-    def distribute_values(self, minval=-99999, maxval=-99999, step=0):
+    def distribute_values(self, minval=-99999, maxval=-99999, step=0, wx_permitted=True):
+        """ Distribution des valeurs de la palette 
+        
+        :param minval: valeur minimale
+        :param maxval: valeur maximale
+        :param step: pas de distribution
 
-        if self.wx_exists:
+        Si le pas est fourni, il prend le dessus sur la valeur maximale.
+
+        """
+
+        if self.wx_exists and wx_permitted:
             if minval==-99999:
                 dlg = wx.TextEntryDialog(None, _('Minimum value'), value = str(self.values[0]))
                 ret = dlg.ShowModal()
                 self.values[0] = dlg.GetValue()
                 dlg.Destroy()
+            else:
+                self.values[0] = minval
 
             if maxval==-99999 and step==0:
 
@@ -134,6 +145,14 @@ class wolfpalette(wx.Frame,LinearSegmentedColormap):
                     ret = dlg.ShowModal()
                     self.values[-1] = float(dlg.GetValue())
                     dlg.Destroy()
+            
+            elif maxval!=-99999:
+                self.values[-1] = maxval
+        else:
+            if minval != -99999:
+                self.values[0] = minval
+            if maxval != -99999:
+                self.values[-1] = maxval
 
         if step==0:
             self.values = np.linspace(self.values[0], self.values[-1], num=self.nb, endpoint=True)[0:self.nb]

wolfhece/apps/version.py

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

wolfhece/mesh2d/wolf2dprev.py

@@ -8457,6 +8457,10 @@ class blocks_file():
     def add_block(self, contour:zone, dx:float, dy:float):
         """Add a block to the list of blocks"""
 
+        if contour is None:
+            logging.error(_('No contour zone available for block creation - Create a contour first'))
+            return
+
         new_block = block_description(self, idx = self.nb_blocks+1)
         new_block.setup(contour, dx, dy)
         self.my_blocks.append(new_block)

wolfhece/models/blue.pal

@@ -1,9 +1,9 @@
 2
 0.0
-0
-0
-255
-10.
-0
-0
-255
+126
+241
+254
+2.0
+2
+2
+198

{wolfhece-2.1.10.dist-info → wolfhece-2.1.12.dist-info}/METADATA

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

{wolfhece-2.1.10.dist-info → wolfhece-2.1.12.dist-info}/RECORD

@@ -7,10 +7,10 @@ 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=eYv0X1NFCWlgOgiRaIjW0SPlR_uVLdZhFpztY1jX6Lo,378408
-wolfhece/PyGui.py,sha256=VKE785z9XLIWNbxqpyEceLK_wtmPJyq6A_M_qX_94Lg,104772
+wolfhece/PyGui.py,sha256=7p4ecrrODTggH8Oz4GTg4rWk6Z3vhYH4GNAE4TL3VY8,102058
 wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
-wolfhece/PyPalette.py,sha256=_Nm2Lc4UxYlZgK8ifZDioG8a0at8oiteYC0x_4XugFc,24384
+wolfhece/PyPalette.py,sha256=Vl5RrBIC_a5-mZKUtBd5kG0mif946B7OtS3fnehkmOc,25012
 wolfhece/PyParams.py,sha256=xUmtwna4rhTCqa3-fpq7bG5pxMpoa4PFRi5hEjxOxPw,96868
 wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
@@ -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=p7F6qFk_CdXhKrAOXaQdIRVqeFmOEFL0SsGEAojsQgo,388
+wolfhece/apps/version.py,sha256=N0uYf8Ph8RZNrkgDZfWNxv4HyEW8y5h7YyQXXAZnSUQ,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
@@ -217,9 +217,9 @@ wolfhece/mesh2d/bc_manager.py,sha256=OzN4NPlDniv9HsLTUQrJkBY6U_a3SkqNpvjIw0TcguI
 wolfhece/mesh2d/cell_tracker.py,sha256=AR-Bty-QnrY1ni8Lwak2kU2UWMAJSBCF2ugl2YpfsB4,8660
 wolfhece/mesh2d/config_manager.py,sha256=qQE5sPbHj9cNZe3uGk1pkuogsS28kJZNx3xybZ6CfCM,14438
 wolfhece/mesh2d/cst_2D_boundary_conditions.py,sha256=cZrHvtfqqTWtUcWnUe9iy9ZY6lAWAJnDoVupV6H7Zw4,4710
-wolfhece/mesh2d/wolf2dprev.py,sha256=55kgOxPucmaFaOYdGVLkBP3ubbQbSe6AO34HTA8Rm-Y,491037
+wolfhece/mesh2d/wolf2dprev.py,sha256=Lbm-Qp4PVEEphOm3AHVwW9BiZQxrab40GYlABaK0-A4,491191
 wolfhece/models/HECE_169.pptx,sha256=OWJtsWz504A-REFaaxw8lwStHyQU2l7KEeiE7IZvtbk,3396930
-wolfhece/models/blue.pal,sha256=NnjJnjnYVdQkG54RyPXvo4Tl9ytB0cN7zpiHtj1N6bw,33
+wolfhece/models/blue.pal,sha256=s9-wEPzSiKMMHuKofUB2FPjmyO7HfGM2xWaUJwsKAY8,39
 wolfhece/models/diff16.pal,sha256=Pkp9kQ1GvmAKz3lgwohsw8eQySjVVKHbjhoWw-gZ6Nc,303
 wolfhece/models/diff3.pal,sha256=qk-yGgJr_FHdW7p7i93GFsH9ClT0dl5nqa9G1lLh7Z0,50
 wolfhece/models/red.pal,sha256=W6oeIjDCoGCsJDZPH2K4jfyfPmCMlH9rfRi4PTs-n28,33
@@ -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.10.dist-info/METADATA,sha256=Zzg2Nmd6IpZTLHVQohBtHfLxq6TwzEOzad-ue6QTJJk,2282
-wolfhece-2.1.10.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-wolfhece-2.1.10.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.10.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.10.dist-info/RECORD,,
+wolfhece-2.1.12.dist-info/METADATA,sha256=7wMYhHxIq5GvX5q_b21FFj0JQcLTWtT8CRXEqvPjXdU,2282
+wolfhece-2.1.12.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+wolfhece-2.1.12.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.1.12.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.12.dist-info/RECORD,,