wolfhece 2.1.96__py3-none-any.whl → 2.1.97__py3-none-any.whl

wolfhece/PyConfig.py

@@ -29,6 +29,7 @@ class ConfigurationKeys(Enum):
     COLOR_BACKGROUND = "ColorBackground"
     ACTIVE_ARRAY_PALETTE_FOR_IMAGE = "Use active array palette for image"
     ACTIVE_RES2D_PALETTE_FOR_IMAGE = "Use active result palette for image"
+    ASSEMBLY_IMAGES = "AssemblyImages"
 
 class WolfConfiguration:
     """ Holds the PyWolf configuration.
@@ -71,7 +72,8 @@ class WolfConfiguration:
             ConfigurationKeys.ACTIVE_ARRAY_PALETTE_FOR_IMAGE.value: True,
             ConfigurationKeys.ACTIVE_RES2D_PALETTE_FOR_IMAGE.value: False,
             ConfigurationKeys.TICKS_BOUNDS.value: True,
-            ConfigurationKeys.COLOR_BACKGROUND.value: [255, 255, 255, 255]
+            ConfigurationKeys.COLOR_BACKGROUND.value: [255, 255, 255, 255],
+            ConfigurationKeys.ASSEMBLY_IMAGES.value: 0
         }
         self._types = {
             ConfigurationKeys.VERSION.value: int,
@@ -80,7 +82,8 @@ class WolfConfiguration:
             ConfigurationKeys.ACTIVE_ARRAY_PALETTE_FOR_IMAGE.value: bool,
             ConfigurationKeys.ACTIVE_RES2D_PALETTE_FOR_IMAGE.value: bool,
             ConfigurationKeys.TICKS_BOUNDS.value: bool,
-            ConfigurationKeys.COLOR_BACKGROUND.value: list
+            ConfigurationKeys.COLOR_BACKGROUND.value: list,
+            ConfigurationKeys.ASSEMBLY_IMAGES.value: int
         }
 
 
@@ -128,7 +131,7 @@ class GlobalOptionsDialog(wx.Dialog):
         super(GlobalOptionsDialog, self).__init__(*args, **kw)
 
         self.InitUI()
-        self.SetSize((400, 300))
+        self.SetSize((400, 400))
         self.SetTitle(_("Global options"))
 
     def push_configuration(self, configuration):
@@ -138,6 +141,7 @@ class GlobalOptionsDialog(wx.Dialog):
         self.cfg_bkg_color.SetColour(configuration[ConfigurationKeys.COLOR_BACKGROUND])
         self.cfg_active_array_pal.SetValue(configuration[ConfigurationKeys.ACTIVE_ARRAY_PALETTE_FOR_IMAGE])
         self.cfg_active_res_pal.SetValue(configuration[ConfigurationKeys.ACTIVE_RES2D_PALETTE_FOR_IMAGE])
+        self.cfg_assembly_images.SetSelection(configuration[ConfigurationKeys.ASSEMBLY_IMAGES])
 
     def pull_configuration(self, configuration):
         configuration[ConfigurationKeys.PLAY_WELCOME_SOUND] = self.cfg_welcome_voice.IsChecked()
@@ -146,6 +150,7 @@ class GlobalOptionsDialog(wx.Dialog):
         configuration[ConfigurationKeys.COLOR_BACKGROUND] = list(self.cfg_bkg_color.GetColour())
         configuration[ConfigurationKeys.ACTIVE_ARRAY_PALETTE_FOR_IMAGE] = self.cfg_active_array_pal.IsChecked()
         configuration[ConfigurationKeys.ACTIVE_RES2D_PALETTE_FOR_IMAGE] = self.cfg_active_res_pal.IsChecked()
+        configuration[ConfigurationKeys.ASSEMBLY_IMAGES] = self.cfg_assembly_images.GetSelection()
 
     def InitUI(self):
 
@@ -207,6 +212,16 @@ class GlobalOptionsDialog(wx.Dialog):
         self.cfg_active_res_pal.SetToolTip(_('If checked, the active result palette will be used for the image (but priority to active array palette if checked)'))
         sbs.Add(self.cfg_active_res_pal, 1, wx.EXPAND, 5)
 
+        locsizer = wx.BoxSizer(wx.HORIZONTAL)
+        self.label_assembly_images = wx.StaticText(pnl, label=_('Assembly mode for images (if linked viewers)'))
+        self.cfg_assembly_images = wx.ListBox(pnl, choices=['horizontal', 'vertical', 'square'], style=wx.LB_SINGLE)
+        self.cfg_assembly_images.SetToolTip(_('Choose the assembly mode for images -- horizontal, vertical or square'))
+
+        locsizer.Add(self.label_assembly_images, 1, wx.EXPAND, 2)
+        locsizer.Add(self.cfg_assembly_images, 1, wx.EXPAND)
+
+        sbs.Add(locsizer, 3, wx.EXPAND, 5)
+
         pnl.SetSizer(sbs)
         pnl.Layout()
 

wolfhece/PyDraw.py

@@ -6092,8 +6092,11 @@ class WolfMapViewer(wx.Frame):
 
         elif itemlabel == 'Save to image...':
             autoscale = False
-            fn, ds = self.save_canvasogl()
-            self.save_linked_canvas(fn[:-4], ds)
+
+            fn, ds = self.save_canvasogl(mpl=True)
+            all_images = self.save_linked_canvas(fn[:-4], mpl= True, ds= ds)
+
+            self.assembly_images(all_images)
 
         elif itemlabel == _('Copy image...'):
             autoscale = False
@@ -6666,9 +6669,72 @@ class WolfMapViewer(wx.Frame):
     def save_linked_canvas(self, fn, mpl=True, ds=0.):
         """ Save canvas of all linked viewers """
 
+        ret = []
         if self.linked:
             for idx, curel in enumerate(self.linkedList):
-                curel.save_canvasogl(fn + '_' + str(idx) + '.png', mpl, ds)
+                ret.append(curel.save_canvasogl(fn + '_' + str(idx) + '.png', mpl, ds))
+
+        return ret
+
+    def assembly_images(self, all_images, mode:Literal['horizontal', 'vertical', 'square']= 'square'):
+        """ Assembly images
+
+        Every image has the same size (width, height)
+        """
+
+        from PIL import Image
+
+        images = [Image.open(fn) for fn, ds in all_images]
+
+        widths, heights = zip(*(i.size for i in images))
+
+        if mode == 'horizontal':
+
+            total_width = sum(widths)
+            max_height = max(heights)
+
+            new_im = Image.new('RGB', (total_width, max_height))
+
+            x_offset = 0
+            for im in images:
+                new_im.paste(im, (x_offset,0))
+                x_offset += im.size[0]
+
+            new_im.save(all_images[0][0][:-4] + '_assembly.png')
+
+        elif mode == 'vertical':
+
+            total_height = sum(heights)
+            max_width = max(widths)
+
+            new_im = Image.new('RGB', (max_width, total_height))
+
+            y_offset = 0
+            for im in images:
+                new_im.paste(im, (0, y_offset))
+                y_offset += im.size[1]
+
+            new_im.save(all_images[0][0][:-4] + '_assembly.png')
+
+        elif mode == 'square':
+
+            max_width = max(widths)
+            max_height = max(heights)
+
+            nb_hor = int(np.ceil(np.sqrt(len(images))))
+
+            new_im = Image.new('RGB', (max_width*nb_hor, max_height*nb_hor))
+
+            x_offset = 0
+            y_offset = 0
+            for idx, im in enumerate(images):
+                new_im.paste(im, (x_offset, y_offset))
+                x_offset += im.size[0]
+                if (idx+1) % nb_hor == 0:
+                    y_offset += im.size[1]
+                    x_offset = 0
+
+            new_im.save(all_images[0][0][:-4] + '_assembly.png')
 
     def thread_update_blender(self):
         print("Update blender")

wolfhece/PyVertexvectors.py

@@ -2238,6 +2238,9 @@ class vector:
         """
         Graphique Matplolib de valeurs dans les matrices liées
         """
+        from .wolf_array import WolfArray
+        from .wolfresults_2D import Wolfresults_2D
+
         colors=['red','blue','green']
 
         exit=True
@@ -2257,30 +2260,52 @@ class vector:
 
         zmin=99999.
         zmax=-99999.
+        nullvalue = -99999
 
         for curlabel, curarray in linked_arrays.items():
             if curarray.plotted:
 
-                ds = min(curarray.dx,curarray.dy)
+                if isinstance(curarray, WolfArray):
+                    ds = min(curarray.dx,curarray.dy)
+                elif isinstance(curarray, Wolfresults_2D):
+                    ds = min(curarray[0].dx,curarray[0].dy)
+
                 nb = int(np.ceil(length/ds*2))
 
                 alls = np.linspace(0,int(length),nb)
 
                 pts = [myls.interpolate(curs) for curs in alls]
 
-                allz = [curarray.get_value(curpt.x,curpt.y) for curpt in pts]
+                allz = np.asarray([curarray.get_value(curpt.x,curpt.y, nullvalue= nullvalue) for curpt in pts])
 
-                zmaxloc=np.max(allz)
-                zminloc=np.min(allz)
+                zmaxloc=np.max(allz[allz!=nullvalue])
+                zminloc=np.min(allz[allz!=nullvalue])
 
                 zmax=max(zmax,zmaxloc)
                 zmin=min(zmin,zminloc)
 
-                if np.max(allz)>-99999:
-                    ax.plot(alls,allz,
-                            color=colors[np.mod(k,3)],
-                            lw=2.0,
-                            label=curlabel)
+                if np.max(allz)>nullvalue:
+                    # select parts
+                    if nullvalue in allz:
+                        # find all parts separated by nullvalue
+                        nulls = np.argwhere(allz==nullvalue)
+                        nulls = np.insert(nulls,0,-1)
+                        nulls = np.append(nulls,len(allz))
+
+                        addlabel = True
+                        for i in range(len(nulls)-1):
+                            if nulls[i+1]-nulls[i]>1:
+                                ax.plot(alls[nulls[i]+1:nulls[i+1]],allz[nulls[i]+1:nulls[i+1]],
+                                        color=colors[np.mod(k,3)],
+                                        lw=2.0,
+                                        label=curlabel if addlabel else None)
+                                addlabel = False
+
+                    else:
+                        ax.plot(alls,allz,
+                                color=colors[np.mod(k,3)],
+                                lw=2.0,
+                                label=curlabel)
                 k+=1
 
         ax.set_ylim(zmin,zmax)

wolfhece/apps/version.py

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

wolfhece/scenario/config_manager.py

@@ -709,7 +709,21 @@ class Config_Manager_2D_GPU:
 
     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)]
+
+        if tifstr == 'bath_':
+            forced_add = ['bathymetry.tif']
+        elif tifstr == 'mann_':
+            forced_add = ['manning.tif']
+        elif tifstr == 'infil_':
+            forced_add = ['infiltration.tif']
+
+        tif_list = [curtif for curtif in curdict[GPU_2D_file_extensions.TIF.value] \
+                    if curtif.name.lower().startswith(tifstr) or \
+                       curtif.name.lower() in forced_add]
+
+        tif_list += [curtif for curtif in curdict[GPU_2D_file_extensions.TIFF.value] \
+                    if curtif.name.lower().startswith(tifstr) or \
+                       curtif.name.lower() in forced_add]
 
         return tif_list
 

{wolfhece-2.1.96.dist-info → wolfhece-2.1.97.dist-info}/METADATA

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

@@ -5,9 +5,9 @@ wolfhece/GraphProfile.py,sha256=OCgJo0YFFBI6H1z-5egJsOOoWF_iziiza0-bbPejNMc,6965
 wolfhece/Lidar2002.py,sha256=bX-nIzdpjD7rOfEgJpTeaW6rIdAXwDp_z4YTM9CgANY,6068
 wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
-wolfhece/PyConfig.py,sha256=UNtl5UzZ399JqjJT67-4DWaIkv76sc1FiEsSDJpXlL0,10458
+wolfhece/PyConfig.py,sha256=Mbzh9PxAjBI-XnVOoYh0clykGqRlrgtxjxHr3_3TqIY,11390
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=k1XDmBIohV4sGYxotU-BTD4m0KXQh-VbT6nv2itS_Oo,443861
+wolfhece/PyDraw.py,sha256=eTk6e6awgr_41s6tg5BjFQAibAJz_Evee0QKTDGZkeE,445795
 wolfhece/PyGui.py,sha256=HY0beOMSp1JEyq8-vfVynzVrmKxvaO_sJSMwlNqCNrg,105289
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -16,7 +16,7 @@ wolfhece/PyParams.py,sha256=6fREK5cUCGw84SDyPvuSzidnX-9BXOX3fve5XBG1K_I,98114
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=aj1Xp6n0pMb_q6AMADHnQ9pgjjRU4EQm0m4Tmc1uoEM,41912
-wolfhece/PyVertexvectors.py,sha256=JV7a4kN4hbwR4fNHATl3X3iuZ7Vh2vyThxVWKtNWSrQ,252593
+wolfhece/PyVertexvectors.py,sha256=dLdRt6f8AQrWT_EsPfJCGHkOgrFLH5zycN0mNcGSF0Y,253832
 wolfhece/PyWMS.py,sha256=fyyzm2HFwq8aRwVYHKiBatcZOeKnFi6DWhv4nfscySQ,4602
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -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=5EAPTzfatYqx9GXoy44yzHoCW1DnjWdiOvkS-fo60-c,388
+wolfhece/apps/version.py,sha256=NRYKULEmomDYlRJya_ox0EwLq8fqyB2CbzOltiPmlOo,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=aQFqY2aDcKR5r7NIFqjcO1VJngajK_lOE1ZX5LVKKpc,90591
+wolfhece/scenario/config_manager.py,sha256=sILVXCdSsB-LcfVbCIF33fkPAGd-8qZR9q2598TxVcU,91130
 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.96.dist-info/METADATA,sha256=woDxgeDItCFEgqYP3HLrY3xiLGjHxXRQ-rV9TyNDgFQ,2570
-wolfhece-2.1.96.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-wolfhece-2.1.96.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.96.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.96.dist-info/RECORD,,
+wolfhece-2.1.97.dist-info/METADATA,sha256=74i0-s485_JqC2Pb5WGIg19uvs3o2pyeGpg7KFvgtZU,2570
+wolfhece-2.1.97.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+wolfhece-2.1.97.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.97.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.97.dist-info/RECORD,,