wolfhece 2.1.115__py3-none-any.whl → 2.1.116__py3-none-any.whl

wolfhece/PyConfig.py

@@ -26,6 +26,8 @@ class ConfigurationKeys(Enum):
     PLAY_WELCOME_SOUND = "PlayWelcomeSound"
     TICKS_SIZE = "TicksSize"
     TICKS_BOUNDS = "TicksBounds"
+    TICKS_XROTATION = "TicksXRotation"
+    TICKS_FONTSIZE = "TicksFontSize"
     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"
@@ -72,7 +74,10 @@ class WolfConfiguration:
             ConfigurationKeys.ACTIVE_RES2D_PALETTE_FOR_IMAGE.value: False,
             ConfigurationKeys.TICKS_BOUNDS.value: True,
             ConfigurationKeys.COLOR_BACKGROUND.value: [255, 255, 255, 255],
-            ConfigurationKeys.ASSEMBLY_IMAGES.value: 0
+            ConfigurationKeys.ASSEMBLY_IMAGES.value: 0,
+            ConfigurationKeys.TICKS_XROTATION.value: 30.,
+            ConfigurationKeys.TICKS_FONTSIZE.value: 12
+
         }
         self._types = {
             ConfigurationKeys.VERSION.value: int,
@@ -82,7 +87,9 @@ class WolfConfiguration:
             ConfigurationKeys.ACTIVE_RES2D_PALETTE_FOR_IMAGE.value: bool,
             ConfigurationKeys.TICKS_BOUNDS.value: bool,
             ConfigurationKeys.COLOR_BACKGROUND.value: list,
-            ConfigurationKeys.ASSEMBLY_IMAGES.value: int
+            ConfigurationKeys.ASSEMBLY_IMAGES.value: int,
+            ConfigurationKeys.TICKS_XROTATION.value: float,
+            ConfigurationKeys.TICKS_FONTSIZE.value: int
         }
 
         self._check_config()
@@ -140,6 +147,8 @@ class GlobalOptionsDialog(wx.Dialog):
         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])
+        self.cfg_ticks_xrotation.SetValue(str(configuration[ConfigurationKeys.TICKS_XROTATION]))
+        self.cfg_ticks_fontsize.SetValue(str(configuration[ConfigurationKeys.TICKS_FONTSIZE]))
 
     def pull_configuration(self, configuration):
         configuration[ConfigurationKeys.PLAY_WELCOME_SOUND] = self.cfg_welcome_voice.IsChecked()
@@ -149,6 +158,8 @@ class GlobalOptionsDialog(wx.Dialog):
         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()
+        configuration[ConfigurationKeys.TICKS_XROTATION] = float(self.cfg_ticks_xrotation.Value)
+        configuration[ConfigurationKeys.TICKS_FONTSIZE] = int(self.cfg_ticks_fontsize.Value)
 
     def InitUI(self):
 
@@ -193,10 +204,26 @@ class GlobalOptionsDialog(wx.Dialog):
         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 )
 
+        self.label_ticks_xrotation = wx.StaticText(pnl, label=_('X rotation of ticks [°]'))
+        self.cfg_ticks_xrotation = wx.TextCtrl(pnl, value='30.',style = wx.TE_CENTRE )
+
+        self.label_ticks_fontsize = wx.StaticText(pnl, label=_('Font size of ticks'))
+        self.cfg_ticks_fontsize = wx.TextCtrl(pnl, value='12',style = wx.TE_CENTRE )
+
         hboxticks.Add(self.label_ticks_size, 1, wx.EXPAND)
         hboxticks.Add(self.cfg_ticks_size, 1, wx.EXPAND, 5)
         sbs.Add(hboxticks, 1, wx.EXPAND,5)
 
+        hboxticksxrotation = wx.BoxSizer(wx.HORIZONTAL)
+        hboxticksxrotation.Add(self.label_ticks_xrotation, 1, wx.EXPAND)
+        hboxticksxrotation.Add(self.cfg_ticks_xrotation, 1, wx.EXPAND, 5)
+        sbs.Add(hboxticksxrotation, 1, wx.EXPAND,5)
+
+        hboxticksfontsize = wx.BoxSizer(wx.HORIZONTAL)
+        hboxticksfontsize.Add(self.label_ticks_fontsize, 1, wx.EXPAND)
+        hboxticksfontsize.Add(self.cfg_ticks_fontsize, 1, wx.EXPAND, 5)
+        sbs.Add(hboxticksfontsize, 1, wx.EXPAND,5)
+
         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)

wolfhece/PyDraw.py

@@ -2283,21 +2283,33 @@ class WolfMapViewer(wx.Frame):
                 dlg.Destroy()
                 return
 
-            for curmodel in self.iterator_over_objects(draw_type.RES2D):
+            pgbar = wx.ProgressDialog(_('Setting epsilon'), _('Setting epsilon'), maximum = len(self.myres2D), parent=self, style = wx.PD_APP_MODAL | wx.PD_AUTO_HIDE)
+
+            for id, curmodel in enumerate(self.iterator_over_objects(draw_type.RES2D)):
                 curmodel: Wolfresults_2D
                 curmodel.epsilon = neweps
                 curmodel._epsilon_default = neweps
                 curmodel.read_oneresult(curmodel.current_result)
                 curmodel.set_currentview()
 
+                pgbar.Update(id, _('Setting epsilon for result {}'.format(curmodel.idx)))
+
+            pgbar.Destroy()
+
         elif itemlabel == _("Filter independent"):
 
             self.menu_filter_independent.IsChecked = not self.menu_filter_independent.IsChecked
 
