wolfhece 2.1.81__py3-none-any.whl → 2.1.83__py3-none-any.whl

wolfhece/PyConfig.py

@@ -27,6 +27,8 @@ class ConfigurationKeys(Enum):
     TICKS_SIZE = "TicksSize"
     TICKS_BOUNDS = "TicksBounds"
     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"
 
 class WolfConfiguration:
     """ Holds the PyWolf configuration.
@@ -66,6 +68,8 @@ class WolfConfiguration:
             ConfigurationKeys.VERSION.value: 1,
             ConfigurationKeys.PLAY_WELCOME_SOUND.value: True,
             ConfigurationKeys.TICKS_SIZE.value: 500.,
+            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]
         }
@@ -73,6 +77,8 @@ class WolfConfiguration:
             ConfigurationKeys.VERSION.value: int,
             ConfigurationKeys.PLAY_WELCOME_SOUND.value: bool,
             ConfigurationKeys.TICKS_SIZE.value: float,
+            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
         }
@@ -116,12 +122,13 @@ class WolfConfiguration:
 
 
 class GlobalOptionsDialog(wx.Dialog):
+    """ A dialog to set global options for a WolfMapViewer. """
 
     def __init__(self, *args, **kw):
         super(GlobalOptionsDialog, self).__init__(*args, **kw)
 
         self.InitUI()
-        self.SetSize((400, 200))
+        self.SetSize((400, 300))
         self.SetTitle(_("Global options"))
 
     def push_configuration(self, configuration):
@@ -129,12 +136,16 @@ class GlobalOptionsDialog(wx.Dialog):
         self.cfg_ticks_size.SetValue(str(configuration[ConfigurationKeys.TICKS_SIZE]))
         self.cfg_ticks_bounds.SetValue(configuration[ConfigurationKeys.TICKS_BOUNDS])
         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])
 
     def pull_configuration(self, configuration):
         configuration[ConfigurationKeys.PLAY_WELCOME_SOUND] = self.cfg_welcome_voice.IsChecked()
         configuration[ConfigurationKeys.TICKS_SIZE] = float(self.cfg_ticks_size.Value)
         configuration[ConfigurationKeys.TICKS_BOUNDS] = self.cfg_ticks_bounds.IsChecked()
         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()
 
     def InitUI(self):
 
@@ -147,13 +158,26 @@ class GlobalOptionsDialog(wx.Dialog):
         sbs = wx.StaticBoxSizer(sb , orient=wx.VERTICAL)
 
         self.cfg_welcome_voice = wx.CheckBox(pnl, label=_('Welcome voice'))
+        self.cfg_welcome_voice.SetToolTip(_('Play a welcome message when opening the application'))
         sbs.Add(self.cfg_welcome_voice)
 
+        sbs.AddSpacer(5)
+
+        hsizer = wx.BoxSizer(wx.HORIZONTAL)
+        self.label_background_color = wx.StaticText(pnl, label=_('Background color'))
         self.cfg_bkg_color = wx.ColourPickerCtrl(pnl, colour=(255,255,255,255))
-        sbs.Add(self.cfg_bkg_color)
+        self.cfg_bkg_color.SetToolTip(_('Background color for the viewer'))
+
+        hsizer.Add(self.label_background_color, 1, wx.EXPAND)
+        hsizer.Add(self.cfg_bkg_color, 1, wx.EXPAND)
+
+        sbs.Add(hsizer, 1, wx.EXPAND)
+
+        sbs.AddSpacer(5)
 
         pnl.SetSizer(sbs)
         pnl.Layout()
+
         vbox.Add(pnl, proportion=1, flag=wx.ALL|wx.EXPAND, border=5)
 
         ### Panel 'Copy to clipboard'
@@ -163,19 +187,29 @@ class GlobalOptionsDialog(wx.Dialog):
         sbs = wx.StaticBoxSizer(sb, orient=wx.VERTICAL)
 
         hboxticks = wx.BoxSizer(wx.HORIZONTAL)
-        self.label_ticks_size = wx.StaticText(pnl, label=_('Default ticks size for copy to clipboard'))
+        self.label_ticks_size = wx.StaticText(pnl, label=_('Default ticks size [m]'))
         self.cfg_ticks_size = wx.TextCtrl(pnl, value='500.',style = wx.TE_CENTRE )
+
         hboxticks.Add(self.label_ticks_size, 1, wx.EXPAND)
-        hboxticks.AddSpacer(5)
-        hboxticks.Add(self.cfg_ticks_size, 0, wx.EXPAND)
+        hboxticks.Add(self.cfg_ticks_size, 1, wx.EXPAND)
 
         sbs.Add(hboxticks, 1, wx.EXPAND)
 
         self.cfg_ticks_bounds = wx.CheckBox(pnl, label=_('Add bounds to ticks'))
+        self.cfg_ticks_bounds.SetToolTip(_('If not checked, the extreme values of the ticks will not be displayed'))
         sbs.Add(self.cfg_ticks_bounds, 1, wx.EXPAND, 5)
 
+        self.cfg_active_array_pal = wx.CheckBox(pnl, label=_('Use active array palette for image'))
+        self.cfg_active_array_pal.SetToolTip(_('If checked, the active array palette will be used for the image'))
+        sbs.Add(self.cfg_active_array_pal, 1, wx.EXPAND, 5)
+
+        self.cfg_active_res_pal = wx.CheckBox(pnl, label=_('Use active result palette for image'))
+        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)
+
         pnl.SetSizer(sbs)
         pnl.Layout()
+
         vbox.Add(pnl, proportion=1, flag=wx.ALL|wx.EXPAND, border=5)
 
         # Buttons

wolfhece/PyDraw.py

@@ -2059,6 +2059,34 @@ class WolfMapViewer(wx.Frame):
         else:
             return config[ConfigurationKeys.TICKS_BOUNDS]
 
+    @property
+    def palette_for_copy(self) -> wolfpalette:
+        """ Return the palette for copy from configs """
+
+        config = self.get_configuration()
+        if config is None:
+            if self.active_array is not None:
+                return self.active_array.palette
+            elif self.active_res2d is not None:
+                return self.active_res2d.palette
+            else:
+                return wolfpalette()
+        else:
+            act_array = config[ConfigurationKeys.ACTIVE_ARRAY_PALETTE_FOR_IMAGE]
+            act_res2d = config[ConfigurationKeys.ACTIVE_RES2D_PALETTE_FOR_IMAGE]
+
+            if act_array:
+                if self.active_array is not None:
+                    return self.active_array.mypal
+                else:
+                    return wolfpalette()
+            elif act_res2d:
+                if self.active_res2d is not None:
+                    return self.active_res2d.mypal
+                else:
+                    return wolfpalette()
+            else:
+                return wolfpalette()
 
     def GlobalOptionsDialog(self, event):
         handle_configuration_dialog(self, self.get_configuration())
@@ -2191,29 +2219,33 @@ class WolfMapViewer(wx.Frame):
 
             self.active_array.compare_tri(self.active_tri)
 
-    def copy_canvasogl(self, mpl=True, ds=0., figsizes=[10.,10.], palette:wolfpalette = None):
+    def copy_canvasogl(self, mpl:bool= True, ds:float= 0., figsizes= [10.,10.], palette:wolfpalette = None):
         """
