wolfhece 2.2.25__py3-none-any.whl → 2.2.27__py3-none-any.whl

wolfhece/apps/version.py

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

wolfhece/report/tools.py

@@ -128,6 +128,8 @@ def _sanitize_scenario_name(scenario_name: str | tuple[str,str]) -> str:
 
         scenario_name = scenario_name[0].strip()
 
+    scenario_name = scenario_name.replace('\\', '_').replace('/', '_')  # Replace slashes with underscores
+
     return scenario_name
 
 def list_directories(directory: Path) -> list[str]:
@@ -171,7 +173,7 @@ def create_a_wolf_viewer() -> WolfMapViewer:
         raise ImportError("Could not create WolfMapViewer instance. Ensure that the MapManager is properly initialized.")
 
 def find_scenario_directory(base_directory: Path | str, scenario_name: str) -> Path | None:
-    """ Find the directory of a specific scenario within the base directory.
+    """ Find the directory of a specific scenario within the base directory and subdirectories.
 
     :param base_directory: The base directory where the scenarios are located.
     :param scenario_name: The name of the scenario to find.
@@ -179,11 +181,20 @@ def find_scenario_directory(base_directory: Path | str, scenario_name: str) -> P
     """
     base_path = Path(base_directory)
 
-    # search if scenario_name is a directory in the base directory or its subdirectories
-    for dirpath, dirnames, filenames in os.walk(base_path):
-        if scenario_name in dirnames:
-            return Path(dirpath) / scenario_name
+    scen_path = base_path / scenario_name
+    # Check if the scenario_name is a direct subdirectory of the base directory
+    if scen_path.is_dir():
+        return scen_path
+
+    # # search if scenario_name is a directory in the base directory or its subdirectories
+    # for dirpath, dirnames, filenames in os.walk(base_path):
+    #     if scenario_name in dirnames:
+    #         return Path(dirpath) / scenario_name
 
+    # # Search in subdirectories of the base directory
+    # for subdir in base_path.iterdir():
+    #     if subdir.is_dir() and subdir.name == scenario_name:
+    #         return subdir
     return None
 
 def get_scenarios_directories(base_directory: Path | str, scenario_names:list[str]) -> dict:
@@ -194,7 +205,7 @@ def get_scenarios_directories(base_directory: Path | str, scenario_names:list[st
     :return: A list of paths to the scenario directories.
     """
     base_path = Path(base_directory)
-    ret = {scenario_name : find_scenario_directory(base_path, scenario_name) for scenario_name in scenario_names}
+    ret = {_sanitize_scenario_name(scenario_name) : find_scenario_directory(base_path, scenario_name) for scenario_name in scenario_names}
 
     # check if None is in the list and logging it
     for scenario_name, scenario_path in ret.items():
@@ -538,10 +549,14 @@ class Analysis_Scenarios():
         self._cloud.append((s, z, label))
         logging.info(f"Point added to cloud: ({s}, {z}, '{label}')")
 
-    def add_measures(self, measures:Zones | str | Path, zones:list[str] = None, style:dict = None) -> None:
+    def add_measures(self, measures:Zones | str | Path, zones:list[str] = None, style:dict = None, force_all_vectors:bool = False) -> None:
         """ Add measures to the analysis.
 
         :param measures: A Zones instance or a path to a vector file containing the measures.
+        :param zones: A list of zone names to include in the analysis. If None, all zones in the measures will be used.
+        :param style: A dictionary containing style properties for the measures.
+                      Available properties: 'color', 'linestyle', 'linewidth', 'marker', 'markersize', 'alpha'.
+        :param force_all_vectors: If True, all vectors in the zones will be projected on the riverbed, even if they are not used.
         """
 
         if isinstance(measures, Zones):
@@ -570,14 +585,15 @@ class Analysis_Scenarios():
                     logging.error(f"Zone '{zone}' not found in the measures.")
                     raise ValueError(f"Zone '{zone}' not found in the measures.")
 