-            for curmodel in self.iterator_over_objects(draw_type.RES2D):
+            pgbar = wx.ProgressDialog(_('Filtering independent zones'), _('Filtering independent zones'), maximum = len(self.myres2D), parent=self, style = wx.PD_APP_MODAL | wx.PD_AUTO_HIDE)
+
+            for id, curmodel in enumerate(self.iterator_over_objects(draw_type.RES2D)):
                 curmodel: Wolfresults_2D
                 curmodel.to_filter_independent = not self.menu_filter_independent.IsChecked
 
+                pgbar.Update(id, _('Filtering independent zones for result {}'.format(curmodel.idx)))
+
+            pgbar.Destroy()
+
         # elif itemlabel == _("Manage boundary conditions..."):
 
         #     if self.active_res2d is not None:
@@ -2988,6 +3000,26 @@ class WolfMapViewer(wx.Frame):
         else:
             return config[ConfigurationKeys.TICKS_SIZE]
 
+    @property
+    def ticks_xrotation(self) -> float:
+        """ Return the ticks x rotation from configs """
+
+        config = self.get_configuration()
+        if config is None:
+            return 30.
+        else:
+            return config[ConfigurationKeys.TICKS_XROTATION]
+
+    @property
+    def ticks_fontsize(self) -> int:
+        """ Return the ticks font size from configs """
+
+        config = self.get_configuration()
+        if config is None:
+            return 14
+        else:
+            return config[ConfigurationKeys.TICKS_FONTSIZE]
+
     @property
     def assembly_mode(self) -> str:
         """ Return the assembly mode from configs """
@@ -3182,187 +3214,10 @@ class WolfMapViewer(wx.Frame):
             return
         self.start_action('rotate triangles', 'Rotate the current triangulation -- Please select 1 point for the center')
 
-    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
 
