wolfhece 2.2.14__py3-none-any.whl → 2.2.16__py3-none-any.whl

wolfhece/Model1D.py

@@ -1860,7 +1860,7 @@ class Creator_1D:
                                 format ='zones',
                                 save_as: str='',
                                 return_list = True) -> list[crosssections]: # FIXME list of cross sections
-        """
+        r"""
         Save each `Zone` in `Zones` as a cross sections file and,
         return a list of cross sections.
 
@@ -2530,7 +2530,7 @@ class Creator_1D:
         return file_path
 
     def count_lists_in_list(self, lst: list[list], nodes_1D = False) -> int:
-        """
+        r"""
         Return the sum of lengths of lists in a list.
             - /!\ Attention for 1D nodes (nodes_1D),
             the number of nodes is the number
@@ -2602,7 +2602,7 @@ class Creator_1D:
     def _write_relations_profiles(self,
                                  crosses:list[list[profile]],
                                  save_as:str) -> None:
-        """
+        r"""
         /!\ Has been deprecated.
 
         - Write the HSPW (Heigh, wetted Section, wetted Perimeter, top Width)relations
@@ -2680,7 +2680,7 @@ class Creator_1D:
     def __write_relations_profiles(self,
                                  crosses:list[list[profile]],
                                  save_as:str) -> None:
-        """
+        r"""
         /!\ Has been deprecated.
 
         - Write the HSPW (Height, wetted Section, wetted Perimeter, top Width)relations
@@ -3285,7 +3285,7 @@ class Creator_1D:
             raise Exception('Define a writing a method!')
 
     def read_hydrograph_from_textfile(self, file:str)-> list[list[list,list]]: # FIXME nameread discharges from
-        """
+        r"""
         Return a hydrograph from a text file.
         /!\ The file should be on the wolf hydrograph format.
 
@@ -3401,7 +3401,7 @@ class Creator_1D:
                              save_as: str,
                              writing_method: Literal['continuous', 'stepwise'] = 'continuous',
                              epsilon:float = 0.01):
-        """
+        r"""
         - Write the infiltration files (.inf, .infil, .tv) and,
         - Apply the preprocessing mode to the hydrographs before writing them.
 
@@ -4201,7 +4201,7 @@ class Creator_1D:
                         raise Exception(_('Bad type of boundary condition.'))
 
     def write_width_file(self, crosses:list[list[profile]], width:float , save_as:str):
-        '''
+        r'''
         Write the width file (.width file).
         - The width is constant for all the profiles
 
@@ -4597,7 +4597,7 @@ class Creator_1D:
         logging.info(f'{directory} removed.')
 
     def find_1D_binary_results(self, directory:str) -> tuple[str]:  #FIXME find why self is not working
-        """
+        r"""
         /!\ This method has been deprecated.
         Return a tuple containing the paths to the model:
 
@@ -4627,7 +4627,7 @@ class Creator_1D:
         return (head_file,results_depths, results_discharges, results_wetted_sections)
 
     def read_1D_binary_results(self, results: list[str]) -> tuple[np.ndarray]:
-        '''
+        r'''
         /!\ This method has been deprecated. Check the the class` Wolfresults_1D` for the new implementation.
         Return a tuple containing the simulated results as numpy arrays in this order:
             - 0. Nodes coordinates (np.ndarray),
@@ -4701,7 +4701,7 @@ class Creator_1D:
                         landmark:Zones = None,
                         banks: Zones = None,
                         dpi: float = Constants.DPI.value ) -> None:
-        """
+        r"""
         /!\ This method has been deprecated. Check the the class` Wolfresults_1D` for the new implementation.
         Plot the results of 1D model either:
             - as a gif  (evolution of all parameters)
@@ -5040,7 +5040,7 @@ class Creator_1D:
                               which_nodes:list[int] = [0,-1],
                               save_as:str ='',
                               figure_size = (20,10)):