-        self._measures_zones[key] = zones if zones is not None else cur_measure.myzones
+        self._measures_zones[key] = zones if zones is not None else [curz.myname for curz in cur_measure.myzones]
 
         for zone_name in self._measures_zones[key]:
             curz = cur_measure[zone_name]
             for vec in curz.myvectors:
-                # create a local key for the projected measures
-                lockey = (key, zone_name, vec.myname)
-                self._projected_measures[lockey] = [vec.projectontrace(self.reference_polygon.riverbed), style]
+                if vec.used or force_all_vectors:
+                    # create a local key for the projected measures
+                    lockey = (key, zone_name, vec.myname)
+                    self._projected_measures[lockey] = [vec.projectontrace(self.reference_polygon.riverbed), style]
 
         logging.info(f"Measures added to the analysis: {self._measures[key].idx}")
 
@@ -630,7 +646,7 @@ class Analysis_Scenarios():
         if self.reference_polygon is not None:
             # Compute the distance to the reference polygon
             ls = self.reference_polygon.riverbed.linestring
-            self._landmarks_s_label = [(ls.project(Point((curvec.myvertices[0].x+curvec.myvertices[-1].x)/2., (curvec.myvertices[0].y+curvec.myvertices[-1].y)/2.)), None, curvec.myname) for curvec in self._landmarks.myzones[0].myvectors]
+            self._landmarks_s_label = [(ls.project(Point((curvec.myvertices[0].x+curvec.myvertices[-1].x)/2., (curvec.myvertices[0].y+curvec.myvertices[-1].y)/2.)), None, curvec.myname) for curvec in self._landmarks.myzones[0].myvectors if curvec.used]
 
         logging.info(f"Landmarks added to the analysis: {self._landmarks.idx}")
 
@@ -799,30 +815,38 @@ class Analysis_Scenarios():
                 raise ValueError("At least two scenarios are required to compare waterlines.")
 
             ref, sim = scenario[0]
+
+            if isinstance(ref, tuple):
+                full_name = ref[1]
             ref = _sanitize_scenario_name(ref)
 
             # plot topography / bed elevation for the reference scenario
             s, z = self.get_polygon(ref).get_s_values(stored_values_unk.TOPOGRAPHY, which_group=ref, operator=operator, which_sim=sim)
             fig, ax = plt.subplots(1, 1)
-            ax.plot(s, z, label=ref, color='black', linestyle='-', linewidth=2)
+            ax.plot(s, z, label=f"{full_name} - {_('Bathymetry')}", color='black', linestyle='-', linewidth=2)
 
             # plot water surface elevation for the reference scenario
             s, z = self.get_polygon(ref).get_s_values(stored_values_unk.WATERLEVEL, which_group=ref, operator=operator, which_sim=sim)
-            ax.plot(s, z, label=f"{ref} - {stored_values_unk.WATERLEVEL.value}", color='blue', linestyle='-', linewidth=2)
+            ax.plot(s, z, label=f"{full_name} - {sim}", color='blue', linestyle='-', linewidth=2)
 
             # plot topography / bed elevation for the simulation scenarios
             for cur_scenario in scenario[1:]:
                 scen_name, sim_name = cur_scenario
+
+                if isinstance(scen_name, tuple):
+                    full_name = scen_name[1]
                 scen_name = _sanitize_scenario_name(scen_name)
                 s, z = self.get_polygon(scen_name).get_s_values(stored_values_unk.TOPOGRAPHY, which_group=scen_name, operator=operator, which_sim=sim_name)
-                ax.plot(s, z, label=f"{scen_name} - {_('Bathymetry')}", linestyle='--', linewidth=1.5)
+                ax.plot(s, z, label=f"{full_name} - {_('Bathymetry')}", linestyle='--', linewidth=1.5)
 
             # plot water surface elevation for the simulation scenarios
             for cur_scenario in scenario[1:]:
                 scen_name, sim_name = cur_scenario