-        :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():
-
-                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))
-                metadata.add_text('ymin', str(self.ymin))
-                metadata.add_text('xmax', str(self.xmax))
-                metadata.add_text('ymax', str(self.ymax))
-
-                if mpl:
-                    if ds == 0.:
-                        ds = self.ticks_size # Global parameters
-
-                        if ds == 0.:
-                            ds = 100.
-
-                        nb_ticks_x = (self.xmax - self.xmin) // ds
-                        nb_ticks_y = (self.ymax - self.ymin) // ds
-
-                        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)
-                    fig, ax = plt.subplots(1, 1)
-
-                    w, h = [self.width, self.height]
-
-                    # neww = figsizes[0]/figsizes[1] *h
-                    neww = figsizes[0]
-                    newh = h/w * figsizes[0]
-
-                    fig.set_size_inches(neww, newh)
-
-                    pos = ax.imshow(myimage,
-                                    origin='upper',
-                                    extent=extent)
-
-                    x1 = np.ceil((self.xmin // ds) * ds)
-                    if x1 < self.xmin:
-                        x1 += ds
-                    x2 = int((self.xmax // ds) * ds)
-                    if x2 > self.xmax:
-                        x2 -= ds
-                    y1 = np.ceil((self.ymin // ds) * ds)
-                    if y1 < self.ymin:
-                        y1 += ds
-                    y2 = int((self.ymax // ds) * ds)
-                    if y2 > self.ymax:
-                        y2 -= ds
-
-                    x_label_list = np.linspace(x1, x2, int((x2 - x1) / ds) + 1, True)
-                    if self.ticks_bounds:
-                        x_label_list = np.insert(x_label_list, 0, self.xmin)
-                        x_label_list = np.insert(x_label_list, -1, self.xmax)
-                        x_label_list = np.unique(x_label_list)
-
-                    y_label_list = np.linspace(y1, y2, int((y2 - y1) / ds) + 1, True)
-                    if self.ticks_bounds:
-                        y_label_list = np.insert(y_label_list, 0, self.ymin)
-                        y_label_list = np.insert(y_label_list, -1, self.ymax)
-                        y_label_list = np.unique(y_label_list)
-
-                    ax.set_xticks(x_label_list)
-                    ax.set_yticks(y_label_list)
-
-                    ax.set_xticklabels(plt.FormatStrFormatter('%.1f').format_ticks(x_label_list), fontsize=14, rotation=30)
-                    ax.set_yticklabels(plt.FormatStrFormatter('%.1f').format_ticks(y_label_list), fontsize=14)
-
-                    ax.set_xlabel('X [m]')
-                    ax.set_ylabel('Y [m]')
-
-                    #création de 2 buffers
-                    buf = io.BytesIO()
-                    #sauvegarde de la figure au format png
-                    fig.tight_layout()
-                    fig.savefig(buf, format='png')
-
-                    #déplacement au début du buffer
-                    buf.seek(0)
-                    #lecture du buffer et conversion en image avec PIL
-                    im = Image.open(buf)
-
-                    if palette is None:
-                        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:
-                        if palette.values is not None:
-                            bufpal = io.BytesIO()
-                            palette.export_image(bufpal,'v')
-                            bufpal.seek(0)
-
-                            #lecture du buffer et conversion en image avec PIL
-                            impal = Image.open(bufpal)
-                            impal = impal.resize((int(impal.size[0]*im.size[1]*.8/impal.size[1]),int(im.size[1]*.8)))
-
-                            imnew = Image.new('RGB',(im.size[0]+impal.size[0], im.size[1]), (255,255,255))
-
-                            # On colle l'image du buffer et la palette pour ne former qu'une seul image à copier dans le clipboard
-                            imnew.paste(im.convert('RGB'),(0,0))
-                            imnew.paste(impal.convert('RGB'),(im.size[0]-10, int((im.size[1]-impal.size[1])/3)))
-                            im=imnew
-                        else:
-                            imnew = Image.new('RGB', (im.size[0], im.size[1]), (255,255,255))
-
-                            # On colle l'image du buffer et la palette pour ne former qu'une seul image à copier dans le clipboard
-                            imnew.paste(im.convert('RGB'),(0,0))
-                            im=imnew
-                    else:
-                        imnew = Image.new('RGB', (im.size[0], im.size[1]), (255,255,255))
-
-                        # On colle l'image du buffer et la palette pour ne former qu'une seul image à copier dans le clipboard
-                        imnew.paste(im.convert('RGB'),(0,0))
-                        im=imnew
-
-                    #création d'un objet bitmap wx
-                    wxbitmap = wx.Bitmap().FromBuffer(im.width,im.height,im.tobytes())
-
-                    # objet wx exportable via le clipboard
-                    dataobj = wx.BitmapDataObject()
-                    dataobj.SetBitmap(wxbitmap)
-
-                    wx.TheClipboard.SetData(dataobj)
-                    wx.TheClipboard.Close()
-
-                    fig.set_visible(False)
-
-                    buf.close()
-
-                    return fig, ax, im
-
-                else:
-                    """ Création d'un objet bitmap wx sur base du canvas
-                    et copie dans le clipboard
-                    """
-                    # wxbitmap = wx.Bitmap().FromBuffer(myimage.width,myimage.height,myimage.tobytes())
-                    wxbitmap = wx.Bitmap().FromBufferRGBA(myimage.width,myimage.height,myimage.tobytes())
-
-                    # objet wx exportable via le clipboard
-                    dataobj = wx.BitmapDataObject()
-                    dataobj.SetBitmap(wxbitmap)
-
-                    wx.TheClipboard.SetData(dataobj)
-                    wx.TheClipboard.Close()
-
-                    return myimage
-
-        else:
-            wx.MessageBox("Can't open the clipboard", "Error")
-
-    def display_canvasogl(self,mpl =True, ds=0., fig: Figure = None, ax: Axes = None, clear = True, redraw =True, palette=False, title=''):
+    def display_canvasogl(self, mpl =True,
+                          ds=0., fig: Figure = None, ax: Axes = None,
+                          clear = True, redraw =True, palette=False, title=''):
         """
         This method takes a matplotlib figure and axe and,
         returns a clear screenshot of the information displayed in the wolfpy GUI.
@@ -3418,19 +3273,22 @@ class WolfMapViewer(wx.Frame):
                 myax.set_xticks(x_label_list)
                 myax.set_yticks(y_label_list)
 
-                myax.set_xticklabels(FormatStrFormatter('%.1f').format_ticks(x_label_list), fontsize = 'xx-small', rotation = 90)
-                myax.set_yticklabels(FormatStrFormatter('%.1f').format_ticks(y_label_list), fontsize='xx-small')
+                myax.set_xticklabels(FormatStrFormatter('%.1f').format_ticks(x_label_list),
+                                     fontsize = self.ticks_fontsize, rotation = self.ticks_xrotation)
+                myax.set_yticklabels(FormatStrFormatter('%.1f').format_ticks(y_label_list),
+                                     fontsize = self.ticks_fontsize)
                 myax.xaxis.set_ticks_position('top')
                 myax.xaxis.set_label_position('top')
 
-                myax.set_xlabel('X - coordinates ($m$)')
-                myax.set_ylabel('Y - coordinates ($m$)')
+                myax.set_xlabel('X ($m$)')
+                myax.set_ylabel('Y ($m$)')
                 myax.xaxis.set_ticks_position('bottom')
                 myax.xaxis.set_label_position('bottom')
 
                 if title!='':
                     myax.set_title(title)
 
+                fig.tight_layout()
                 fig.canvas.draw()
                 fig.canvas.flush_events()
 
@@ -3605,12 +3463,188 @@ class WolfMapViewer(wx.Frame):
 
             return myimage
 
+    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
+
+        :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():
+
+                myimage = self.get_canvas_as_image()
+
+                metadata = PngInfo()
+                metadata.add_text('xmin', str(self.xmin))
+                metadata.add_text('ymin', str(self.ymin))
+                metadata.add_text('xmax', str(self.xmax))
+                metadata.add_text('ymax', str(self.ymax))
+
+                if mpl:
+                    if ds == 0.:
+                        ds = self.ticks_size # Global parameters
+
+                        if ds == 0.:
+                            ds = 100.
+
+                        nb_ticks_x = (self.xmax - self.xmin) // ds
+                        nb_ticks_y = (self.ymax - self.ymin) // ds
+
+                        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'un graphique Matplotlib
+                    extent = (self.xmin, self.xmax, self.ymin, self.ymax)
+                    fig, ax = plt.subplots(1, 1)
+
+                    w, h = [self.width, self.height]
+
+                    neww = figsizes[0]
+                    newh = h/w * figsizes[0]
+
+                    fig.set_size_inches(neww, newh)
+
+                    pos = ax.imshow(myimage,
+                                    origin='upper',
+                                    extent=extent)
+
+                    x1 = np.ceil((self.xmin // ds) * ds)
+                    if x1 < self.xmin:
+                        x1 += ds
+                    x2 = int((self.xmax // ds) * ds)
+                    if x2 > self.xmax:
+                        x2 -= ds
+                    y1 = np.ceil((self.ymin // ds) * ds)
+                    if y1 < self.ymin:
+                        y1 += ds
+                    y2 = int((self.ymax // ds) * ds)
+                    if y2 > self.ymax:
+                        y2 -= ds
+
+                    x_label_list = np.linspace(x1, x2, int((x2 - x1) / ds) + 1, True)
+                    if self.ticks_bounds:
+                        x_label_list = np.insert(x_label_list, 0, self.xmin)
+                        x_label_list = np.insert(x_label_list, -1, self.xmax)
+                        x_label_list = np.unique(x_label_list)
+
+                    y_label_list = np.linspace(y1, y2, int((y2 - y1) / ds) + 1, True)
+                    if self.ticks_bounds:
+                        y_label_list = np.insert(y_label_list, 0, self.ymin)
+                        y_label_list = np.insert(y_label_list, -1, self.ymax)
+                        y_label_list = np.unique(y_label_list)
+
+                    ax.set_xticks(x_label_list)
+                    ax.set_yticks(y_label_list)
+
+                    ax.set_xticklabels(plt.FormatStrFormatter('%.1f').format_ticks(x_label_list),
+                                       fontsize = self.ticks_fontsize, rotation = self.ticks_xrotation)
+                    ax.set_yticklabels(plt.FormatStrFormatter('%.1f').format_ticks(y_label_list),
+                                       fontsize = self.ticks_fontsize)
+
+                    ax.set_xlabel('X ($m$)')
+                    ax.set_ylabel('Y ($m$)')
+
+                    fig.tight_layout()
+
+                    #création d'un'buffers
+                    buf = io.BytesIO()
+                    #sauvegarde de la figure au format png
+                    fig.savefig(buf, format='png')
+
+                    #déplacement au début du buffer
+                    buf.seek(0)
+                    #lecture du buffer et conversion en image avec PIL
+                    im = Image.open(buf)
+
+                    if palette is None:
+                        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:
+                        if palette.values is not None:
+                            bufpal = io.BytesIO()
+                            palette.export_image(bufpal,'v')
+                            bufpal.seek(0)
+
+                            #lecture du buffer et conversion en image avec PIL
+                            impal = Image.open(bufpal)
+                            impal = impal.resize((int(impal.size[0]*im.size[1]*.8/impal.size[1]),int(im.size[1]*.8)))
+
+                            imnew = Image.new('RGB',(im.size[0]+impal.size[0], im.size[1]), (255,255,255))
+
+                            # On colle l'image du buffer et la palette pour ne former qu'une seul image à copier dans le clipboard
+                            imnew.paste(im.convert('RGB'),(0,0))
+                            imnew.paste(impal.convert('RGB'),(im.size[0]-10, int((im.size[1]-impal.size[1])/3)))
+                            im=imnew
+                            bufpal.close()
+                        else:
+                            imnew = Image.new('RGB', (im.size[0], im.size[1]), (255,255,255))
+
+                            # On colle l'image du buffer et la palette pour ne former qu'une seul image à copier dans le clipboard
+                            imnew.paste(im.convert('RGB'),(0,0))
+                            im=imnew
+                    else:
+                        imnew = Image.new('RGB', (im.size[0], im.size[1]), (255,255,255))
+
+                        # On colle l'image du buffer et la palette pour ne former qu'une seul image à copier dans le clipboard
+                        imnew.paste(im.convert('RGB'),(0,0))
+                        im=imnew
+
+                    #création d'un objet bitmap wx
+                    wxbitmap = wx.Bitmap().FromBuffer(im.width,im.height,im.tobytes())
+
+                    # objet wx exportable via le clipboard
+                    dataobj = wx.BitmapDataObject()
+                    dataobj.SetBitmap(wxbitmap)
+
+                    wx.TheClipboard.SetData(dataobj)
+                    wx.TheClipboard.Close()
+
+                    fig.set_visible(False)
+
+                    buf.close()
+
+                    return fig, ax, im
+
+                else:
+                    """ Création d'un objet bitmap wx sur base du canvas
+                    et copie dans le clipboard
+                    """
+                    # wxbitmap = wx.Bitmap().FromBuffer(myimage.width,myimage.height,myimage.tobytes())
+                    wxbitmap = wx.Bitmap().FromBufferRGBA(myimage.width,myimage.height,myimage.tobytes())
+
+                    # objet wx exportable via le clipboard
+                    dataobj = wx.BitmapDataObject()
+                    dataobj.SetBitmap(wxbitmap)
+
+                    wx.TheClipboard.SetData(dataobj)
+                    wx.TheClipboard.Close()
+
+                    return myimage
+
+        else:
+            wx.MessageBox("Can't open the clipboard", "Error")
+
     def save_canvasogl(self,
                        fn:str='',
                        mpl:bool=True,
                        ds:float=0.,
                        dpi:int= 300,
-                       add_title:bool = False):
+                       add_title:bool = False,
+                       figsizes= [10.,10.],
+                       arrayid_as_title:bool = False):
         """
         Sauvegarde de la fenêtre d'affichage dans un fichier
 
@@ -3619,6 +3653,7 @@ class WolfMapViewer(wx.Frame):
         :param ds: Ticks interval
         """
 
+        # FIXME : SHOULD BE MERGEd WITH copy_canvasogl
         fn = str(fn)
 
         if fn == '':
@@ -3634,19 +3669,7 @@ class WolfMapViewer(wx.Frame):
             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)
-
-            myimage = self.get_canvas_as_image()
-
-            metadata = PngInfo()
-            metadata.add_text('xmin', str(self.xmin))
-            metadata.add_text('ymin', str(self.ymin))
-            metadata.add_text('xmax', str(self.xmax))
-            metadata.add_text('ymax', str(self.ymax))
+            self.Paint()
 
             if mpl:
                 if ds == 0.:
@@ -3664,69 +3687,70 @@ class WolfMapViewer(wx.Frame):
                     ds = float(dlg.GetValue())
                     dlg.Destroy()
 
+                # Création d'un graphique Matplotlib
                 extent = (self.xmin, self.xmax, self.ymin, self.ymax)
-                # fig, ax = plt.subplots(1, 1)
-                fig,axes = plt.subplots(1,2, gridspec_kw={'width_ratios': [20, 1]})
+                fig, ax = plt.subplots(1, 1)
+                w, h = [self.width, self.height]
 
-                ax = axes[0]
-                self.display_canvasogl(fig=fig,ax=axes[0])
+                neww = figsizes[0]
+                newh = h/w * figsizes[0]
 
-                # pos = ax.imshow(myimage, origin='upper',
-                #           extent=extent)
-                # fig.colorbar(pos,ax=ax)
+                fig.set_size_inches(neww, newh)
 
-                x1 = np.ceil((self.xmin // ds) * ds)
-                if x1 < self.xmin:
-                    x1 += ds
-                x2 = int((self.xmax // ds) * ds)
-                if x2 > self.xmax:
-                    x2 -= ds
-                y1 = np.ceil((self.ymin // ds) * ds)
-                if y1 < self.ymin:
-                    y1 += ds
-                y2 = int((self.ymax // ds) * ds)
-                if y2 > self.ymax:
-                    y2 -= ds
+                pot_title = self.viewer_name
+                if arrayid_as_title:
+                    pot_title = self.active_array.idx
 
-                x_label_list = np.linspace(x1, x2, int((x2 - x1) / ds) + 1, True)
-                x_label_list = np.insert(x_label_list, 0, self.xmin)
-                x_label_list = np.insert(x_label_list, -1, self.xmax)
-                x_label_list = np.unique(x_label_list)
+                self.display_canvasogl(fig=fig,
+                                       ax=ax,
+                                       title=pot_title if add_title else '',
+                                       ds = ds)
 
-                y_label_list = np.linspace(y1, y2, int((y2 - y1) / ds) + 1, True)
-                y_label_list = np.insert(y_label_list, 0, self.ymin)
-                y_label_list = np.insert(y_label_list, -1, self.ymax)
-                y_label_list = np.unique(y_label_list)
+                #création d'un'buffers
+                buf = io.BytesIO()
+                #sauvegarde de la figure au format png
+                fig.savefig(buf, format='png')
 
-                ax.set_xticks(x_label_list)
-                ax.set_yticks(y_label_list)
+                #déplacement au début du buffer
+                buf.seek(0)
+                #lecture du buffer et conversion en image avec PIL
+                im = Image.open(buf)
 
-                ax.set_xticklabels(plt.FormatStrFormatter('%.1f').format_ticks(x_label_list), fontsize=8, rotation=30)
-                ax.set_yticklabels(plt.FormatStrFormatter('%.1f').format_ticks(y_label_list), fontsize=8)
+                if self.palette_for_copy.values is not None:
+                    bufpal = io.BytesIO()
+                    self.palette_for_copy.export_image(bufpal,'v')
+                    bufpal.seek(0)
 
-                ax.set_xlabel('X [m]')
-                ax.set_ylabel('Y [m]')
+                    #lecture du buffer et conversion en image avec PIL
+                    impal = Image.open(bufpal)
+                    impal = impal.resize((int(impal.size[0]*im.size[1]*.8/impal.size[1]),int(im.size[1]*.8)))
 
-                if self.palette_for_copy.values is not None:
-                    self.palette_for_copy.export_image(None, h_or_v='v', figax=(fig,axes[1]))
-                else:
-                    axes[1].clear()
-                    axes[1].axis('off')
+                    imnew = Image.new('RGB',(im.size[0]+impal.size[0], im.size[1]), (255,255,255))
 
-                # 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]))
+                    # On colle l'image du buffer et la palette pour ne former qu'une seul image à copier dans le clipboard
+                    imnew.paste(im.convert('RGB'),(0,0))
+                    imnew.paste(impal.convert('RGB'),(im.size[0]-10, int((im.size[1]-impal.size[1])/3)))
+                    im=imnew
+                    bufpal.close()
+                else:
+                    imnew = Image.new('RGB', (im.size[0], im.size[1]), (255,255,255))
 
-                # self.Paint()
+                    # On colle l'image du buffer et la palette pour ne former qu'une seul image à copier dans le clipboard
+                    imnew.paste(im.convert('RGB'),(0,0))
+                    im=imnew
 
-                if add_title:
-                    ax.set_title(self.viewer_name)
-                fig.set_size_inches(12, 10)
-                fig.tight_layout()
+                im.save(fn, dpi=(dpi, dpi))
+                fig.set_visible(False)
+                buf.close()
 
-                fig.savefig(fn, dpi=dpi)
             else:
+                metadata = PngInfo()
+                metadata.add_text('xmin', str(self.xmin))
+                metadata.add_text('ymin', str(self.ymin))
+                metadata.add_text('xmax', str(self.xmax))
+                metadata.add_text('ymax', str(self.ymax))
+
+                myimage = self.get_canvas_as_image()
                 myimage.save(fn, pnginfo=metadata)
 
             return fn, ds
@@ -5622,7 +5646,9 @@ class WolfMapViewer(wx.Frame):
 
         self.currently_readresults = True
 
-        for curmodel in self.iterator_over_objects(draw_type.RES2D):
+        pgbar = wx.ProgressDialog(_('Reading results'), _('Reading results'), maximum=len(self.myres2D), parent=self, style=wx.PD_APP_MODAL | wx.PD_AUTO_HIDE)
+
+        for id, curmodel in enumerate(self.iterator_over_objects(draw_type.RES2D)):
             curmodel: Wolfresults_2D
             logging.info(_('Updating {} - Last result'.format(curmodel.idx)))
 
@@ -5630,6 +5656,10 @@ class WolfMapViewer(wx.Frame):
             curmodel.set_currentview()
             self._update_sim_explorer(curmodel)
 
+            pgbar.Update(id + 1, _('Reading results') + ' - ' + curmodel.idx)
+
+        pgbar.Destroy()
+
         self.Refresh()
         self.currently_readresults = False
         self._update_mytooltip()
@@ -6594,8 +6624,21 @@ class WolfMapViewer(wx.Frame):
 
             nb = dlg.GetValue()
             dlg.Destroy()
-            for i in range(nb):
-                self.add_viewer_and_link()
+
+            if nb > 0:
+
+                # Renaming the current viewer
+                dlg = wx.TextEntryDialog(None, _('New name for the current viewer'), _('Rename'), self.viewer_name, style=wx.OK | wx.CANCEL)
+                ret = dlg.ShowModal()
+                if ret == wx.ID_OK:
+                    self.viewer_name = dlg.GetValue()
+                    self.SetName(self.viewer_name)
+                dlg.Destroy()
+
+                for i in range(nb):
+                    self.add_viewer_and_link()
+            else:
+                logging.warning(_('No additional viewer !'))
 
         elif itemlabel == _('3D viewer'):
 
@@ -7503,6 +7546,44 @@ class WolfMapViewer(wx.Frame):
 
         return ret
 
+    def save_arrays_indep(self, fn:str, mpl:bool= True, ds:float= 0., add_title:bool= True) -> tuple[(str, float), str]:
+        """ Save each array in a separate file
+
+        :param fn: filename without extension -- '.png' will be added
+        :param mpl: save as matplotlib image
+        :param ds: Ticks size for matplotlib image
+        :return: list of tuple ((filename, ds), viewer_name)
+        """
+
+        # Get all checked arrays
+        checked_arrays = self.get_list_keys(drawing_type= draw_type.ARRAYS, checked_state= True)
+        old_active = self.active_array
+
+        if len(checked_arrays) == 0:
+            logging.warning(_('No arrays checked for export'))
+            return
+
+        def uncheck_all():
+            # uncheck arrays
+            for curarray in checked_arrays:
+                self.uncheck_id(curarray, unload= False, forceresetOGL= False)
+
+        fn = str(fn)
+        ret = []
+        for idx, curel in enumerate(checked_arrays):
+            uncheck_all()
+            self.check_id(curel)
+            self.active_array = self.get_obj_from_id(curel, drawtype= draw_type.ARRAYS)
+            ret.append((self.save_canvasogl(fn + '_' + str(idx) + '.png', mpl, ds, add_title= add_title, arrayid_as_title=True), curel))
+
+        self.active_array = old_active
+        for curarray in checked_arrays:
+            self.check_id(curarray)
+
+        self.Refresh()
+
+        return ret
+
     def assembly_images(self, all_images, mode:Literal['horizontal', 'vertical', 'square']= 'square'):
         """ Assembly images
 
@@ -7518,6 +7599,9 @@ class WolfMapViewer(wx.Frame):
 
         images = [Image.open(fn) for (fn, ds), viewername in all_images]
 
+        if len(images) in [1,2] and (mode == 'square' or mode == 2):
+            mode = 'horizontal'
+
         widths, heights = zip(*(i.size for i in images))
 
         if mode == 'horizontal' or mode==0:
@@ -8858,6 +8942,24 @@ class WolfMapViewer(wx.Frame):
             else:
                 logging.warning(_('Rebin not yet implemented for this type of object'))
 
+        elif text == _('Set NullValue'):
+
+            if isinstance(self.selected_object, WolfArray):
+                dlg = wx.TextEntryDialog(self, _('Enter the new null value :'), _('Set NullValue'), str(self.selected_object.array.data[0,0]))
+                if dlg.ShowModal() == wx.ID_OK:
+                    res = dlg.GetValue()
+                    dlg.Destroy()
+
+                    try:
+                        res = float(res)
+                        self.selected_object.nullvalue = res
+                        self.selected_object.mask_data(res)
+                        self.selected_object.reset_plot()
+                        self.Refresh()
+                    except:
+                        logging.warning(_('Invalid value for null value'))
+                        return
+
         elif _('Convert to mono-block') in text:
 
             if isinstance(self.selected_object, WolfArrayMB):
@@ -8892,6 +8994,30 @@ class WolfMapViewer(wx.Frame):
             else:
                 logging.warning(_('Convert to multi-blocks not yet implemented for this type of object'))
 
+        elif _('Extract current step as IC') in text:
+
+            if isinstance(self.selected_object, Wolfresults_2D):
+
+                if self.selected_object.current_result is None or self.selected_object.current_result < 0 :
+                    logging.warning(_('No current step defined'))
+                    return
+
+                import shutil
+
+                logging.info(_('Extracting current step as IC'))
+
+                dir = Path(self.selected_object.filename).parent
+                files = ['h.npy', 'qx.npy', 'qy.npy']
+                for curfile in files:
+                    if (dir / curfile).exists():
+                        # prepend the file with __
+                        logging.info(f'File {curfile} already exists -- renaming it')
+                        shutil.copyfile(dir / curfile, dir / ('__' + curfile))
+
+                logging.info(_('Extracting current step as IC'))
+                self.selected_object.export_as(Path(self.selected_object.filename).parent, [views_2D.WATERDEPTH, views_2D.QX, views_2D.QY], 'numpy', False)
+                logging.info(_('Done !'))
+
         elif _('Export to Shape file') in text:
 
             if isinstance(self.selected_object, Zones | Bridge | Weir):
@@ -10588,6 +10714,8 @@ class WolfMapViewer(wx.Frame):
         #     CTRL+L : chargement d'une matrice sur base du nom de fichier de la tile\n \
         #     \n \
         #     ALT+C : Copy image"
+        #     ALT+SHIFT+C : Copy images from multiviewers \
+        #     CTRL+ALT+SHIFT+C : Copy images from all arrays as independent image \
 
         groups = ['Results', 'Particle system', 'Drawing', 'Arrays', 'Cross sections', 'Zones', 'Action', 'Tree', 'Tiles', 'GLTF/GLB', 'App']
 
@@ -10619,7 +10747,8 @@ class WolfMapViewer(wx.Frame):
                      'Arrows': _('Drawing : lateral movements'),
                      'c or C': _('Drawing : copy canvas to Clipboard wo axes'),
                      'ALT+C': _('Drawing : copy canvas to Clipboard as Matplotlib image'),
-                     'ALT+SHIFT+C': _('Drawing : copy canvas to Clipboard as Matplotlib image with axes - linked arrays'),
+                     'ALT+SHIFT+C': _('Drawing : copy canvas to Clipboard as Matplotlib image with axes - multiviewers'),
+                     'CTRL+ALT+SHIFT+C': _('Drawing : copy canvas to Clipboard as Matplotlib image with axes - all arrays one by one'),
 
                      'CTRL+o': _('Results : increase transparency of the current result'),
                      'CTRL+O': _('Results : decrease transparency of the current result'),
@@ -10940,12 +11069,20 @@ class WolfMapViewer(wx.Frame):
                 # Copie du canvas dans le clipboard pour transfert vers autre application
                 # Copie des canvas liés
 
+                if not self.linked:
+                    logging.error(_('No linked canvas to copy -- calling ALT+C instead'))
+                    self.copy_canvasogl()
+                    return
+
                 from tempfile import TemporaryDirectory
 
                 logging.info(_('Creating images'))
 
                 with TemporaryDirectory() as tmpdirname:
                     all_images = self.save_linked_canvas(Path(tmpdirname) / 'fig', mpl= True, ds= self.ticks_size, add_title= True)
+                    if len(all_images) == 0:
+                        logging.error(_('No image to combine -- aborting !'))
+                        return
                     im_assembly = self.assembly_images(all_images, mode= self.assembly_mode)
 
                 logging.info(_('Creating images - done'))
@@ -10998,7 +11135,44 @@ class WolfMapViewer(wx.Frame):
 
                 logging.info(_('Values copied to clipboard'))
 
-            elif key == ord('C') and ctrldown and altdown:
+            elif key == ord('C') and ctrldown and altdown and shiftdown:
+                # CTRL+ALT+SHIFT+C
+                # Copie du canvas dans le clipboard pour transfert vers autre application
+                # Une matrice est associée à chaque canvas
+
+                from tempfile import TemporaryDirectory
+
+                logging.info(_('Creating images'))
+
+                with TemporaryDirectory() as tmpdirname:
+                    all_images = self.save_arrays_indep(Path(tmpdirname) / 'fig', mpl= True, ds= self.ticks_size, add_title= True)
+                    if len(all_images) == 0:
+                        logging.error(_('No image to combine -- aborting !'))
+                        return
+                    im_assembly = self.assembly_images(all_images, mode= self.assembly_mode)
+
+                logging.info(_('Creating images - done'))
+
+                # Copy image to clipboard
+                if im_assembly is not None:
+                    if wx.TheClipboard.Open():
+
+                        #création d'un objet bitmap wx
+                        wxbitmap = wx.Bitmap().FromBuffer(im_assembly.width, im_assembly.height, im_assembly.tobytes())
+
+                        # objet wx exportable via le clipboard
+                        dataobj = wx.BitmapDataObject()
+                        dataobj.SetBitmap(wxbitmap)
+
+                        wx.TheClipboard.SetData(dataobj)
+                        wx.TheClipboard.Close()
+                        logging.info(_('Image copied to clipboard'))
+                    else:
+                        logging.error(_('Cannot open the clipboard'))
+                else:
+                    logging.error(_('No image to copy to clipboard'))
+
+            elif key == ord('C') and ctrldown and altdown and not shiftdown:
                 if self.active_array is None:
                     dlg = wx.MessageDialog(self,
                                         _('The active array is None - Please active an array from which to copy the selection !'),
@@ -11372,9 +11546,11 @@ class WolfMapViewer(wx.Frame):
             tracks.append(_('Convert to mono-block'))
             tracks.append(_('Convert to mono-block (result)'))
             tracks.append(_('Convert to multi-blocks (result)'))
+            tracks.append(_('Extract current step as IC (result)'))
             tracks.append(_('Export to Shape file'))
             tracks.append(_('Export active zone to Shape file'))
             tracks.append(_('Rebin'))
+            tracks.append(_('Set NullValue'))
 
             # Récupération des items du menu contextuel
             menuitems = self.popupmenu.GetMenuItems()
@@ -11401,6 +11577,7 @@ class WolfMapViewer(wx.Frame):
                     self.popupmenu.Append(wx.ID_ANY, _('Boundary conditions'), _('Boundary conditions'))
                 self.popupmenu.Append(wx.ID_ANY, _('Contours'))
                 self.popupmenu.Append(wx.ID_ANY, _('Rebin'), _('Change the spatial resolution'))
+                self.popupmenu.Append(wx.ID_ANY, _('Set NullValue'), _('Set NullValue'))
 
             # Add specific menu items for WolfArrayMB
             if isinstance(self.selected_object, WolfArrayMB):
@@ -11410,6 +11587,7 @@ class WolfMapViewer(wx.Frame):
             if isinstance(self.selected_object, Wolfresults_2D):
                 self.popupmenu.Append(wx.ID_ANY, _('Convert to mono-block (result)'), _('Convert to mono-block'))
                 self.popupmenu.Append(wx.ID_ANY, _('Convert to multi-blocks (result)'), _('Convert to multi-blocks'))
+                self.popupmenu.Append(wx.ID_ANY, _('Extract current step as IC (result)'), _('Extract current step as IC'))
 
             if isinstance(self.selected_object, Zones | Bridge | Weir):
                 self.popupmenu.Append(wx.ID_ANY, _('Export to Shape file'), _('Export to Shape file'))

wolfhece/PyPalette.py

@@ -158,7 +158,12 @@ class wolfpalette(wx.Frame, LinearSegmentedColormap):
             if minval == -99999:
                 dlg = wx.TextEntryDialog(None, _('Minimum value'), value=str(self.values[0]))
                 ret = dlg.ShowModal()
-                self.values[0] = dlg.GetValue()
+
+                try:
+                    self.values[0] = float(dlg.GetValue())
+                except:
+                    logging.warning('Bad value for minimum - No change')
+
                 dlg.Destroy()
             else:
                 self.values[0] = minval
@@ -172,12 +177,24 @@ class wolfpalette(wx.Frame, LinearSegmentedColormap):
                 if ret == wx.ID_YES:
                     dlg = wx.TextEntryDialog(None, _('Step value'), value='1')
                     ret = dlg.ShowModal()
-                    step = float(dlg.GetValue())
+
+                    try:
+                        step = float(dlg.GetValue())
+                    except:
+                        logging.warning('Bad value for step - using default value 0.1 m')
+                        step = 0.1
+
                     dlg.Destroy()
                 else:
                     dlg = wx.TextEntryDialog(None, _('Maximum value'), value=str(self.values[-1]))
                     ret = dlg.ShowModal()
-                    self.values[-1] = float(dlg.GetValue())
+
+                    try:
+                        self.values[-1] = float(dlg.GetValue())
+                    except:
+                        logging.warning('Bad value for maximum - using min value + 1 m')
+                        self.values[-1] = self.values[0] + 1.
+
                     dlg.Destroy()
 
             elif maxval != -99999:

wolfhece/apps/version.py

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

{wolfhece-2.1.115.dist-info → wolfhece-2.1.116.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wolfhece
-Version: 2.1.115
+Version: 2.1.116
 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.115.dist-info → wolfhece-2.1.116.dist-info}/RECORD

@@ -5,13 +5,13 @@ 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=Bb1T8qjgKMChadJYDrHO9uo6CwItiAXScZpYkDXqZF8,11387
+wolfhece/PyConfig.py,sha256=gyl1MesSJZaVpC1XtvD78PpnE1VD3hGM3HPQXTJ3eJg,12963
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=efChYsrkRWnVYJJecpVJoUUEajOGus6_05OHrmKMfc0,502367
+wolfhece/PyDraw.py,sha256=_pPWREAVVWb7pU7SyeZBzWelTcZtCI5L0TtSPBcoMQw,509977
 wolfhece/PyGui.py,sha256=RlrLoCBdbiMnR4FSUD1yuy8fs--hxUl_zPu7zuduCLE,144706
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
-wolfhece/PyPalette.py,sha256=n3Aj6vgxj8LCN-aNR4Q9NY215Cf4GMthb33UGsl3BUg,31828
+wolfhece/PyPalette.py,sha256=Ayz0lqOPfUgjPpqvxragBSd7v47Z79roEy7thwVlH7M,32370
 wolfhece/PyParams.py,sha256=GRp1zZDUJIjs8PtjwScDdov-E9orr1JWOntDazN5AOw,98577
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
@@ -80,7 +80,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=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=EyQh37QGtlBEUyYiAlz_IouaM-UGYFtRP6aZcJqEcwg,389
+wolfhece/apps/version.py,sha256=ftLcojZwQEigCIBvMIO3EoocbdCG04g8wDxbBkyoCvI,389
 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
@@ -293,8 +293,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.115.dist-info/METADATA,sha256=qEqSZhvJvgQbQKdX-NHur3c_tbeYO7QeQYkDWrPvTlE,2587
-wolfhece-2.1.115.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-wolfhece-2.1.115.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.115.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.115.dist-info/RECORD,,
+wolfhece-2.1.116.dist-info/METADATA,sha256=x8r9B3T67NwRMVy1TAKiyCVP2e-oDsISGVdL2CmJO3I,2587
+wolfhece-2.1.116.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+wolfhece-2.1.116.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.116.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.116.dist-info/RECORD,,