-        """
+        r"""
         /!\ This method has been deprecated. Check the the class` Wolfresults_1D` for the new implementation.
 
         Plot the hydrographs of the nodes.
@@ -8907,7 +8907,7 @@ class Wolfresults_1D:
                             figsize:tuple = (20,10),
                             alpha:float = 0.3,
                             save_as:str=''):
-        """
+        r"""
         /!\ Deprecating
         Animate the selected variables in figures, save them as a file and
         return  the information associated with their axes.

wolfhece/PyDraw.py

@@ -92,6 +92,8 @@ try:
     from .math_parser.calculator import Calculator
     from .wintab.wintab import Wintab
     from .images_tiles import ImagesTiles
+    from .PyWMS import Alaro_Navigator, get_Alaro_legend
+
 except ImportError as e:
     print(e)
     raise ImportError("Error importing wolf_texture, xyz_file, mesh2d, PyPalette, wolfresults_2D, PyTranslate, PyVertex, RatingCurve, wolf_array, PyParams, mesh2d.bc_manager, PyVertexvectors, Results2DGPU, PyCrosssections, GraphNotebook, lazviewer, picc, wolf_zi_db, math_parser.calculator, wintab. Please check your installation.")
@@ -996,7 +998,7 @@ class Sim_Explorer(wx.Frame):
             secax.tick_params(axis='x', rotation=30)
 
             ax[1].plot(main_x, self.active_res2d.all_dt, 'o-')
-            ax[1].set_ylabel(_('$\Delta t$ [s]'), fontsize=8)
+            ax[1].set_ylabel(_(r'$\Delta t$ [s]'), fontsize=8)
             ax[1].grid(which='both')
             ax[1].set_xticks(main_x)
             ax[1].set_xticklabels([])
@@ -1956,6 +1958,8 @@ class WolfMapViewer(wx.Frame):
 
     active_fig: MplFigViewer
 
+    alaro_navigator: Alaro_Navigator
+
 
     # def check_user_activity(self, *args):
     #     while True:
@@ -2008,8 +2012,6 @@ class WolfMapViewer(wx.Frame):
         self.treewidth = treewidth
         super(WolfMapViewer, self).__init__(wxparent, title=title, size=(w + self.treewidth, h))
 
-        self._tmp_vector_distance = None  # distance computation the vector
-
         self._wxlogging = wxlogging
         self.action = None  # Action à entreprendre
         self.update_absolute_minmax = False  # Force la MAJ de la palette
@@ -2092,6 +2094,8 @@ class WolfMapViewer(wx.Frame):
         self.menudrowning = None
         self.menudike = None
 
+        self.alaro_navigator = None
+
         self.filemenu = wx.Menu()
         openitem = self.filemenu.Append(wx.ID_OPEN, _('Open/Add project'), _('Open a full project from file'))
         saveproject = self.filemenu.Append(wx.ID_ANY, _('Save project as...'), _('Save the current project to file'))
@@ -2223,6 +2227,10 @@ class WolfMapViewer(wx.Frame):
         self.menu_contour_from_arrays = self.tools_menu.Append(wx.ID_ANY, _("Create contour from checked arrays..."), _("Create contour"))
         self.menu_calculator = self.tools_menu.Append(wx.ID_ANY, _("Calculator..."), _("Calculator"))
         self.menu_views = self.tools_menu.Append(wx.ID_ANY, _("Memory views..."), _("Memory views"))
+
+        self.menu_distances = self.tools_menu.Append(wx.ID_ANY, _("Memory distances..."), _("Memory distances"))
+        self.menu_distances_add = self.tools_menu.Append(wx.ID_ANY, _("Add distances to viewer..."), _("Add memory distances"))
+
         self.menu_digitizer = self.tools_menu.Append(wx.ID_ANY, _("Image digitizer..."), _("Image Digitizer"))
         self.calculator = None
         self.memory_views = None