+                if isinstance(scen_name, tuple):
+                    full_name = scen_name[1]
                 scen_name = _sanitize_scenario_name(scen_name)
                 s, z = self.get_polygon(scen_name).get_s_values(stored_values_unk.WATERLEVEL, which_group=scen_name, operator=operator, which_sim=sim_name)
-                ax.plot(s, z, label=f"{scen_name} - {sim_name}", linestyle='--', linewidth=1.5)
+                ax.plot(s, z, label=f"{full_name} - {sim_name}", linestyle='--', linewidth=1.5)
 
             filename = self.directories[Directory_Analysis.IMAGES] / f"{self.name}_{ref}_{str(xmin)}_{str(xmax)}_waterlines_comparison.png"
 
@@ -947,6 +971,8 @@ class Analysis_Scenarios():
 
         if isinstance(scenario, (str, tuple)):
 
+            if isinstance(scenario, tuple):
+                full_name = scenario[1]
             scenario = _sanitize_scenario_name(scenario)
 
             fig,ax = plt.subplots(1,1)
@@ -955,7 +981,7 @@ class Analysis_Scenarios():
             for sim in self.list_sims_in_polygons(scenario):
                 # plot Froude number for the reference scenario
                 s, z = self.get_polygon(scenario).get_s_values(stored_values_unk.FROUDE, which_group=scenario, operator=operator, which_sim=sim)
-                ax.plot(s, z, label=f"{scenario} - {stored_values_unk.FROUDE.value}", linestyle='-', linewidth=1.5)
+                ax.plot(s, z, label=f"{sim}", linestyle='-', linewidth=1.5)
 
             filename = self.directories[Directory_Analysis.IMAGES] / f"{self.name}_{scenario}_{str(xmin)}_{str(xmax)}_Froude.png"
 
@@ -969,18 +995,23 @@ class Analysis_Scenarios():
             fig,ax = plt.subplots(1,1)
 
             ref, sim = scenario[0]
+
+            if isinstance(ref, tuple):
+                full_name = ref[1]
             ref = _sanitize_scenario_name(ref)
 
             # plot water surface elevation for the reference scenario
             s, z = self.get_polygon(ref).get_s_values(stored_values_unk.FROUDE, which_group=ref, operator=operator, which_sim=sim)
-            ax.plot(s, z, label=f"{ref} - {stored_values_unk.FROUDE.value}", color='blue', linestyle='-', linewidth=2)
+            ax.plot(s, z, label=f"{full_name} - {sim}", color='blue', linestyle='-', linewidth=2)
 
             # plot water surface elevation for the simulation scenarios
             for cur_scenario in scenario[1:]:
                 scen_name, sim_name = cur_scenario
+                if isinstance(scen_name, tuple):
+                    full_name = scen_name[1]
                 scen_name = _sanitize_scenario_name(scen_name)
                 s, z = self.get_polygon(scen_name).get_s_values(stored_values_unk.FROUDE, which_group=scen_name, operator=operator, which_sim=sim_name)
-                ax.plot(s, z, label=f"{scen_name} - {sim_name}", linestyle='--', linewidth=1.5)
+                ax.plot(s, z, label=f"{full_name} - {sim_name}", linestyle='--', linewidth=1.5)
 
             filename = self.directories[Directory_Analysis.IMAGES] / f"{self.name}_{ref}_{str(xmin)}_{str(xmax)}_Froude_comparison.png"
 
@@ -1178,8 +1209,13 @@ class Analysis_Scenarios():
             if isinstance(key, tuple):
                 key = '_'.join(key)
 
+            key = key.replace('\\', '_')  # Replace backslashes with underscores for file naming
+
+            logging.info(f"Caching data for scenario '{key}' to disk.")
             polygons[0].cache_data((self.directories[Directory_Analysis.CACHE] / (self.name + '_' + key)).with_suffix('.json'))
 
