wolfhece 2.1.110__py3-none-any.whl → 2.1.111__py3-none-any.whl

wolfhece/PyDraw.py

@@ -7065,49 +7065,59 @@ class WolfMapViewer(wx.Frame):
 
         if loadfromfile :
             newpal.readfile()
-        else:
-            with wx.lib.busy.BusyInfo(_('Compute unique colormap from all arrays')):
-                wait = wx.BusyCursor()
-
-                curarray:WolfArray
-                curres2d:Wolfresults_2D
-
-                for curarray in self.myarrays:
-                    if curarray.plotted:
-                        workingarray.append(curarray.get_working_array())
-                        nbnotnull+=curarray.nbnotnull
-
-                for curres2d in self.myres2D:
-                    if curres2d.plotted:
-                        workingarray.append(curres2d.get_working_array())
-                        nbnotnull+=curres2d.nbnotnull
 
-                workingarray = np.concatenate(workingarray)
+            if not newpal.is_valid():
+                logging.warning(_('Palette not valid !'))
+                return
+        else:
+            nb  = len(self.myarrays) + len(self.myres2D)
+            pgbar = wx.ProgressDialog(_('Compute unique colormap'), _('Compute unique colormap from all arrays'), maximum=nb, parent=self, style=wx.PD_APP_MODAL|wx.PD_AUTO_HIDE)
 
-                newpal.default16()
-                newpal.isopop(workingarray, nbnotnull)
-            del wait
+            curarray:WolfArray
+            curres2d:Wolfresults_2D
 
-        with wx.lib.busy.BusyInfo(_('Apply unique colormap to all arrays')):
-            wait = wx.BusyCursor()
             for curarray in self.myarrays:
                 if curarray.plotted:
-                    curarray.mypal.automatic = False
-                    curarray.myops.palauto.SetValue(0)
-                    curarray.mypal.values = newpal.values.copy()
-                    curarray.mypal.colors = newpal.colors.copy()
-                    curarray.mypal.fill_segmentdata()
-                    curarray.reset_plot()
+                    workingarray.append(curarray.get_working_array())
+                    nbnotnull+=curarray.nbnotnull
+                pgbar.Update(pgbar.GetValue() + 1, _('Compute unique colormap from array : ') + curarray.idx)
 
             for curres2d in self.myres2D:
                 if curres2d.plotted:
-                    curres2d.mypal.automatic = False
-                    curres2d.mypal.nb     = newpal.nb
-                    curres2d.mypal.values = newpal.values.copy()
-                    curres2d.mypal.colors = newpal.colors.copy()
-                    curres2d.mypal.fill_segmentdata()
-                    curres2d.reset_plot()
-            del wait
+                    workingarray.append(curres2d.get_working_array())
+                    nbnotnull+=curres2d.nbnotnull
+                pgbar.Update(pgbar.GetValue() + 1, _('Compute unique colormap from 2D result : ') + curres2d.idx)
+
+            pgbar.Destroy()
+
+            workingarray = np.concatenate(workingarray)
+
+            newpal.default16()
+            newpal.isopop(workingarray, nbnotnull)
+
+        nb = len(self.myarrays) + len(self.myres2D)
+        pgbar = wx.ProgressDialog(_('Applying colormap'), _('Applying colormap to all arrays'), maximum=nb, parent=self, style=wx.PD_APP_MODAL|wx.PD_AUTO_HIDE)
+        for curarray in self.myarrays:
+            if curarray.plotted:
+                curarray.mypal.automatic = False
+                curarray.myops.palauto.SetValue(0)
+                curarray.mypal.values = newpal.values.copy()
+                curarray.mypal.colors = newpal.colors.copy()
+                curarray.mypal.fill_segmentdata()
+                curarray.reset_plot()
+            pgbar.Update(pgbar.GetValue() + 1, _('Applying colormap to array : ') + curarray.idx)
+
+        for curres2d in self.myres2D:
+            if curres2d.plotted:
+                curres2d.mypal.automatic = False
+                curres2d.mypal.nb     = newpal.nb
+                curres2d.mypal.values = newpal.values.copy()
+                curres2d.mypal.colors = newpal.colors.copy()
+                curres2d.mypal.fill_segmentdata()
+                curres2d.reset_plot()
+            pgbar.Update(pgbar.GetValue() + 1, _('Applying colormap to 2D result : ') + curres2d.idx)
+
+        pgbar.Destroy()
 
     def loadnap_and_apply(self):
 
