wolfhece 2.1.94__py3-none-any.whl → 2.1.95__py3-none-any.whl

wolfhece/apps/version.py

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

wolfhece/scenario/config_manager.py

@@ -49,6 +49,14 @@ try:
 except:
     logging.error(_('WOLFGPU not installed !'))
 
+# *****************
+#  ACCEPTED PREFIX
+# *****************
+# bath_*.tif
+# mann_*.tif
+# infil_*.tif
+
+ACCEPTED_PREFIX = ['bath_', 'mann_', 'infil_']
 
 def delete_folder(pth:Path):
     for sub in pth.iterdir():
@@ -410,6 +418,48 @@ class Config_Manager_2D_GPU:
         _flatten(self.configs, self._flat_configs)
 
 
+    def check_prefix(self, list_tif:list[Path]) -> bool:
+        """ Check if all files have the right prefix """
+
+        logging.info(_('Checking if prefix of all files are right...\n'))
+
+        logging.info(_('Number of tif files : {}'.format(len(list_tif))))
+
+        standard_files = ['bathymetry.tif', 'manning.tif', 'infiltration.tif', 'h.tif', 'qx.tif', 'qy.tif']
+
+        log = ''
+        for curtif in list_tif:
+
+            if curtif.name.lower() in standard_files:
+                # No need to test the prefix
+                break
+
+            # test if the prefix is in the accepted prefix
+            if not any([curtif.name.lower().startswith(curprefix) for curprefix in ACCEPTED_PREFIX]):
+                loclog = _('Bad prefix for {} !'.format(curtif.name)) + '\n'
+
+                tests = ['man_', 'mnn_', 'ann_', 'mamn_', 'mannn_']
+                for test in tests:
+                    if curtif.name.lower().startswith(test):
+                        loclog += _('Did you mean "mann_" ?') + '\n'
+                        break
+
+                tests = ['bath_', 'bth_', 'ath_', 'bat_', 'bathymetry_']
+                for test in tests:
+                    if curtif.name.lower().startswith(test):
+                        loclog += _('Did you mean "bath_" ?') + '\n'
+                        break
+
+                tests = ['infil_', 'infl_', 'nfil_', 'ifil_', 'infiltration_']
+                for test in tests:
+                    if curtif.name.lower().startswith(test):
+                        loclog += _('Did you mean "infil_" ?') + '\n'
+                        break
+
+                logging.warning(loclog)
+
+        return loclog
+
     def check_consistency(self) -> str:
         """
         Check consistency of all files
@@ -657,10 +707,9 @@ class Config_Manager_2D_GPU:
 
         return curdict
 
-    def _select_tif_partname(self, curdict:dict, tifstr:Literal['bath', 'mann']):
-        """ Select tif files with a 'str' in their name """
-
-        tif_list = [curtif for curtif in curdict[GPU_2D_file_extensions.TIF.value] if tifstr in curtif.name]
+    def _select_tif_partname(self, curdict:dict, tifstr:Literal['bath_', 'mann_', 'infil_']):
+        """ Select tif files with a 'str' as name's prefix """
+        tif_list = [curtif for curtif in curdict[GPU_2D_file_extensions.TIF.value] if curtif.name.lower().startswith(tifstr)]
 
         return tif_list
 
@@ -671,9 +720,9 @@ class Config_Manager_2D_GPU:
         curdicts = self.get_dicts(curtree)
 
         # tous les fichiers tif -> list of lists
-        all_tif_bath = [self._select_tif_partname(curdict, 'bath') for curdict in curdicts]
-        all_tif_mann = [self._select_tif_partname(curdict, 'mann') for curdict in curdicts]
-        all_tif_infil = [self._select_tif_partname(curdict, 'infil') for curdict in curdicts]
+        all_tif_bath = [self._select_tif_partname(curdict, 'bath_') for curdict in curdicts]
+        all_tif_mann = [self._select_tif_partname(curdict, 'mann_') for curdict in curdicts]
+        all_tif_infil = [self._select_tif_partname(curdict, 'infil_') for curdict in curdicts]
 
         # flatten list of lists
         all_tif_bath = [curel for curlist in all_tif_bath if len(curlist)>0 for curel in curlist]
@@ -702,9 +751,9 @@ class Config_Manager_2D_GPU:
         curdicts = self.get_dicts(curtree)
 
         # tous les fichiers tif -> list of lists
-        all_tif_bath = [self._select_tif_partname(curdict, 'bath') for curdict in curdicts]
-        all_tif_mann = [self._select_tif_partname(curdict, 'mann') for curdict in curdicts]
-        all_tif_infil = [self._select_tif_partname(curdict, 'infil') for curdict in curdicts]
+        all_tif_bath = [self._select_tif_partname(curdict, 'bath_') for curdict in curdicts]
+        all_tif_mann = [self._select_tif_partname(curdict, 'mann_') for curdict in curdicts]
+        all_tif_infil = [self._select_tif_partname(curdict, 'infil_') for curdict in curdicts]
 
         # flatten list of lists
         all_tif_bath = [curel for curlist in all_tif_bath if len(curlist)>0 for curel in curlist]
@@ -719,10 +768,10 @@ class Config_Manager_2D_GPU:
 
     def create_vec(self,
                    from_path:Path,
-                   which:Literal['bath', 'mann', 'infil'] = 'bath') -> Zones:
+                   which:Literal['bath_', 'mann_', 'infil_'] = 'bath_') -> Zones:
         """ Create a vec file from a path """
 
-        assert which in ['bath', 'mann', 'infil']
+        assert which in ACCEPTED_PREFIX, _('Bad prefix !')
 
         curtree = self.get_tree(from_path)
         curdicts = self.get_dicts(curtree)