+        logging.info("Data caching to disk completed.")
+
     def load_cached_data(self) -> None:
         """ Load cached data from polygons if available.
 
@@ -1193,9 +1229,14 @@ class Analysis_Scenarios():
             if isinstance(key, tuple):
                 key = '_'.join(key)
 
+            key = key.replace('\\', '_')  # Replace backslashes with underscores for file naming
+
             cache_file = (self.directories[Directory_Analysis.CACHE] / (self.name + '_' + key)).with_suffix('.json')
+            logging.info(f"Loading cached data from {cache_file}")
             polygons[0].load_data(cache_file)
 
+        logging.info("Cached data loaded successfully.")
+
     def extract_data_from_polygons(self) -> dict:
         """ Extract data from polygons used in the analysis.
 
@@ -1379,11 +1420,12 @@ class Analysis_Scenarios():
         :param scenario: The name of the scenario to get polygons information for. If None, returns information for all scenarios.
         :return: A dictionary with the polygons information.
         """
-        scenario = _sanitize_scenario_name(scenario)
 
         if scenario is None:
             # Return information for all scenarios
             return {key: self.get_polygons_informations(key) for key in self._polygons.keys()}
+        else:
+            scenario = _sanitize_scenario_name(scenario)
 
         if scenario not in self._polygons:
             logging.error(f"Scenario '{scenario}' not found in the analysis.")

{wolfhece-2.2.25.dist-info → wolfhece-2.2.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.25
+Version: 2.2.27
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece

{wolfhece-2.2.25.dist-info → wolfhece-2.2.27.dist-info}/RECORD

@@ -88,7 +88,7 @@ wolfhece/apps/curvedigitizer.py,sha256=lEJJwgAfulrrWQc-U6ij6sj59hWN3SZl4Yu1kQxVz
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=EdGDN9NhudIiP7c3gVqj7dp4MWFB8ySizM_tpMnsgpE,3091
-wolfhece/apps/version.py,sha256=cAahpCeFFjP_sz4qZ9K6UjX5aa6jztuXsxI_b-YmJ1A,388
+wolfhece/apps/version.py,sha256=p-KAUzXKL4OgZzyJi_QLtP77sITe_SMcFQwa7KciYFU,388
 wolfhece/apps/wolf.py,sha256=mRnjYsUu4KIsRuamdQWAINFMuwN4eJgMo9erG-hkZ70,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -268,7 +268,7 @@ wolfhece/report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/report/pdf.py,sha256=zrSSY1JPk59FxK9pFWQfhVKIQAoc_wjeTrXO3tSiEHo,1959
 wolfhece/report/reporting.py,sha256=JUEXovx_S4jpYkJEBU0AC-1Qw2OkkWyV3VAp6iOfSHc,19494
 wolfhece/report/simplesimgpu.py,sha256=kx9IMCr9afPwv9B3G5ADQfaIuHXuqTkgSjg-5bXVuqo,60738
-wolfhece/report/tools.py,sha256=1s_xr-O4ttOg3QKqhLaVAdiXCb_mz7onb20dVW8Y99M,89340
+wolfhece/report/tools.py,sha256=hX57JKcdMgjg-jNDpCRGC82x7ZKpYaqSng7oR3rkDrs,91412
 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=d-LWa_FxmPxTSc_H1lDHwqLB6TCqj1IUrRJhatfPMMA,5623
@@ -301,8 +301,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.2.25.dist-info/METADATA,sha256=7ttBudLA0qZ4Tk2jrnIZa1P9chEa9UDTdIhIv7b0hc0,2729
-wolfhece-2.2.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wolfhece-2.2.25.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
-wolfhece-2.2.25.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.25.dist-info/RECORD,,
+wolfhece-2.2.27.dist-info/METADATA,sha256=LyxRqMNvHVs9MaJn8wSaG5KQTVQ6Ixr_dJe237NPjbg,2729
+wolfhece-2.2.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wolfhece-2.2.27.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
+wolfhece-2.2.27.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.27.dist-info/RECORD,,