-
         Generate image based on UI context and copy to the Clipboard
 
-        Args:
-            mpl (bool, optional): Using Matplolib as renderer. Defaults to True.
-            ds (float, optional): Ticks size. Defaults to 0..
-            figsizes : fig size in inches
+        :param mpl: Using Matplolib as renderer. Defaults to True.
+        :type mpl: bool, optional
+        :parem ds: Ticks size. Defaults to 0..
+        :type ds: float, optional
+        :parem figsizes: fig size in inches
+        :type figsizes: list, optional
         """
+
         if wx.TheClipboard.Open():
             self.Paint()
 
             if self.SetCurrentContext():
 
-                # Récupération  du buffer OpenGL
-                glPixelStorei(GL_PACK_ALIGNMENT, 1)
-                data = glReadPixels(0, 0, self.canvaswidth, self.canvasheight, GL_RGBA, GL_UNSIGNED_BYTE)
-                # Création d'une image sur base du buffer
-                myimage: Image.Image
-                myimage = Image.frombuffer("RGBA", (self.canvaswidth, self.canvasheight), data)
-                # On tranpose car OpenGL travaille avec comme référence le coin inférieur gauche
-                myimage = myimage.transpose(1)
+                myimage = self.get_canvas_as_image()
+
+                # # Récupération  du buffer OpenGL
+                # glPixelStorei(GL_PACK_ALIGNMENT, 1)
+                # data = glReadPixels(0, 0, self.canvaswidth, self.canvasheight, GL_RGBA, GL_UNSIGNED_BYTE)
+                # # Création d'une image sur base du buffer
+                # myimage: Image.Image
+                # myimage = Image.frombuffer("RGBA", (self.canvaswidth, self.canvasheight), data)
+                # # On tranpose car OpenGL travaille avec comme référence le coin inférieur gauche
+                # myimage = myimage.transpose(1)
 
                 metadata = PngInfo()
                 metadata.add_text('xmin', str(self.xmin))
@@ -2223,20 +2255,17 @@ class WolfMapViewer(wx.Frame):
 
                 if mpl:
                     if ds == 0.:
-                        ds = self.ticks_size
-                        # dlg = wx.NumberEntryDialog(self,
-                        #                         _("xmin : {:.3f} \nxmax : {:.3f} \nymin : {:.3f} \nymax : {:.3f} \n\n  dx : {:.3f}\n  dy : {:.3f}").format(
-                        #                             self.xmin, self.xmax, self.ymin, self.ymax, self.xmax - self.xmin,
-                        #                             self.ymax - self.ymin),
-                        #                         _("Interval [m]"), _("Ticks interval ?"), 500, 1, 10000)
-                        # ret = dlg.ShowModal()
+                        ds = self.ticks_size # Global parameters
+
+                        if ds == 0.:
+                            ds = 100.
 
-                        # if ret == wx.ID_CANCEL:
-                        #     dlg.Destroy()
-                        #     return
+                        nb_ticks_x = (self.xmax - self.xmin) // ds
+                        nb_ticks_y = (self.ymax - self.ymin) // ds
 
-                        # ds = float(dlg.GetValue())
-                        # dlg.Destroy()
+                        if nb_ticks_x > 10 or nb_ticks_y > 10:
+                            logging.error(_('Too many ticks for the image. Please raise the ticks size in the global options.'))
+                            return
 
                     # Création d'une graphique Matplotlib
                     extent = (self.xmin, self.xmax, self.ymin, self.ymax)
@@ -2253,7 +2282,6 @@ class WolfMapViewer(wx.Frame):
                     pos = ax.imshow(myimage,
                                     origin='upper',
                                     extent=extent)
-                    # fig.colorbar(pos,ax=ax)
 
                     x1 = np.ceil((self.xmin // ds) * ds)
                     if x1 < self.xmin:
@@ -2301,10 +2329,11 @@ class WolfMapViewer(wx.Frame):
                     im = Image.open(buf)
 
                     if palette is None:
-                        if self.active_array is not None:
-                            palette = self.active_array.mypal
-                        elif self.active_res2d is not None:
-                            palette = self.active_res2d.mypal
+                        palette = self.palette_for_copy
+                        # if self.active_array is not None:
+                        #     palette = self.active_array.mypal
+                        # elif self.active_res2d is not None:
+                        #     palette = self.active_res2d.mypal
 
                     if palette is not None:
                         bufpal = io.BytesIO()
@@ -2360,6 +2389,7 @@ class WolfMapViewer(wx.Frame):
         This method takes a matplotlib figure and axe and,
         returns a clear screenshot of the information displayed in the wolfpy GUI.
         """