@@ -2484,6 +2492,10 @@ class WolfMapViewer(wx.Frame):
 
         self.InitUI()
 
+        self._tmp_vector_distance = None  # distance computation the vector
+        self._distances = Zones(mapviewer=self, idx=_('Distances/Areas'))
+        self._distances.add_zone(zone(name='memory distances', parent=self._distances))  # distances memory
+
         # self._wintab = Wintab(self.GetHandle())
 
         # if self._wintab:
@@ -5287,6 +5299,111 @@ class WolfMapViewer(wx.Frame):
                                      '2022': '2022',
                                      }}
 
+        """cat:Literal['orthoimage_coverage',
+                       'orthoimage_coverage_2016',
+                       'orthoimage_coverage_2017',
+                       'orthoimage_coverage_2018',
+                       'orthoimage_coverage_2019',
+                       'orthoimage_coverage_2020',
+                       'orthoimage_coverage_2021',
+                       'orthoimage_coverage_2022']
+        """
+        ign_belgique = {'Orthophotos': {'Last': 'orthoimage_coverage',
+                                        '2016': 'orthoimage_coverage_2016',
+                                        '2017': 'orthoimage_coverage_2017',
+                                        '2018': 'orthoimage_coverage_2018',
+                                        '2019': 'orthoimage_coverage_2019',
+                                        '2020': 'orthoimage_coverage_2020',
+                                        '2021': 'orthoimage_coverage_2021',
+                                        '2022': 'orthoimage_coverage_2022',}}
+
+        """ ['crossborder',
+                            'crossborder_grey',
+                            'overlay',
+                            'topo',
+                            'topo_grey']"""
+        ign_cartoweb = {'CartoWeb': {'Crossborder': 'crossborder',
+                                    'Crossborder Grey': 'crossborder_grey',
+                                    'Overlay': 'overlay',
+                                    'Topographic': 'topo',
+                                    'Topographic Grey': 'topo_grey',}}
+
+        ign_postflood2021 = {'PostFlood2021': {'Flood 2021': 'orthoimage_flood'}}
+
+        """
+        ['10_m_u__wind_component',
+        '10_m_v__wind_component',
+        '2_m_Max_temp_since_ppp',
+        '2_m_Min_temp_since_ppp',
+        '2_m_dewpoint_temperature',
+        '2_m_temperature',
+        '2m_Relative_humidity',
+        'Convective_rain',
+        'Convective_snow',
+        'Geopotential',
+        'Inst_flx_Conv_Cld_Cover',
+        'Inst_flx_High_Cld_Cover',
+        'Inst_flx_Low_Cld_Cover',
+        'Inst_flx_Medium_Cld_Cover',
+        'Inst_flx_Tot_Cld_cover',
+        'Large_scale_rain',
+        'Large_scale_snow',
+        'Mean_sea_level_pressure',
+        'Relative_humidity',
+        'Relative_humidity_isobaric',
+        'SBL_Meridian_gust',
+        'SBL_Zonal_gust',
+        'Specific_humidity',
+        'Surf_Solar_radiation',
+        'Surf_Thermal_radiation',
+        'Surface_CAPE',
+        'Surface_Temperature',
+        'Surface_orography',
+        'Temperature',
+        'Total_precipitation',
+        'U-velocity',
+        'V-velocity',
+        'Vertical_velocity',
+        'Wet_Bulb_Poten_Temper',
+        'freezing_level_zeroDegC_isotherm'],
+        """
+        alaro = {'ALARO': {'10m_u_wind_component': '10_m_u__wind_component',
+                          '10m_v_wind_component': '10_m_v__wind_component',
+                          '2m_Max_temp_since_ppp': '2_m_Max_temp_since_ppp',
+                          '2m_Min_temp_since_ppp': '2_m_Min_temp_since_ppp',
+                          '2m_dewpoint_temperature': '2_m_dewpoint_temperature',
+                          '2m_temperature': '2_m_temperature',
+                          '2m_Relative_humidity': '2m_Relative_humidity',
+                          'Convective_rain': 'Convective_rain',
+                          'Convective_snow': 'Convective_snow',
+                          'Geopotential': 'Geopotential',
+                          'Inst_flx_Conv_Cld_Cover': 'Inst_flx_Conv_Cld_Cover',
+                          'Inst_flx_High_Cld_Cover': 'Inst_flx_High_Cld_Cover',
+                          'Inst_flx_Low_Cld_Cover': 'Inst_flx_Low_Cld_Cover',
+                          'Inst_flx_Medium_Cld_Cover': 'Inst_flx_Medium_Cld_Cover',
+                          'Inst_flx_Tot_Cld_cover': 'Inst_flx_Tot_Cld_cover',
+                          'Large_scale_rain': 'Large_scale_rain',
+                          'Large_scale_snow': 'Large_scale_snow',
+                          'Mean_sea_level_pressure': 'Mean_sea_level_pressure',
+                          'Relative_humidity': 'Relative_humidity',
+                          'Relative_humidity_isobaric': 'Relative_humidity_isobaric',
+                          'SBL_Meridian_gust': 'SBL_Meridian_gust',
+                          'SBL_Zonal_gust': 'SBL_Zonal_gust',
+                          'Specific_humidity': 'Specific_humidity',
+                          'Surf_Solar_radiation': 'Surf_Solar_radiation',
+                          'Surf_Thermal_radiation': 'Surf_Thermal_radiation',
+                          'Surface_CAPE': 'Surface_CAPE',
+                          'Surface_Temperature': 'Surface_Temperature',
+                          'Surface_orography': 'Surface_orography',
+                          'Temperature': 'Temperature',
+                          'Total_precipitation': 'Total_precipitation',
+                          'U-velocity': 'U-velocity',
+                          'V-velocity': 'V-velocity',
+                          'Vertical_velocity': 'Vertical_velocity',
+                          'Wet_Bulb_Poten_Temper': 'Wet_Bulb_Poten_Temper',
+                          'freezing_level_zeroDegC_isotherm': 'freezing_level_zeroDegC_isotherm',}}
+
+
         for idx, (k, item) in enumerate(orthos.items()):
             for kdx, (m, subitem) in enumerate(item.items()):
                 self.add_object(which='wmsback',
@@ -5308,6 +5425,27 @@ class WolfMapViewer(wx.Frame):
                                                     self, xmin, xmax, ymin, ymax, -99999, 1024, LifeWatch=True),
                                 ToCheck=False, id='LifeWatch LC' + m)
 
