wolfhece 2.2.26__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 = 26
+        self.patch = 27
 
     def __str__(self):
 

wolfhece/report/tools.py

@@ -815,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=f"{ref} - {_('Bathymetry')}", 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} - {sim}", 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"
 
@@ -963,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)
@@ -971,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} - {sim}", 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"
 
@@ -985,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} - {sim}", 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"
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.26
+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.26.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=ywl1rGt9d5UlGmLPuCEKV0NQSzDV2Zum80Gbo1pTZqs,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=8veLJr-vWmO56Y73c1fowCOum9IAiWYygC7gEZEBeFk,90875
+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.26.dist-info/METADATA,sha256=F6COfsHmlgTZoUOckJarKwQJFDwXPD7t0Q6bK66pMgg,2729
-wolfhece-2.2.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wolfhece-2.2.26.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
-wolfhece-2.2.26.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.26.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,,