+
         self.Paint()
         myax = ax
         if redraw:
@@ -2431,18 +2461,21 @@ class WolfMapViewer(wx.Frame):
 
     def get_mpl_plot(self, center = [0., 0.], width = 500., height = 500., title='', toshow=True) -> tuple[Figure, Axes]:
         """
-        Récupère un graphique matplotlib sur base de la fenêtre OpenGL et de la palette de la matrice active
+        Récupère un graphique matplotlib sur base de la fenêtre OpenGL et de la palette de la matrice/résultat actif.
         """
-        self.zoom_on(center=center, width=width, height= height, canvas_height=self.canvasheight, forceupdate=True)
 
+        self.zoom_on(center=center, width=width, height= height, canvas_height=self.canvasheight, forceupdate=True)
 
         fig,axes = plt.subplots(1,2, gridspec_kw={'width_ratios': [20, 1]})
         self.display_canvasogl(fig=fig,ax=axes[0])
 
-        if self.active_array is not None:
-            self.active_array.mypal.export_image(None, h_or_v='v', figax=(fig,axes[1]))
-        elif self.active_res2d is not None:
-            self.active_res2d.mypal.export_image(None, h_or_v='v', figax=(fig,axes[1]))
+        palette = self.palette_for_copy
+        palette.export_image(None, h_or_v='v', figax=(fig,axes[1]))
+
+        # if self.active_array is not None:
+        #     self.active_array.mypal.export_image(None, h_or_v='v', figax=(fig,axes[1]))
+        # elif self.active_res2d is not None:
+        #     self.active_res2d.mypal.export_image(None, h_or_v='v', figax=(fig,axes[1]))
 
         axes[0].xaxis.set_ticks_position('bottom')
         axes[0].xaxis.set_label_position('bottom')