+        for idx, (k, item) in enumerate(ign_belgique.items()):
+            for kdx, (m, subitem) in enumerate(item.items()):
+                self.add_object(which='wmsback',
+                                newobj=imagetexture('Orthos IGN', m, k, subitem,
+                                                    self, xmin, xmax, ymin, ymax, -99999, 1024, IGN_Belgium=True),
+                                ToCheck=False, id='IGN ' + m)
+
+        for idx, (k, item) in enumerate(ign_cartoweb.items()):
+            for kdx, (m, subitem) in enumerate(item.items()):
+                self.add_object(which='wmsback',
+                                newobj=imagetexture('Cartoweb IGN', m, k, subitem,
+                                                    self, xmin, xmax, ymin, ymax, -99999, 1024, IGN_Cartoweb=True),
+                                ToCheck=False, id='IGN ' + m)
+
+        for idx, (k, item) in enumerate(ign_postflood2021.items()):
+            for kdx, (m, subitem) in enumerate(item.items()):
+                self.add_object(which='wmsback',
+                                newobj=imagetexture('IGN 2021', m, k, subitem,
+                                                    self, xmin, xmax, ymin, ymax, -99999, 1024, postFlood2021=True),
+                                ToCheck=False, id='orthos post2021')
+
         self.add_object(which='wmsback',
                         newobj=imagetexture('PPNC', 'Orthos France', 'OI.OrthoimageCoverage.HR', '',
                                             self, xmin, xmax, ymin, ymax, -99999, 1024, France=True, epsg='EPSG:27563'),
@@ -5331,6 +5469,20 @@ class WolfMapViewer(wx.Frame):
                                                     self, xmin, xmax, ymin, ymax, -99999, 1024),
                                 ToCheck=False, id=m)
 