@@ -1342,6 +1391,10 @@ class UI_Manager_2D_GPU():
         self._create_vec.Bind(wx.EVT_BUTTON,self.oncreatevec)
         self._create_vec.SetToolTip(_('Create a .vecz file (with contour and global bounds) from all bathymetry and manning .tif files\nBe sure that all files are right named !\n\n - bathymetry must contain "bath"\n - manning must contain "mann"\n - infiltration must contain "infil"'))
 
+        self._check_prefix = wx.Button(self._frame,label = _('Check prefix (tif files)'))
+        self._check_prefix.Bind(wx.EVT_BUTTON,self.oncheck_prefix)
+        self._check_prefix.SetToolTip(_('Check prefix of .tif files\n\n - bath_*.tif\n - mann_*.tif\n - infil_*.tif\n\nThe prefix must be "bath_", "mann_" and "infil_"'))
+
         self._checkconsistency = wx.Button(self._frame,label = _('Check consistency'))
         self._checkconsistency.Bind(wx.EVT_BUTTON,self.oncheck_consistency)
         self._checkconsistency.SetToolTip(_('Check consistency of the scenario\n\n - bathymetry.tif\n - manning.tif\n - infiltration.tif\n - hydrographs\n - initial conditions\n - boundary conditions\n - scripts'))
@@ -1393,6 +1446,7 @@ class UI_Manager_2D_GPU():
         sizer_buttons.Add(self._create_void_scripts,1,wx.EXPAND)
         sizer_buttons.Add(self._create_vrt,1,wx.EXPAND)
         sizer_buttons.Add(self._translate_vrt,1,wx.EXPAND)
+        sizer_buttons.Add(self._check_prefix,1,wx.EXPAND)
         sizer_buttons.Add(self._checkconsistency,1,wx.EXPAND)
         sizer_buttons.Add(self._create_vec,1,wx.EXPAND)
         sizer_buttons.Add(self.listsims,1,wx.EXPAND)
@@ -1548,12 +1602,41 @@ class UI_Manager_2D_GPU():
         """ Traduction d'un fichier vrt en tif """
 
         logging.info(_('Translating vrt to tif ...'))
-        mydata = self._treelist.GetItemData(self._selected_item)
+        if self._selected_item is None or self._selected_item == self._treelist.GetRootItem():
+            logging.info(_('No item selected ! -- using root item'))
+            with wx.MessageDialog(None, _('No item selected ! -- using root item'), _('Warning'), wx.OK | wx.CANCEL | wx.ICON_WARNING) as dlg:
+                ret = dlg.ShowModal()
+                if ret != wx.ID_OK:
+                    return
+            mydata = self._parent.configs
+        else:
+            mydata = self._treelist.GetItemData(self._selected_item)
 
         # création du fichier vrt
         self._parent.translate_vrt2tif(mydata['path'])
         logging.info(_('... done !'))
 
+    def oncheck_prefix(self,e:wx.MouseEvent):
+        """ Vérification des préfixes des fichiers tif """
+
+        logging.info(_('Checking prefix ...'))
+        if self._selected_item is None or self._selected_item == self._treelist.GetRootItem():
+            logging.info(_('No item selected ! -- using root item'))
+            with wx.MessageDialog(None, _('No item selected ! -- using root item'), _('Warning'), wx.OK | wx.CANCEL | wx.ICON_WARNING) as dlg:
+                ret = dlg.ShowModal()
+                if ret != wx.ID_OK:
+                    return
+            mydata = self._parent.configs
+        else:
+            mydata = self._treelist.GetItemData(self._selected_item)
+
+        # création du fichier vrt
+        log = self._parent.check_prefix(mydata['.tif']+mydata['.tiff'])
+        if log =='':
+            self._txtctrl.WriteText(_("All is fine !"))
+        else:
+            self._txtctrl.WriteText(log)
+
     def oncheck_consistency(self,e:wx.MouseEvent):
         """ Vérification de la cohérence des fichiers """
 

{wolfhece-2.1.94.dist-info → wolfhece-2.1.95.dist-info}/METADATA

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

@@ -75,7 +75,7 @@ wolfhece/apps/curvedigitizer.py,sha256=Yps4bcayzbsz0AoVc_dkSk35dEhhn_esIBy1Ziefg
 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=rZi-X4W-8UB0KrenDxLV9h-lnAEpdduh_0hJNqjLsoY,388
+wolfhece/apps/version.py,sha256=r2wcZoRV0_klAhBwCfmfnaBz0LnBxe3grPK6uuy4SXg,388
 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
@@ -262,7 +262,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=VVjtxfcLAgq_Pf8VSqRq6BJ-y4Zi24CntJpZWxAv3n8,5162
-wolfhece/scenario/config_manager.py,sha256=0B_ZtMkcbZRwzkXHwT6jSC3-Lq85P2oBiq1Qxjkfh2w,86869
+wolfhece/scenario/config_manager.py,sha256=aQFqY2aDcKR5r7NIFqjcO1VJngajK_lOE1ZX5LVKKpc,90591
 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
@@ -285,8 +285,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.94.dist-info/METADATA,sha256=7QKX23LbIgX7dd_Qxm_3o1ItJk0-1y0clPJ_xQP3wwU,2570
-wolfhece-2.1.94.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-wolfhece-2.1.94.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.94.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.94.dist-info/RECORD,,
+wolfhece-2.1.95.dist-info/METADATA,sha256=ixt70owejkFtGci4s6dE8uW9md9MKv7CpX-pQj9mOv0,2570
+wolfhece-2.1.95.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+wolfhece-2.1.95.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.95.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.95.dist-info/RECORD,,