@@ -2594,17 +2627,16 @@ class WolfMapViewer(wx.Frame):
 
             return myimage
 
-    def save_canvasogl(self, fn:str='', mpl:bool=True, ds:float=0.):
+    def save_canvasogl(self, fn:str='', mpl:bool=True, ds:float=0., dpi:int= 300):
         """
         Sauvegarde de la fenêtre d'affichage dans un fichier
 
-        fn : File name (.png file)
+        :param fn: File name (.png or .jpg file)
+        :param mpl: Using Matplotlib as renderer
+        :param ds: Ticks interval
         """
 
-        if not fn.endswith('.png'):
-            fn += '.png'
-
-        self.Paint()
+        fn = str(fn)
 
         if fn == '':
             dlg = wx.FileDialog(None, _('Choose file name'), wildcard='PNG (*.png)|*.png|JPG (*.jpg)|*.jpg',
@@ -2615,13 +2647,17 @@ class WolfMapViewer(wx.Frame):
                 return
             fn = dlg.GetPath()
             dlg.Destroy()
+        elif not fn.endswith('.png'):
+            fn += '.png'
 
         if self.SetCurrentContext():
-            glPixelStorei(GL_PACK_ALIGNMENT, 1)
-            data = glReadPixels(0, 0, self.canvaswidth, self.canvasheight, GL_RGBA, GL_UNSIGNED_BYTE)
-            myimage: Image.Image
-            myimage = Image.frombuffer("RGBA", (self.canvaswidth, self.canvasheight), data)
-            myimage = myimage.transpose(1)
+            # glPixelStorei(GL_PACK_ALIGNMENT, 1)
+            # data = glReadPixels(0, 0, self.canvaswidth, self.canvasheight, GL_RGBA, GL_UNSIGNED_BYTE)
+            # myimage: Image.Image
+            # myimage = Image.frombuffer("RGBA", (self.canvaswidth, self.canvasheight), data)
+            # myimage = myimage.transpose(1)
+
+            myimage = self.get_canvas_as_image()
 
             metadata = PngInfo()
             metadata.add_text('xmin', str(self.xmin))
@@ -2646,9 +2682,14 @@ class WolfMapViewer(wx.Frame):
                     dlg.Destroy()
 
                 extent = (self.xmin, self.xmax, self.ymin, self.ymax)
-                fig, ax = plt.subplots(1, 1)
-                pos = ax.imshow(myimage, origin='upper',
-                          extent=extent)
+                # fig, ax = plt.subplots(1, 1)
+                fig,axes = plt.subplots(1,2, gridspec_kw={'width_ratios': [20, 1]})
+
+                ax = axes[0]
+                self.display_canvasogl(fig=fig,ax=axes[0])
+
+                # pos = ax.imshow(myimage, origin='upper',
+                #           extent=extent)
                 # fig.colorbar(pos,ax=ax)
 
                 x1 = np.ceil((self.xmin // ds) * ds)
@@ -2683,7 +2724,19 @@ class WolfMapViewer(wx.Frame):
                 ax.set_xlabel('X [m]')
                 ax.set_ylabel('Y [m]')
 
-                plt.savefig(fn, dpi=300)
+                self.palette_for_copy.export_image(None, h_or_v='v', figax=(fig,axes[1]))
+
+                # if self.active_array is not None:
+                #     self.active_array.mypal.export_image(None, h_or_v='v', figax=(fig,axes[1]))
+                # elif self.active_res2d is not None:
+                #     self.active_res2d.mypal.export_image(None, h_or_v='v', figax=(fig,axes[1]))
+
+                # self.Paint()
+
+                fig.set_size_inches(12, 10)
+                fig.tight_layout()
+
+                fig.savefig(fn, dpi=dpi)
             else:
                 myimage.save(fn, pnginfo=metadata)
 
@@ -2693,6 +2746,9 @@ class WolfMapViewer(wx.Frame):
                 'Opengl setcurrent -- maybe a conflict with an existing opengl32.dll file - please rename the opengl32.dll in the libs directory and retry')
 
     def reporting(self, dir=''):
+        """ Firsdt attempr to create a reporting.
+        !! Must be improved !!
+        """
         if dir == '':
             dlg = wx.DirDialog(None, "Choose directory to store reporting", style=wx.FD_SAVE)
             ret = dlg.ShowModal()
@@ -2736,6 +2792,7 @@ class WolfMapViewer(wx.Frame):
                     curvec.myprop.width = oldwidth
 
     def InitUI(self):
+        """ Initialisation de l'interface utilisateur """
 
         self.Bind(wx.EVT_SIZE, self.OnSize)
         self.Bind(wx.EVT_CLOSE, self.OnClose)
@@ -6134,6 +6191,8 @@ class WolfMapViewer(wx.Frame):
         return linkedarrays
 
     def save_linked_canvas(self, fn, mpl=True, ds=0.):
+        """ Save canvas of all linked viewers """
+
         if self.linked:
             for idx, curel in enumerate(self.linkedList):
                 curel.save_canvasogl(fn + '_' + str(idx) + '.png', mpl, ds)
@@ -9602,6 +9661,14 @@ class WolfMapViewer(wx.Frame):
 
         return self.canvas.SetCurrent(self.context)
 
+    def _set_gl_projection_matrix(self):
+        glMatrixMode(GL_PROJECTION)
+        glLoadIdentity()
+        glOrtho(self.xmin, self.xmax, self.ymin, self.ymax, -99999, 99999)
+
+        glMatrixMode(GL_MODELVIEW)
+        glLoadIdentity()
+
     def Paint(self):
         """ Dessin des éléments ajoutés au viewer """
 
@@ -9626,12 +9693,7 @@ class WolfMapViewer(wx.Frame):
             glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
             glViewport(0, 0, int(width), int(height))
 
-            glMatrixMode(GL_PROJECTION)
-            glLoadIdentity()
-            glOrtho(self.xmin, self.xmax, self.ymin, self.ymax, -99999, 99999)
-
-            glMatrixMode(GL_MODELVIEW)
-            glLoadIdentity()
+            self._set_gl_projection_matrix()
 
             # dessin du background
             self._plotting(draw_type.WMSBACK)

wolfhece/apps/version.py

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

wolfhece/gpuview.py

@@ -523,6 +523,7 @@ class VectorField(Element_To_Draw):
             glMatrixMode(GL_PROJECTION)
             # glPopMatrix()
             # glLoadIdentity()
+            self.get_mapviewer()._set_gl_projection_matrix()
 
     def _plot(self, projection_matrix):
         assert self._gl_texture is not None, "Did you set the data ?"

wolfhece/mesh2d/wolf2dprev.py

@@ -9488,8 +9488,7 @@ class prev_sim2D():
         """ Common mask for multiblock arrays """
 
         if self.mymnap is not None:
-            # return [cur.array.mask for cur in self.mymnap.myblocks.values()]
-            return [cur.array.data != 1 for cur in self.mymnap.myblocks.values()]
+            return self.mymnap.get_all_masks()
         else:
             return None
 

wolfhece/pyviews.py

@@ -27,15 +27,17 @@ class WolfViews(Element_To_Draw):
 
         super().__init__(idx, plotted, mapviewer, need_for_wx)
 
-        self.view = []
-        self.pals = []
+        self.view = [] # list of elements to plot
+        self.pals = [] # list of palettes to use for the elements
+        self.fix  = [] # list of boolean to fix some elements - avoid to delete OpenGL lists during "delete_lists"
 
     def delete_lists(self):
         """ Delete the lists of elements and palettes."""
 
-        for cur in self.view:
-            if isinstance(cur, WolfArray) or isinstance(cur, WolfArrayMB):
-                cur.delete_lists()
+        for cur, fix in zip(self.view, self.fix):
+            if not fix:
+                if isinstance(cur, WolfArray) or isinstance(cur, WolfArrayMB):
+                    cur.delete_lists()
 
     def read_from_file(self, fn):
         myproject = Wolf_Param(None, filename=fn, toShow=False)
@@ -181,7 +183,7 @@ class WolfViews(Element_To_Draw):
             else:
                 cur.mapviewer = newmapviewer
 
-    def add_elemt(self, added_elemt, pal=None):
+    def add_elemt(self, added_elemt, pal= None, fix= False):
         """ Add an element to the view.
 
         :param added_elemt: Element to add.
@@ -192,8 +194,9 @@ class WolfViews(Element_To_Draw):
 
         self.view.append(added_elemt)
         self.pals.append(pal)
+        self.fix.append(fix)
 
-    def add_elemts(self, added_elemts: list, pals=None):
+    def add_elemts(self, added_elemts: list, pals=None, fixes=None):
         """ Add a list of elements to the view.
 
         :param added_elemts: List of elements to add.
@@ -220,6 +223,21 @@ class WolfViews(Element_To_Draw):
 
             self.pals += pals
 
+        if fixes is None:
+            self.fix += [False]*len(added_elemts)
+        else:
+            if len(fixes) != len(added_elemts):
+                logging.warning('The number of fixes must be the same as the number of elements.')
+
+                if len(fixes) < len(added_elemts):
+                    logging.warning('The missing fixes will be set to None.')
+                    fixes += [False]*(len(added_elemts)-len(fixes))
+                else:
+                    logging.warning('The extra fixes will be ignored.')
+                    fixes = fixes[:len(added_elemts)]
+
+            self.fix += fixes
+
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """ Plot the view. """
 

wolfhece/wolf_array.py

@@ -10165,3 +10165,22 @@ class WolfArrayMNAP(WolfArrayMB):
 
         # Imposition du type de stockage
         self.wolftype = WOLF_ARRAY_MNAP_INTEGER
+
+    def get_one_mask(self, which:int | str):
+        """
+        Return the mask of the block `which`
+        """
+
+        if isinstance(which, int):
+            key = getkeyblock(which)
+        else:
+            key = which
+
+        return self.myblocks[key].array.data != 1
+    
+    def get_all_masks(self):
+        """
+        Return all masks
+        """
+
+        return [curblock.array.data != 1 for curblock in self.myblocks.values()]

wolfhece/wolfresults_2D.py

@@ -2278,7 +2278,7 @@ class Wolfresults_2D(Element_To_Draw):
         """ Common mask for multiblock arrays """
 
         if self.mymnap is not None:
-            return [cur.array.data !=1 for cur in self.mymnap.myblocks.values()]
+            return self.mymnap.get_all_masks()
         else:
             return None
 
@@ -4178,35 +4178,8 @@ class Wolfresults_2D(Element_To_Draw):
         """Dessin OpenGL"""
         self.mimic_plotdata(True)
 
-        if self._which_current_view in VIEWS_COMPLEX:
-            # FIXME : Force to plot all blocks in complex views.
-            #         There is an issue with GPUVIEW
-            if self.plotted:
-                lists = []
-                pals = []
-                for i in range(len(self.myblocks[getkeyblock(0)]._view.view)):
-                    lists.append([cur._view.view[i] for cur in self.myblocks.values()])
-                    pals.append([cur._view.pals[i] for cur in self.myblocks.values()])
-
-                for curlist, curpal in zip(lists, pals):
-                    for cur, pal in zip(curlist, curpal):
-                        oldplotted = cur.plotted
-                        cur.plotted = True
-                        # force True even if not "plotted",
-                        # we must plot all the arrays in a complex view,
-                        # which can use some objects that are not plotted
-                        # as individual arrays (e.g. Topography)
-                        if pal is None:
-                            cur.plot(sx, sy,xmin,ymin,xmax,ymax,size)
-                        else:
-                            oldpal = cur.mypal
-                            cur.mypal = pal
-                            cur.plot(sx, sy,xmin,ymin,xmax,ymax,size)
-                            cur.mypal = oldpal
-                        cur.plotted = oldplotted
-        else:
-            for curblock in self.myblocks.values():
-                curblock.plot(sx, sy,xmin,ymin,xmax,ymax)
+        for curblock in self.myblocks.values():
+            curblock.plot(sx, sy,xmin,ymin,xmax,ymax)
 
         if self.myparam is not None:
             #conditions limites faibles

{wolfhece-2.1.81.dist-info → wolfhece-2.1.83.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.81
+Version: 2.1.83
 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.81.dist-info → wolfhece-2.1.83.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=FB8u0belXOXTb03Ln6RdVWvMgjzi3oGPCmw2dWa3lNg,8332
+wolfhece/PyConfig.py,sha256=UNtl5UzZ399JqjJT67-4DWaIkv76sc1FiEsSDJpXlL0,10458
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=Pwjn5TFcO4OgyA1sdKjfnf-xMnXphiqmdih4_gtr19Q,422813
+wolfhece/PyDraw.py,sha256=3pd5ynlveRs43Qr5eOhcNdkywxPifuq-qnsT5gabImo,425009
 wolfhece/PyGui.py,sha256=HY0beOMSp1JEyq8-vfVynzVrmKxvaO_sJSMwlNqCNrg,105289
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -30,7 +30,7 @@ wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,3
 wolfhece/drawing_obj.py,sha256=7vY04B6r08nurTTFmBXHyR5tVIF1YzAEw_uz4pqTDIw,4233
 wolfhece/flow_SPWMI.py,sha256=XDAelwAY-3rYOR0WKW3fgYJ_r8DU4IP6Y5xULW421tk,20956
 wolfhece/friction_law.py,sha256=MtZJLo-pTj3-Fw-w12z1LSgSIDrH-JGR0iD9wer_fpQ,5498
-wolfhece/gpuview.py,sha256=3QD2GOxbZSsCgGy3krBkH8zBrS5r7oz5KszL2Op8MuY,24142
+wolfhece/gpuview.py,sha256=ggFoxBntUjHqsoxwTZQOE-UsbtC8YAIwZD1i3veAe-o,24204
 wolfhece/import_ascfiles.py,sha256=6Zl8qBR9c6VtyziookQ8YE9KC0GtW_J9WFt5ubyGp-s,4465
 wolfhece/ins.py,sha256=0aU1mo4tYbw64Gwzrqbh-NCTH1tukmk0mpPHjRPHZXU,12661
 wolfhece/irm_qdf.py,sha256=gDuM9sEowQndLTL8vzbZW879M1go2xiKeE4EAJD2bA4,16532
@@ -43,18 +43,18 @@ wolfhece/pydike.py,sha256=hPBQsmSTW4QAp1wcOzb-TL3L7eet2WT1sJx2q-WNQ-Q,2241
 wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
 wolfhece/pypolygons_scen.py,sha256=x-tnYLNq3MPV51NbaU14trgRj8qyUyOrMdF1zDsUX3I,37444
 wolfhece/pyshields.py,sha256=7k-qe2EJgr9fJE62jyPmlWQwRj8T0DK4iuMU844ZhYs,23281
-wolfhece/pyviews.py,sha256=lNoK0LydFbQzVzsLEVGj1Ma1ynoXiUHK10yTBeTeL6M,12824
+wolfhece/pyviews.py,sha256=5Hqqo9MRw1eiomYkmc7QywNu1KmEkytLJG-wH_aG38Y,13748
 wolfhece/pywalous.py,sha256=yRaWJjKckXef1d9D5devP0yFHC9uc6kRV4G5x9PNq9k,18972
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=Vw9z4QWUHH0jXG2WXT0k6BaAjsjldppGbOOaY7bEGLU,401353
+wolfhece/wolf_array.py,sha256=L6OV70nFSmzfO_beNbPRQ_VoklC_cx6fyhoslI3AMXg,401812
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=DS5eobLxrq9ljyebYfpMSQPn8shkUAZZVfqrOKN_QUU,16951
 wolfhece/wolf_tiles.py,sha256=2Ho2I20rHRY81KXxjgLOYISdF4OkJ2d6omeY4shDoGI,10386
 wolfhece/wolf_vrt.py,sha256=89XoDhCJMHiwPQUuOduxtTRKuIa8RDxgNqX65S4xp9M,10569
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
-wolfhece/wolfresults_2D.py,sha256=icmrgbzRn0mMozx1GLrrFJFghzz-MuLgdmi-Kf3vh6Q,169941
+wolfhece/wolfresults_2D.py,sha256=Iq_eOcQ_UkgfWN386oFt_VZysMt8uyYrqd36iAkkM2Q,168473
 wolfhece/xyz_file.py,sha256=Se4nCPwYAYLSA5i0zsbnZUKoAMAD0mK1FJea5WSZUkk,5755
 wolfhece/acceptability/Parallels.py,sha256=h4tu3SpC_hR5Hqa68aruxhtAyhs8u666YuZ40_fR5zg,3979
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
@@ -74,7 +74,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=84BbOWuyjD0m7UKJmKJ4diPd2VS3kshthkwN_wFUto8,388
+wolfhece/apps/version.py,sha256=KzR1Tx9_pol7yT3-9TgcRyZl_hDj4MJt6tFSuPhNaS0,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
@@ -220,7 +220,7 @@ wolfhece/mesh2d/bc_manager.py,sha256=QTGkb5TR8Y5xVnGUXPXzscGyTEQ6PA8CZPkVNwrlR1Y
 wolfhece/mesh2d/cell_tracker.py,sha256=mPmnD5lEf3gLPuLqtAIo-Gp-ipAwQdPxzjWOGt0b7jM,8958
 wolfhece/mesh2d/config_manager.py,sha256=DcdxCIIs_dyC6ayJOBULeY364LONogL9PBaqBtC9eQ4,14736
 wolfhece/mesh2d/cst_2D_boundary_conditions.py,sha256=Y4DF68uAklF3fXJgf05nb_JvJk2pvzcu_wu5nFXpWJo,5008
-wolfhece/mesh2d/wolf2dprev.py,sha256=kAqRxVlMEkDciEXTgbX6xz6Ck3OqQsSz1IF8NTbnbmM,491575
+wolfhece/mesh2d/wolf2dprev.py,sha256=CvCsutTwLr-BIxzYpzbg3YxIASJtMMtJpuZ77gxCue8,491460
 wolfhece/models/5_coul.pal,sha256=OI1UqcNIDBpJn2k_VDel__r-hKjjvdob0eqinGCI3QY,160
 wolfhece/models/6_coul.pal,sha256=z7NK2dg0tAQBUweRQV54dIwJbPM1U5y1AR2LLw19Idw,148
 wolfhece/models/7_coul.pal,sha256=XTnnUyCE8ONokScB2YzYDnSTft7E6sppmr7P-XwMsCE,205
@@ -284,8 +284,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.81.dist-info/METADATA,sha256=82JlbxS-qLm_YgV4kDhs_mxseccct_N3ktWr2kCqQeU,2570
-wolfhece-2.1.81.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-wolfhece-2.1.81.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.81.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.81.dist-info/RECORD,,
+wolfhece-2.1.83.dist-info/METADATA,sha256=RlMzEF3E8tKoXAC9knM-5KQ9yNAfbnhG0fZPg_pa6oc,2570
+wolfhece-2.1.83.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+wolfhece-2.1.83.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.83.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.83.dist-info/RECORD,,