+        for idx, (k, item) in enumerate(alaro.items()):
+            for kdx, (m, subitem) in enumerate(item.items()):
+                self.add_object(which='wmsfore',
+                                newobj=imagetexture('ALARO', m, k, subitem,
+                                                    self, xmin, xmax, ymin, ymax, -99999, 1024, Alaro=True),
+                                ToCheck=False, id='ALARO ' + m)
+
+        for idx, (k, item) in enumerate(ign_cartoweb.items()):
+            for kdx, (m, subitem) in enumerate(item.items()):
+                self.add_object(which='wmsfore',
+                                newobj=imagetexture('Cartoweb', m, k, subitem,
+                                                    self, xmin, xmax, ymin, ymax, -99999, 1024, IGN_Cartoweb=True),
+                                ToCheck=False, id='IGN_f ' + m)
+
         # self.add_object(which='wmsfore',
         #                 newobj=imagetexture('Cadastre Flandres', 'Plan Parcellaire 2024 (Flandres)', 'Adpf', '',
         #                                     self, xmin, xmax, ymin, ymax, -99999, 1024, Vlaanderen=True),
@@ -8309,6 +8461,20 @@ class WolfMapViewer(wx.Frame):
 
                 self._memory_views_gui.Show()
 
+        elif itemlabel == _("Memory distances..."):
+
+            if self._distances is not None:
+                if self._distances[-1].nbvectors == 0:
+                    logging.warning(_('No vector to show !'))
+                    return
+
+                self._distances.showstructure(self)
+
+        elif itemlabel == _("Add distances to viewer..."):
+
+            if self._distances is not None:
+                self.add_object('vector', newobj=self._distances, ToCheck=True, id='Distances')
+
         elif itemlabel == _("Create bridge and export gltf..."):
 
             if self.active_cs is None:
@@ -11477,8 +11643,32 @@ class WolfMapViewer(wx.Frame):
                     size = float(dlg.GetValue())
                 curobj.creategrid(size, self.xmin, self.ymin, self.xmax, self.ymax)
 
+            if 'alaro' in curobj.idx and check:
+                if self.alaro_navigator is None:
+                    self.alaro_navigator = Alaro_Navigator(self, curobj.idx, 'Alaro')
+                    self.alaro_navigator.Show()
+
             self.Refresh()
 
+    def _alaro_update_time(self):
+        """ Update the time of the alaro navigator """
+
+        objs = self.get_list_objects(drawing_type=draw_type.WMSFORE, checked_state=True)
+        for obj in objs:
+            obj.time = self.alaro_navigator.time_str
+            obj.alpha = self.alaro_navigator.alpha
+            obj.force_alpha = True
+
+        self._update_foreground()
+        self.Paint()
+
+    def _alaro_legends(self):
+        """ Show images of the checked alaro layers"""
+        objs = self.get_list_objects(drawing_type=draw_type.WMSFORE, checked_state=True)
+        for obj in objs:
+            img = Image.open(get_Alaro_legend(obj.idx.replace('alaro ', '')))
+            img.show()
+
     def getXY(self, pospix):
 
         width, height = self.canvas.GetSize()
@@ -12994,6 +13184,13 @@ class WolfMapViewer(wx.Frame):
 
             if self.action == 'distance along vector':
 
+                dlg = wx.MessageDialog(None, _('Memorize the vector ?'), _('Confirm'), wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION)
+                ret = dlg.ShowModal()
+                dlg.Destroy()
+
+                if ret == wx.ID_YES:
+                    self._distances[-1].add_vector(self._tmp_vector_distance, forceparent=True, update_struct=True)
+
                 self._tmp_vector_distance = None
 
             elif self.action == 'pick landmap':