@@ -9775,7 +9785,7 @@ class WolfMapViewer(wx.Frame):
 
                     i, j, curbloc = locarray.get_blockij_from_xy(x, y)
 
-                    if i != '-':
+                    if i != '-' and i != -1:
                         curpar = 'Indices (i;j;bloc) (1-based)'
 
                         self.mytooltip.add_param(groupname = curgroup,
@@ -9897,8 +9907,10 @@ class WolfMapViewer(wx.Frame):
         if self.linked:
             for curFrame in self.linkedList:
                 if not curFrame is self:
+                    title = curFrame.GetTitle() if curFrame.GetTitle() != 'Wolf - main data manager' else 'Main'
+
                     for locarray in curFrame.myarrays:
-                        curgroup = locarray.idx
+                        curgroup = title + ' -' + locarray.idx
                         if locarray.plotted:
 
                             try:
@@ -9909,7 +9921,7 @@ class WolfMapViewer(wx.Frame):
                                         i, j, curbloc = locarray.get_blockij_from_xy(x, y)
                                         curpar = 'Indices (i;j;bloc) (1-based)'
 
-                                        self.mytooltip.add_param(groupname = locarray.idx,
+                                        self.mytooltip.add_param(groupname = curgroup,
                                                                     name = curpar,
                                                                     value =  '(' + str(i+1) + ';' + str(j+1) + ';' + str(curbloc) + ')',
                                                                     type = Type_Param.String,
@@ -9919,7 +9931,7 @@ class WolfMapViewer(wx.Frame):
                                         i, j = locarray.get_ij_from_xy(x, y)
                                         curpar = 'Indices (i;j) (1-based)'
 
-                                        self.mytooltip.add_param(groupname = locarray.idx,
+                                        self.mytooltip.add_param(groupname = curgroup,
                                                                     name = curpar,
                                                                     value =  '(' + str(i+1) + ';' + str(j+1) + ')',
                                                                     type = Type_Param.String,
@@ -9928,7 +9940,7 @@ class WolfMapViewer(wx.Frame):
                                     curpar = 'Value'
 
                                     if val is np.nan:
-                                        self.mytooltip.add_param(groupname = locarray.idx,
+                                        self.mytooltip.add_param(groupname = curgroup,
                                                                 name = 'Value',
                                                                 value =  "Nan",
                                                                 type = Type_Param.String,
@@ -9936,32 +9948,91 @@ class WolfMapViewer(wx.Frame):
 
                                     elif np.ma.is_masked(val):
 
-                                        self.mytooltip.add_param(groupname = locarray.idx,
+                                        self.mytooltip.add_param(groupname = curgroup,
                                                                 name = 'Value',
                                                                 value =  "Masked",
                                                                 type = Type_Param.String,
                                                                 comment = '')
 
                                     elif isinstance(val, str):
-                                        self.mytooltip.add_param(groupname = locarray.idx,
+                                        self.mytooltip.add_param(groupname = curgroup,
                                                                 name = curpar,
                                                                 value =  val,
                                                                 type = Type_Param.String,
                                                                 comment = '')
                                     elif isinstance(val, int):
-                                        self.mytooltip.add_param(groupname = locarray.idx,
+                                        self.mytooltip.add_param(groupname = curgroup,
                                                                 name = curpar,
                                                                 value =  int(val),
                                                                 type = Type_Param.Integer,
                                                                 comment = '')
                                     else:
-                                        self.mytooltip.add_param(groupname = locarray.idx,
+                                        self.mytooltip.add_param(groupname = curgroup,
                                                                 name = curpar,
                                                                 value =  float(val),
                                                                 type = Type_Param.Float,
                                                                 comment = '')
                             except:
-                                logging.warning(_('Error in linked frame -- Please check !'))
+                                logging.warning(_('Error in linked frame Arrays -- Please check !'))
+
+                    for locarray in curFrame.myres2D:
+                        locarray:Wolfresults_2D
+                        curgroup = title + ' - ' + locarray.idx
+                        if locarray.checked:
+                            try:
+                                vals,labs = locarray.get_values_labels(x,y)
+
+                                i, j, curbloc = locarray.get_blockij_from_xy(x, y)
+
+                                if i != '-' and i != -1:
+                                    curpar = 'Indices (i;j;bloc) (1-based)'
+
+                                    self.mytooltip.add_param(groupname = curgroup,
+                                                            name = curpar,
+                                                            value =  '(' + str(i) + ';' + str(j) + ';' + str(curbloc) + ')',
+                                                            type = Type_Param.String,
+                                                            comment = '')
+
+                                    for val,curpar in zip(vals,labs):
+
+                                        if val is np.nan:
+                                            self.mytooltip.add_param(groupname = curgroup,
+                                                                    name = 'Value',
+                                                                    value =  "Nan",
+                                                                    type = Type_Param.String,
+                                                                    comment = '')
+
+                                        elif np.ma.is_masked(val):
+
+                                            self.mytooltip.add_param(groupname = curgroup,
+                                                                    name = 'Value',
+                                                                    value =  "Masked",
+                                                                    type = Type_Param.String,
+                                                                    comment = '')
+
+                                        elif isinstance(val, str):
+                                            self.mytooltip.add_param(groupname = curgroup,
+                                                                    name = curpar,
+                                                                    value =  val,
+                                                                    type = Type_Param.String,
+                                                                    comment = '')
+
+                                        elif isinstance(val, int):
+                                            self.mytooltip.add_param(groupname = curgroup,
+                                                                    name = curpar,
+                                                                    value =  int(val),
+                                                                    type = Type_Param.Integer,
+                                                                    comment = '')
+
+                                        else:
+                                            self.mytooltip.add_param(groupname = curgroup,
+                                                                    name = curpar,
+                                                                    value =  float(val),
+                                                                    type = Type_Param.Float,
+                                                                    comment = '')
+
+                            except:
+                                logging.warning(_('Error in linked frame Results2D -- Please check !'))
 
         for loc_ps in self.mypartsystems:
             if loc_ps.checked:

wolfhece/PyPalette.py

@@ -671,6 +671,21 @@ class wolfpalette(wx.Frame, LinearSegmentedColormap):
 
         self.fill_segmentdata()
 
+    def is_valid(self):
+        """Vérification de la validité de la palette"""
+
+        if self.nb < 2:
+            return False
+
+        if self.values[0] >= self.values[-1]:
+            return False
+
+        for i in range(1, self.nb):
+            if self.values[i] <= self.values[i-1]:
+                return False
+
+        return True
+
     def savefile(self, *args):
         """Lecture de la palette sur base d'un fichier WOLF .pal"""
         if len(args) > 0:

wolfhece/PyVertexvectors.py

@@ -1811,7 +1811,8 @@ class vector:
 
         :param only_firstlast: si True, on ne recherche que les coordonnées du premier et du dernier vertex
         """
-        if len(self.myvertices)>0:
+
+        if self.nbvertices > 0:
 
             if only_firstlast:
                 self.xmin=min(self.myvertices[0].x, self.myvertices[-1].x)
@@ -1823,6 +1824,11 @@ class vector:
                 self.ymin=min(vert.y for vert in self.myvertices)
                 self.xmax=max(vert.x for vert in self.myvertices)
                 self.ymax=max(vert.y for vert in self.myvertices)
+        else:
+            self.xmin=-99999.
+            self.ymin=-99999.
+            self.xmax=-99999.
+            self.ymax=-99999.
 
     @property
     def has_interior(self):
@@ -3020,10 +3026,10 @@ class zone:
         self.active_vector=None # current active vector
         self.parent=parent      # parent object - type(Zones)
 
-        self.xmin = 0.
-        self.ymin = 0.
-        self.xmax = 0.
-        self.ymax = 0.
+        self.xmin = -99999.
+        self.ymin = -99999.
+        self.xmax = -99999.
+        self.ymax = -99999.
 
         self.has_legend = False # indicate if at least one vector in the zone has a legend
         self.has_image  = False # indicate if at least one vector in the zone has an image
@@ -3350,22 +3356,21 @@ class zone:
             self.xmax=-99999.
             self.ymax=-99999.
         else:
-            minsx=np.asarray([vect.xmin for vect in self.myvectors])
-            minsy=np.asarray([vect.ymin for vect in self.myvectors])
-            maxsx=np.asarray([vect.xmax for vect in self.myvectors])
-            maxsy=np.asarray([vect.ymax for vect in self.myvectors])
-
-            # if len(minsx)>1: # FIXME what if more than one vector is empty.
-            if max(max(minsx),max(minsy), max(maxsx), max(maxsy)) != -99999.:
-                self.xmin=np.min(minsx[np.where(minsx!=-99999.)])
-                self.xmax=np.max(maxsx[np.where(maxsx!=-99999.)])
-                self.ymin=np.min(minsy[np.where(minsy!=-99999.)])
-                self.ymax=np.max(maxsy[np.where(maxsy!=-99999.)])
+            minsx=np.asarray([vect.xmin for vect in self.myvectors if vect.xmin!=-99999.])
+            minsy=np.asarray([vect.ymin for vect in self.myvectors if vect.ymin!=-99999.])
+            maxsx=np.asarray([vect.xmax for vect in self.myvectors if vect.xmax!=-99999.])
+            maxsy=np.asarray([vect.ymax for vect in self.myvectors if vect.ymax!=-99999.])
+
+            if minsx.size == 0:
+                self.xmin=-99999.
+                self.ymin=-99999.
+                self.xmax=-99999.
+                self.ymax=-99999.
             else:
-                self.xmin=minsx[0]
-                self.xmax=maxsx[0]
-                self.ymin=minsy[0]
-                self.ymax=maxsy[0]
+                self.xmin = minsx.min()
+                self.xmax = maxsx.max()
+                self.ymin = minsy.min()
+                self.ymax = maxsy.max()
 
     def prep_listogl(self):
         """
@@ -4920,6 +4925,9 @@ class Zones(wx.Frame, Element_To_Draw):
 
         self.xmin=ox
         self.ymin=oy
+
+        self._first_find_minmax:bool = True
+
         self.tx=tx
         self.ty=ty
         self.myzones=[]
@@ -5570,32 +5578,29 @@ class Zones(wx.Frame, Element_To_Draw):
         :param update : si True, force la MAJ des minmax dans chaque zone; si False, compile les minmax déjà présents
         :param only_firstlast : si True, ne prend en compte que le premier et le dernier vertex de chaque vecteur
         """
-        if update:
+
+        if update or self._first_find_minmax:
             for zone in self.myzones:
-                zone.find_minmax(update, only_firstlast)
+                zone.find_minmax(update or self._first_find_minmax, only_firstlast)
+            self._first_find_minmax = False
 
-        if len(self.myzones)>0:
+        if self.nbzones > 0:
 
-            minsx=np.asarray([zone.xmin for zone in self.myzones])
-            minsy=np.asarray([zone.ymin for zone in self.myzones])
-            maxsx=np.asarray([zone.xmax for zone in self.myzones])
-            maxsy=np.asarray([zone.ymax for zone in self.myzones])
+            minsx = np.asarray([zone.xmin for zone in self.myzones if zone.xmin!=-99999.])
+            minsy = np.asarray([zone.ymin for zone in self.myzones if zone.ymin!=-99999.])
+            maxsx = np.asarray([zone.xmax for zone in self.myzones if zone.xmax!=-99999.])
+            maxsy = np.asarray([zone.ymax for zone in self.myzones if zone.ymax!=-99999.])
 
-            if len(minsx)>1:
-                self.xmin=np.min(minsx[np.where(minsx!=-99999.)])
-                self.xmax=np.max(maxsx[np.where(maxsx!=-99999.)])
-                self.ymin=np.min(minsy[np.where(minsy!=-99999.)])
-                self.ymax=np.max(maxsy[np.where(maxsy!=-99999.)])
+            if minsx.size == 0:
+                self.xmin = 0.
+                self.ymin = 0.
+                self.xmax = 1.
+                self.ymax = 1.
             else:
-                self.xmin=minsx[0]
-                self.xmax=maxsx[0]
-                self.ymin=minsy[0]
-                self.ymax=maxsy[0]
-        else:
-            self.xmin=0.
-            self.ymin=0.
-            self.xmax=1.
-            self.ymax=1.
+                self.xmin = minsx.min()
+                self.xmax = maxsx.max()
+                self.ymin = minsy.min()
+                self.ymax = maxsy.max()
 
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """

wolfhece/apps/version.py

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

wolfhece/matplotlib_fig.py

@@ -106,8 +106,8 @@ class Matplotlib_ax_properties():
             self.gridy_minor = False
 
             aspect = ax.get_aspect()
-            self._equal_axis = 0 if aspect == 'auto' else 1 if aspect == 1. else 2
-            self.scaling_factor = aspect
+            self._equal_axis = 0 if aspect == 'auto' else 1 if aspect in [1., 'equal'] else 2
+            self.scaling_factor = 0 if aspect == 'auto' else 1 if aspect in [1., 'equal'] else aspect
 
             self.ticks_x = ax.get_xticks()
             self.ticks_y = ax.get_yticks

wolfhece/wolf_array.py

@@ -9410,15 +9410,31 @@ class WolfArray(Element_To_Draw, header_wolf):
         cs = plt.contour(x, y, self.array, levels=levels)
 
         zones = Zones(idx = self.idx + '_contour', mapviewer = self.get_mapviewer())
-        for collection, level in zip(cs.collections, cs.levels):
-            zone_level = zone(name=f'Contour {level}')
-            for idx, path in enumerate(collection.get_paths()):
-                vector_level = vector(name=f'Contour {level} - {idx}')
-                for vertices in path.to_polygons(closed_only=False):
+
+        if hasattr(cs, 'collections'):
+            # MATPLOTLIB <=3.8
+            logging.debug('MATPLOTLIB <=3.8')
+            logging.info(_('DEPRECATED: MATPLOTLIB <=3.8 -- You should consider upgrading to a more recent version of Matplotlib'))
+            for collection, level in zip(cs.collections, cs.levels):
+                zone_level = zone(name=f'Contour {level}')
+                for idx, path in enumerate(collection.get_paths()):
+                    vector_level = vector(name=f'Contour {level} - {idx}')
+                    for vertices in path.to_polygons(closed_only=False):
+                        for vertex in vertices:
+                            vector_level.add_vertex(wolfvertex(vertex[0], vertex[1]))
+                zone_level.add_vector(vector_level, forceparent=True)
+                zones.add_zone(zone_level, forceparent=True)
+        else:
+            # MATPLOTLIB >3.8
+            logging.debug('MATPLOTLIB >3.8')
+            for path, level in zip(cs.get_paths(), cs.levels):
+                zone_level = zone(name=f'Contour {level}')
+                for idx, vertices in enumerate(path.to_polygons(closed_only=False)):
+                    vector_level = vector(name=f'Contour {level} - {idx}')
                     for vertex in vertices:
                         vector_level.add_vertex(wolfvertex(vertex[0], vertex[1]))
                 zone_level.add_vector(vector_level, forceparent=True)
-            zones.add_zone(zone_level, forceparent=True)
+                zones.add_zone(zone_level, forceparent=True)
 
         return zones
 

wolfhece/wolfresults_2D.py

@@ -4096,7 +4096,7 @@ class Wolfresults_2D(Element_To_Draw):
 
             return vals,labs
         else:
-            return -1
+            return [-1],['-']
 
     def get_value_elevation(self, x:float, y:float, nullvalue=-1):
         """Return the value of the bed elevation at (X,Y) position"""

{wolfhece-2.1.110.dist-info → wolfhece-2.1.111.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wolfhece
-Version: 2.1.110
+Version: 2.1.111
 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
@@ -37,7 +37,7 @@ Requires-Dist: owslib
 Requires-Dist: beautifulsoup4
 Requires-Dist: requests
 Requires-Dist: notebook
-Requires-Dist: matplotlib==3.6.*
+Requires-Dist: matplotlib==3.10.*
 Requires-Dist: mkl
 Requires-Dist: python-gettext
 Requires-Dist: shapely

{wolfhece-2.1.110.dist-info → wolfhece-2.1.111.dist-info}/RECORD

@@ -7,16 +7,16 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=Bb1T8qjgKMChadJYDrHO9uo6CwItiAXScZpYkDXqZF8,11387
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=wMiD3KR-IYKkaDI_WTMICH8gDEhy00jpaVxeJUwlI-U,492633
+wolfhece/PyDraw.py,sha256=upQGIk2ZZXot6jyPjfbIrommg1AHRvb24q-Rz1dySg0,497162
 wolfhece/PyGui.py,sha256=Ceaby7kyTFf-eZQy4b6sI_b6y2ssN37bSGWBqOcb5VM,144145
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
-wolfhece/PyPalette.py,sha256=81n1P-olOe4wElTLv-miSDhqvJU_RHcxgfpHt794dSw,31436
+wolfhece/PyPalette.py,sha256=-D2sC7wzGGW8yBtiwXc1CsxHpCj-olxGohZrsdzmaCM,31794
 wolfhece/PyParams.py,sha256=GRp1zZDUJIjs8PtjwScDdov-E9orr1JWOntDazN5AOw,98577
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=qFf8UPvkbwumRRfjpBcgZmqpHtcEtIEoUh30rWFF-lQ,45205
-wolfhece/PyVertexvectors.py,sha256=DiJfZrTj5Iy65O_z902-Hg7WzCGaKcguUgMw6moPy_c,283030
+wolfhece/PyVertexvectors.py,sha256=_-F8qHtWKGJgMbRebk5TbQ7LeLUl9r6nRDjgTxt9IJQ,283050
 wolfhece/PyWMS.py,sha256=WmOzHP02wVcB5RGJAlENL_NzF9rYfvLxslRFyxaEt1Q,6615
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -37,7 +37,7 @@ wolfhece/import_ascfiles.py,sha256=6Zl8qBR9c6VtyziookQ8YE9KC0GtW_J9WFt5ubyGp-s,4
 wolfhece/ins.py,sha256=uUeLMS1n3GPnfJhxl0Z2l-UXpmPUgthuwct282OOEzk,36184
 wolfhece/irm_qdf.py,sha256=KyrIk0Gu50Q702EWxRpwKTWI2KGjtHA1l8CL-Y469O0,26394
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
-wolfhece/matplotlib_fig.py,sha256=2_Jgh45t1QfMwH7RhDV007-uBMtQvM_tVPkPEocG3tI,81047
+wolfhece/matplotlib_fig.py,sha256=nWhac23K6eQJGXhDFiakmT52j-QUzlMHQmZ2je56GVE,81119
 wolfhece/multiprojects.py,sha256=Sd6Bl6YP33jlR79A6rvSLu23vq8sqbFYL8lWuVPkEpE,21549
 wolfhece/picc.py,sha256=0X_pzhSBoVxgtTfJ37pkOQO3Vbr9yurPaD1nVeurx8k,8531
 wolfhece/pidcontroller.py,sha256=PHYenOdzfyPK2pXAhyRolCxMSMRd2AFza0eVMafpPHk,5205
@@ -52,13 +52,13 @@ wolfhece/pywalous.py,sha256=mWB7UxlYMIbPxNUDlONQEjcOOy9VSaRU9aYWZ5IFLu8,19164
 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=B7q_eS0SDcoO3erW362UOus3ApiOy4_jWrpUtUNSL3E,423223
+wolfhece/wolf_array.py,sha256=8CzabYInhFmOjr-Wwfse5L0Ylx3SsjkUylitOSOm4Oo,424148
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=ecoXXmmcLuyG1oPqU2dB_k03qMTCLTVQoSq1xi1EalU,17359
 wolfhece/wolf_tiles.py,sha256=-YfTelZjpfgqZXd1yMsGFajz_oDISXkC0zB5fW-8MBY,10486
 wolfhece/wolf_vrt.py,sha256=NcPZYW4bu06IpqQuiutoAhCvDkeZ3TzOVb8z4wTQ1h8,14319
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
-wolfhece/wolfresults_2D.py,sha256=Z-SKkipwbChyf9V4777nacKNd5p0aimORjC6evg5zeI,184819
+wolfhece/wolfresults_2D.py,sha256=GbuYSN1haTctY9AqUyAt1xQCOVpoUgSURD9d2XIqRXw,184827
 wolfhece/xyz_file.py,sha256=1pzLFmmdHca4yBVR9Jitic6N82rY28mRytGC1zMbY28,6615
 wolfhece/acceptability/Parallels.py,sha256=njrJFH_tTdQUg2px-QqQR6VdhImP1TEujLhpM3JEKNo,4001
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
@@ -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=c8lUQbXJcDVHJjFBNDZvtl4JrQsc4JqOzcDAfm1UYVs,389
+wolfhece/apps/version.py,sha256=_E5zp4InRVxGzGtcse3-ynBytT7LFkwOrTupyZusKys,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.110.dist-info/METADATA,sha256=2II_IjksPPQB_4OyVus6GWhpup0SU4T-n_CPFYENPqE,2618
-wolfhece-2.1.110.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-wolfhece-2.1.110.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.110.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.110.dist-info/RECORD,,
+wolfhece-2.1.111.dist-info/METADATA,sha256=2qEAB6gzSOu-t6WAFWuvDKlIbcjK-CghDSUnaL7E5sA,2619
+wolfhece-2.1.111.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+wolfhece-2.1.111.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.111.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.111.dist-info/RECORD,,