wolfhece/PyGui.py

@@ -155,6 +155,8 @@ class GenMapManager(wx.Frame):
 class MapManager(GenMapManager):
 
     def __init__(self,*args, **kw):
+
+        logging.info("MapManager")
         super().__init__(*args, **kw)
 
         icon = wx.Icon()
@@ -181,7 +183,7 @@ class MapManager(GenMapManager):
             except:
                 logging.error("No icon for the log window")
 
-
+        logging.info("MapManager - MapViewer created")
         # Set directory for hydrometry data, relative to the current file
         dir_data = Path(__file__).parent / "data"
         dir_hydro = dir_data / "hydrometry"
@@ -196,11 +198,16 @@ class MapManager(GenMapManager):
         if not dir_picc.exists():
             dir_picc.mkdir(parents=True, exist_ok=True)
 
+        logging.info("MapManager - Data directories created")
         try:
             self.SPWhydrometry = hydrometry_wolfgui(dir=dir_hydro, idx = 'SPW hydrometry', mapviewer=self.mapviewer, parent = self, plotted=False)
+            logging.info("MapManager - hydrometry_wolfgui created")
             self.picc          = Picc_data(data_dir=dir_picc, mapviewer=self.mapviewer)
+            logging.info("MapManager - Picc_data created")
             self.cadaster      = Cadaster_data(data_dir=dir_cadaster, mapviewer=self.mapviewer)
+            logging.info("MapManager - Cadaster_data created")
             self.landmaps      = PlansTerrier(mapviewer=self.mapviewer, parent = self, idx='LandMaps', plotted=True)
+            logging.info("MapManager - PlansTerrier created")
 
             self.mapviewer.add_object(which='other',
                                     newobj=self.SPWhydrometry,
@@ -225,6 +232,7 @@ class MapManager(GenMapManager):
             logging.warning("Can't load some data (hydrometry, picc, cadaster, landmaps) -- Please check the data directories and/or report the issue")
 
         self.mapviewer.menu_walous()
+        logging.info("MapManager - Menu Walous created")
 
 # class GPU2DModel(GenMapManager):
 

wolfhece/PyVertexvectors.py

@@ -6631,8 +6631,9 @@ class Zones(wx.Frame, Element_To_Draw):
         """
         Affichage des propriétés des zones
 
-        parent : soit une instance 'WolfMapViewer', soit une instance 'Ops_Array'  --> est utile pour transférer la propriété 'active_vector' et obtenir diverses informations
-          si parent est d'un autre type, il faut s'assurer que les options/actions sont consistantes
+        :param parent: soit une instance 'WolfMapViewer', soit une instance 'Ops_Array'  --> est utile pour transférer la propriété 'active_vector' et obtenir diverses informations
+                       si parent est d'un autre type, il faut s'assurer que les options/actions sont consistantes
+        :param forceupdate: si True, on force la mise à jour de la structure
 
         """
         self.showstructure(parent, forceupdate)
@@ -6652,8 +6653,9 @@ class Zones(wx.Frame, Element_To_Draw):
         """
         Affichage de la structure des zones
 
-        parent : soit une instance 'WolfMapViewer', soit une instance 'Ops_Array'  --> est utile pour transférer la propriété 'active_vector' et obtenir diverses informations
-          si parent est d'un autre type, il faut s'assurer que les options/actions sont consistantes
+        :param parent: soit une instance 'WolfMapViewer', soit une instance 'Ops_Array'  --> est utile pour transférer la propriété 'active_vector' et obtenir diverses informations
+                        si parent est d'un autre type, il faut s'assurer que les options/actions sont consistantes
+        :param forceupdate: si True, on force la mise à jour de la structure
 
         """
         if self.parent is None: