wolfhece 2.1.117__py3-none-any.whl → 2.1.119__py3-none-any.whl

wolfhece/lazviewer/viewer/viewer.py

@@ -9,7 +9,7 @@ import warnings
 # _viewer_dir = os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())),'..//libs')
 _viewer_dir = os.path.dirname(inspect.getfile(inspect.currentframe()))
 
-if ~os.path.isabs(_viewer_dir):
+if not os.path.isabs(_viewer_dir):
     _viewer_dir = os.path.abspath(_viewer_dir)
 
 __all__ = ['viewer']
@@ -179,7 +179,7 @@ class viewer:
     def attributes(self, *attr):
         """ Loads point attributes
 
-        The loaded attributes are used to clor the currently loaded point
+        The loaded attributes are used to color the currently loaded point
         cloud.  Supposing n points loaded, this function accepts attributes of
         the following forms:
 
@@ -366,6 +366,8 @@ class viewer:
             >>> ffmpeg -i "frame_%03d.png" -c:v mpeg4 -qscale:v 0 -r 24 output.mp4
 
         """
+        import time
+
         if not os.path.isdir(folder):
             raise ValueError('invalid folder provided')
         poses, ts = _fix_poses_ts_input(poses, ts)
@@ -394,12 +396,20 @@ class viewer:
                 struct.pack('2f', t, t) + \
                 struct.pack('?', False)
             self.__send(msg)
+
+            time.sleep(0.1)
+
             filename = prefix \
                 + ('%0' + str(num_digits) + 'd') % (i + 1) + '.' + ext
             filename = os.path.join(folder, filename)
             self.capture(filename)
-            # todo: need to check whether write succeeded
-            #       ideally, capture(...) should return filename
+            # check whether write succeeded
+
+            tot_sec = 0.
+            while not os.path.isfile(filename) and tot_sec < 5.:
+                # wait for file to be written
+                time.sleep(0.1)
+                tot_sec += 0.1
 
     def wait(self):
         """

wolfhece/opengl/py3d.py

@@ -1238,7 +1238,7 @@ class CanvasOGL(glcanvas.GLCanvas):
         curarray = self.arrays[list(self.arrays.keys())[int(idx)-1]]
         i = int(x)
         j = int(y)
-        
+
         if i > 0 and i < curarray.ztexture.shape[0] and j > 0 and j < curarray.ztexture.shape[1]:
             z = curarray.ztexture[i, j]
 
@@ -1798,9 +1798,15 @@ class Wolf_Viewer3D(wx.Frame):
         """ Add an array to the canvas """
         self.canvas.add_array(name, array)
 
-    def force_view(self, x, y, z):
-        """ Force the view to the specified coordinates """
-        self.canvas.force_view(x, y, z)
+    def force_view(self, x, y, z= -1):
+        """ Force the view to the specified coordinates.
+
+        if z == -1, the z value is the same as the current z value."""
+        if z==-1:
+            curx,cury,curz = self.canvas.center
+            self.canvas.force_view(x, y, curz)
+        else:
+            self.canvas.force_view(x, y, z)
 
     def autoscale(self):
         """ Auto scale the view to fit all the arrays """

wolfhece/wolf_array.py

@@ -822,6 +822,39 @@ class header_wolf():
                 logging.error(_('See : read_txt_header and import_geotif in wolf_array.py'))
                 return
 
+        elif filename.endswith('.vrt'):
+            # Virtual raster
+            from osgeo import gdal
+
+            raster:gdal.Dataset
+            raster = gdal.Open(filename)
+            geotr = raster.GetGeoTransform()
+            self.dx = geotr[1]
+            self.dy = abs(geotr[5])
+            self.origx = geotr[0]
+            self.origy = geotr[3]
+            self.nbx = raster.RasterXSize
+            self.nby = raster.RasterYSize
+
+            dtype = raster.GetRasterBand(1).DataType
+
+            if dtype == 1:
+                self.wolftype = WOLF_ARRAY_FULL_INTEGER8
+            elif dtype in [2,3]:
+                self.wolftype = WOLF_ARRAY_FULL_INTEGER16
+            elif dtype in [4,5] :
+                self.wolftype = WOLF_ARRAY_FULL_INTEGER
+            elif dtype ==6:
+                self.wolftype = WOLF_ARRAY_FULL_SINGLE
+            elif dtype == 7:
+                self.wolftype = WOLF_ARRAY_FULL_DOUBLE
+            else:
+                logging.error(_('The datatype of the raster is not supported -- {}'.format(dtype)))
+                logging.error(_('Please convert the raster to a supported datatype - or upgrade the code to support this datatype'))
+                logging.error(_('See : read_txt_header and import_geotif in wolf_array.py'))
+                return
+
+
         elif filename.endswith('.npy') and not os.path.exists(filename + '.txt'):
             # Il y de fortes chances que cette matrice numpy provienne d'une modélisation GPU
             #  et donc que les coordonnées et la résolution soient disponibles dans un fichier parameters.json
@@ -1250,10 +1283,12 @@ class NewArray(wx.Dialog):
     Once filled, user/__init__ must call "init_from_new"
     """
 
-    def __init__(self, parent):
+    def __init__(self, parent, mapviewer= None):
         super(NewArray, self).__init__(parent, title=_('New array'), size=(300, 300),
                                        style=wx.DEFAULT_DIALOG_STYLE | wx.TAB_TRAVERSAL | wx.OK)
 
+        self._mapviewer = mapviewer
+
         self.SetSizeHints(wx.DefaultSize, wx.DefaultSize)
 
         glsizer = self.CreateSeparatedButtonSizer(wx.OK)
@@ -1313,6 +1348,19 @@ class NewArray(wx.Dialog):
         # self.OK = wx.Button( self, wx.ID_ANY, u"Validate", wx.DefaultPosition, wx.DefaultSize, 0 )
         # gSizer1.Add( self.OK, 0, wx.ALL, 5 )
 
+        sizer_hor = wx.BoxSizer(wx.HORIZONTAL)
+        self._sameas_button = wx.Button(self, wx.ID_ANY, u"Same as...", wx.DefaultPosition, wx.DefaultSize, 0)
+        sizer_hor.Add(self._sameas_button, 0, wx.ALL, 5)
+
+        if self._mapviewer is not None:
+            self._samezoom_parent = wx.Button(self, wx.ID_ANY, u"Current zoom...", wx.DefaultPosition, wx.DefaultSize, 0)
+            sizer_hor.Add(self._samezoom_parent, 0, wx.ALL, 5)
+            self._samezoom_parent.Bind(wx.EVT_BUTTON, self.on_samezoom_parent)
+
+        glsizer.Add(sizer_hor, 1, wx.ALL, 1)
+
+        self._sameas_button.Bind(wx.EVT_BUTTON, self.on_sameas)
+
         self.nbx.SetFocus()
         self.nbx.SelectAll()
         self.SetSizer(glsizer)
@@ -1320,6 +1368,50 @@ class NewArray(wx.Dialog):
 
         self.Centre(wx.BOTH)
 
+    def on_samezoom_parent(self, event):
+        """ Fill the fields with the same values as the parent """
+
+        if self._mapviewer is not None:
+
+            with wx.TextEntryDialog(self, _('Round to the nearest x m ?'), _('Round to the nearest x m ?'), '10', style=wx.OK | wx.CANCEL) as dlg:
+                if dlg.ShowModal() == wx.ID_CANCEL:
+                    return  # the user changed their mind
+
+                try:
+                    roundto = int(dlg.GetValue())
+                except:
+                    logging.error(_('The value must be a number'))
+                    return
+
+            xmin, ymin, xmax, ymax = self._mapviewer.get_canvas_bounds()
+            self.ox.SetValue(str((xmin // roundto) * roundto))
+            self.oy.SetValue(str((ymin // roundto) * roundto))
+
+            self.dx.SetValue(str(1))
+            self.dy.SetValue(str(1))
+
+            self.nbx.SetValue(str((math.ceil(xmax - xmin) // roundto) *roundto))
+            self.nby.SetValue(str((math.ceil(ymax - ymin) // roundto) *roundto))
+
+
+    def on_sameas(self, event):
+        """ Fill the fields with the same values as a file array """
+
+        with wx.FileDialog(self, _("Choose a file"), wildcard="Wolf array files (*.bin;*.flt;*.tif,*.npy)|*.bin;*.flt;*.tif;*.npy",
+                            style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST) as fileDialog:
+            if fileDialog.ShowModal() == wx.ID_CANCEL:
+                return  # the user changed their mind
+
+            filename = fileDialog.GetPath()
+            header = header_wolf()
+            header.read_txt_header(filename)
+
+            self.dx.SetValue(str(header.dx))
+            self.dy.SetValue(str(header.dy))
+            self.nbx.SetValue(str(header.nbx))
+            self.nby.SetValue(str(header.nby))
+            self.ox.SetValue(str(header.origx))
+            self.oy.SetValue(str(header.origy))
 
 #FIXME : Generalize to 3D
 class CropDialog(wx.Dialog):
@@ -1329,10 +1421,12 @@ class CropDialog(wx.Dialog):
     Used in "read_data" of a WolfArray
     """
 
-    def __init__(self, parent):
+    def __init__(self, parent, mapviewer=None):
         super(CropDialog, self).__init__(parent, title=_('Cropping array'), size=(300, 300),
                                          style=wx.DEFAULT_DIALOG_STYLE | wx.TAB_TRAVERSAL | wx.OK)
 
+        self._mapviewer = mapviewer
+
         self.SetSizeHints(wx.DefaultSize, wx.DefaultSize)
 
         glsizer = self.CreateSeparatedButtonSizer(wx.OK)
@@ -1396,6 +1490,19 @@ class CropDialog(wx.Dialog):
         # self.OK = wx.Button( self, wx.ID_ANY, u"Validate", wx.DefaultPosition, wx.DefaultSize, 0 )
         # gSizer1.Add( self.OK, 0, wx.ALL, 5 )
 
+        sizer_hor = wx.BoxSizer(wx.HORIZONTAL)
+        self.sameas_button = wx.Button(self, wx.ID_ANY, u"Same as...", wx.DefaultPosition, wx.DefaultSize, 0)
+        sizer_hor.Add(self.sameas_button, 0, wx.ALL, 5)
+
+        if self._mapviewer is not None:
+            self.samezoom_parent = wx.Button(self, wx.ID_ANY, u"Current zoom...", wx.DefaultPosition, wx.DefaultSize, 0)
+            sizer_hor.Add(self.samezoom_parent, 0, wx.ALL, 5)
+            self.samezoom_parent.Bind(wx.EVT_BUTTON, self.on_samezoom_parent)
+
+        glsizer.Add(sizer_hor, 1, wx.ALL, 1)
+
+        self.sameas_button.Bind(wx.EVT_BUTTON, self.on_sameas)
+
         self.ox.SetFocus()
         self.ox.SelectAll()
         self.SetSizer(glsizer)
@@ -1416,6 +1523,51 @@ class CropDialog(wx.Dialog):
 
         return myhead
 
+    def on_samezoom_parent(self, event):
+        """ Fill the fields with the same values as the parent """
+
+        if self._mapviewer is not None:
+
+            with wx.TextEntryDialog(self, _('Round to the nearest x m ?'), _('Round to the nearest x m ?'), '10', style=wx.OK | wx.CANCEL) as dlg:
+                if dlg.ShowModal() == wx.ID_CANCEL:
+                    return  # the user changed their mind
+
+                try:
+                    roundto = int(dlg.GetValue())
+                except:
+                    logging.error(_('The value must be a number'))
+                    return
+
+            xmin, ymin, xmax, ymax = self._mapviewer.get_canvas_bounds()
+            self.ox.SetValue(str((xmin // roundto) * roundto))
+            self.oy.SetValue(str((ymin // roundto) * roundto))
+
+            # self.dx.SetValue(str(1))
+            # self.dy.SetValue(str(1))
+
+            self.ex.SetValue(str((math.ceil(xmax // roundto) * roundto)))
+            self.ey.SetValue(str((math.ceil(ymax // roundto) * roundto)))
+
+
+    def on_sameas(self, event):
+        """ Fill the fields with the same values as a file array """
+
+        with wx.FileDialog(self, _("Choose a file"), wildcard="Wolf array files (*.bin;*.flt;*.tif,*.npy)|*.bin;*.flt;*.tif;*.npy",
+                            style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST) as fileDialog:
+            if fileDialog.ShowModal() == wx.ID_CANCEL:
+                return  # the user changed their mind
+
+            filename = fileDialog.GetPath()
+            header = header_wolf()
+            header.read_txt_header(filename)
+
+            # self.dx.SetValue(str(header.dx))
+            # self.dy.SetValue(str(header.dy))
+            self.ox.SetValue(str(header.origx))
+            self.oy.SetValue(str(header.origy))
+            self.ex.SetValue(str(header.origx + header.nbx * header.dx))
+            self.ey.SetValue(str(header.origy + header.nby * header.dy))
+
 import string
 class IntValidator(wx.Validator):
     ''' Validates data as it is entered into the text controls. '''
@@ -5109,7 +5261,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         elif create:
             assert self.wx_exists, _('Array creation required a running wx App to display the UI')
             # Dialog for the creation of a new array
-            new = NewArray(None)
+            new = NewArray(None, self.get_mapviewer())
 
             ret = new.ShowModal()
             if ret == wx.ID_CANCEL:
@@ -5830,6 +5982,117 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         self.array = np.ma.asarray(locarray)
 
+    def import_vrt(self, fn:str='', which:int = None, crop:list[float]=None):
+        """ Import a VRT file
+
+        :param fn: filename
+        :param which: band to import
+        :param crop: crop the data - [xmin, xmax, ymin, ymax]
+        """
+
+        if fn !='':
+            pass
+        elif self.filename !='':
+            fn = self.filename
+        else:
+            return
+
+        if not os.path.exists(fn):
+            logging.error(_('File not found'))
+            return
+
+        # convert vrt to tif and mport tif
+        with tempfile.TemporaryDirectory() as tmpdirname:
+            tmpfile = join(tmpdirname, 'tmp.tif')
+
+            if crop is not None:
+
+                tmpdx = self.dx
+
+                fn_crop = fn + '_crop.tif'
+                if type(crop) is np.ndarray:
+                    pass
+                elif type(crop) is list:
+                    pass
+                else:
+                    if not self.wx_exists:
+                        logging.error(_('Crop must be a list or a numpy array with 4 values - xmin, xmax, ymin, ymax'))
+                        return
+
+                    raster_in:gdal.Dataset
+                    raster_in = gdal.Open(fn)
+
+                    proj = raster_in.GetProjection()
+                    # check if proj is epsg:31370
+                    if 'Lambert 72' not in proj and "31370" not in proj:
+                        logging.error(_('{} projection is not Lambert 72 - EPSG:31370').format(fn))
+
+                        raster_in2 = gdal.Dataset()
+                        gdal.Warp(raster_in2, raster_in, dstSRS='EPSG:31370')
+
+                        # Close the raster_in
+                        raster_in.FlushCache()
+                        raster_in = None
+
+                        raster_in = raster_in2
+
+                        if raster_in is None:
+                            logging.error(_('Could not reproject the file {fn}'))
+                            return
+
+                    geotr = raster_in.GetGeoTransform()
+                    self.dx = geotr[1]
+                    self.dy = abs(geotr[5])
+
+                    ulx = geotr[0]
+                    uly = geotr[3]
+                    llx = ulx + geotr[1] * raster_in.RasterXSize
+                    lly = uly + geotr[5] * raster_in.RasterYSize
+
+                    newcrop = CropDialog(None, self.get_mapviewer())
+
+                    if self.wx_exists:
+                        bounds = self.mapviewer.get_canvas_bounds()
+
+                        newcrop.dx.Value = str(self.dx)
+                        newcrop.dy.Value = str(self.dy)
+
+                        newcrop.dx.Enable(False)
+                        newcrop.dy.Enable(False)
+
+                        newcrop.ox.Value = str(float((bounds[0] // 50.) * 50.))
+                        newcrop.ex.Value = str(float((bounds[2] // 50.) * 50.))
+                        newcrop.oy.Value = str(float((bounds[1] // 50.) * 50.))
+                        newcrop.ey.Value = str(float((bounds[3] // 50.) * 50.))
+
+                    badvalues = True
+                    while badvalues:
+                        badvalues = False
+
+                        ret = newcrop.ShowModal()
+                        if ret == wx.ID_CANCEL:
+                            newcrop.Destroy()
+                            return
+                        else:
+                            crop = [float(newcrop.ox.Value), float(newcrop.ex.Value),
+                                    float(newcrop.oy.Value), float(newcrop.ey.Value)]
+
+                            tmpdx = float(newcrop.dx.Value)
+                            tmpdy = float(newcrop.dy.Value)
+
+                        if self.dx != tmpdx or self.dy != tmpdy:
+                            if tmpdx / self.dx != tmpdy / self.dy:
+                                badvalues = True
+
+                    newcrop.Destroy()
+
+                xmin, xmax, ymin, ymax = crop
+
+                gdal.Translate(tmpfile, fn, projWin=[xmin, ymax, xmax, ymin])
+            else:
+                gdal.Translate(tmpfile, fn)
+            self.import_geotif(tmpfile, which)
+
     def import_geotif(self, fn:str='', which:int = None, crop:list[float]=None):
         """
         Import de la matrice au format Geotiff
@@ -5900,7 +6163,7 @@ class WolfArray(Element_To_Draw, header_wolf):
                 llx = ulx + geotr[1] * raster_in.RasterXSize
                 lly = uly + geotr[5] * raster_in.RasterYSize
 
-                newcrop = CropDialog(None)
+                newcrop = CropDialog(None, self.get_mapviewer())
 
                 if self.wx_exists:
                     bounds = self.mapviewer.get_canvas_bounds()
@@ -7784,6 +8047,16 @@ class WolfArray(Element_To_Draw, header_wolf):
                 if update_min_max:
                     self.mypal.distribute_values(self.array.min(), self.array.max())
 
+        elif self.filename.endswith('.vrt'):
+            self.read_txt_header()
+
+            if self.preload:
+                update_min_max = check_threshold(self.nbx, self.nby, THRESHOLD)
+                self.import_vrt(which= which_band, crop = self.cropini)
+                self.loaded = True
+
+                if update_min_max:
+                    self.mypal.distribute_values(self.array.min(), self.array.max())
         else:
             self.read_txt_header()
 
@@ -8044,7 +8317,7 @@ class WolfArray(Element_To_Draw, header_wolf):
                 pass
             else:
                 if self.wx_exists:
-                    newcrop = CropDialog(None)
+                    newcrop = CropDialog(None, self.get_mapviewer())
 
                     if self.mapviewer is not None:
                         bounds = self.mapviewer.get_canvas_bounds()

wolfhece/wolf_vrt.py

@@ -38,12 +38,13 @@ def create_vrt(wdir:str, fout:str='out.vrt', format:str='tif'):
     myvrt = None
 
     os.chdir(curdir)
+
 def _get_diverged_relative_path(path: Path, base: Path) -> Path:
     """
     Get relative path from base to path, even if they only share part of their paths.
     More general than the next function "_get_relative_path", especially for not "child/parents paths"
     """
-    
+
     # Parts of the paths
     relative_path_parts = path.parts
     base_parts = base.parts
@@ -54,8 +55,8 @@ def _get_diverged_relative_path(path: Path, base: Path) -> Path:
 
     # Building of the relative path, by adding ".." from the divergence point
     return Path(*(['..'] * (len(base_parts) - i) + list(relative_path_parts[i:])))
-    
-    
+
+
 def _get_relative_path(path:Path, base:Path):
     """
     Get relative path from base to path
@@ -95,7 +96,7 @@ def create_vrt_from_files(files:list[Path]=[], fout:Path='assembly.vrt'):
     # change working directory to the parent of the output file
     os.chdir(fout.parent)
     # work with relative paths
-    
+
     myvrt = gdal.BuildVRT(str(fout.with_suffix('.vrt').name) , [str(_get_diverged_relative_path(file, fout.parent)) for file in files])
     # close the dataset -- force to write on disk
     myvrt = None
@@ -108,7 +109,7 @@ def create_vrt_from_files_first_based(files:list[Path]=[], fout:Path='assembly.v
 
     Restreint l'emprise et force la résolution sur le premier fichier listé
     """
-    
+
     if isinstance(fout, str):
         fout = Path(fout)
 
@@ -146,17 +147,17 @@ def create_vrt_from_files_first_based(files:list[Path]=[], fout:Path='assembly.v
 
     # retain current working directory
     oldcwd = os.getcwd()
-    # change working directory to the parent of the output file 
-    os.chdir(fout.parent.absolute()) 
-    # work with relative paths 
+    # change working directory to the parent of the output file
+    os.chdir(fout.parent.absolute())
+    # work with relative paths
     myvrt = gdal.BuildVRT(str(fout.with_suffix('.vrt').name),[str(_get_diverged_relative_path(file, fout.parent)) for file in files], options=options) #str(_get_diverged_relative_path(file, fout.parent)) for file in files
-    
+
     # close the dataset -- force to write on disk
     myvrt = None
     # restore working directory
     os.chdir(oldcwd)
-    
-    
+
+
 def create_vrt_from_diverged_files(files:list[Path]=[], fout:Path='assembly.vrt'):
     """
     Agglomération de tous les fichiers énumérés dans files dans un layer virtuel .vrt
@@ -178,7 +179,7 @@ def create_vrt_from_diverged_files(files:list[Path]=[], fout:Path='assembly.vrt'
     # change working directory to the parent of the output file
     os.chdir(fout.parent)
     # work with relative paths
-    
+
     myvrt = gdal.BuildVRT(str(fout.with_suffix('.vrt').name) , [str(_get_diverged_relative_path(file, fout.parent)) for file in files])
     # close the dataset -- force to write on disk
     myvrt = None
@@ -191,7 +192,7 @@ def create_vrt_from_diverged_files_first_based(files:list[Path]=[], fout:Path='a
 
     Restreint l'emprise et force la résolution sur le premier fichier listé
     """
-    
+
     if isinstance(fout, str):
         fout = Path(fout)
 
@@ -229,11 +230,11 @@ def create_vrt_from_diverged_files_first_based(files:list[Path]=[], fout:Path='a
 
     # retain current working directory
     oldcwd = os.getcwd()
-    # change working directory to the parent of the output file 
-    os.chdir(fout.parent.absolute()) 
-    # work with relative paths 
+    # change working directory to the parent of the output file
+    os.chdir(fout.parent.absolute())
+    # work with relative paths
     myvrt = gdal.BuildVRT(str(fout.with_suffix('.vrt').name),[str(_get_diverged_relative_path(file, fout.parent)) for file in files], options=options) #str(_get_diverged_relative_path(file, fout.parent)) for file in files
-    
+
     # close the dataset -- force to write on disk
     myvrt = None
     # restore working directory

{wolfhece-2.1.117.dist-info → wolfhece-2.1.119.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 wolfhece/Coordinates_operations.py,sha256=YyWlAwKManb-ReQrmP37rEXxehunUCihmkeDYX6qTAQ,8037
-wolfhece/CpGrid.py,sha256=ke4n1khTUoed2asJl1GR25PsEkI4TpiBDCo4u0aSo9M,10658
+wolfhece/CpGrid.py,sha256=_piG1u-ua7NzWh_PHJYTmxuPJ43ZfeYKNEQgZIJwDJ8,10660
 wolfhece/GraphNotebook.py,sha256=2TR8qjEwpMtl34QWgYNVe_PgTnuwhUxT5f9Y2zrmN2U,28257
 wolfhece/GraphProfile.py,sha256=OCgJo0YFFBI6H1z-5egJsOOoWF_iziiza0-bbPejNMc,69656
 wolfhece/Lidar2002.py,sha256=bX-nIzdpjD7rOfEgJpTeaW6rIdAXwDp_z4YTM9CgANY,6068
@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=gyl1MesSJZaVpC1XtvD78PpnE1VD3hGM3HPQXTJ3eJg,12963
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=4WS6eJ30xWx_vJPuiusn9Jnee3ujN7cMJGiMfVTSJOk,525450
+wolfhece/PyDraw.py,sha256=bbR2dQbgUBmoB3sMhVpmsdtbB8k3L7dUaK_krZT1E5M,542579
 wolfhece/PyGui.py,sha256=RlrLoCBdbiMnR4FSUD1yuy8fs--hxUl_zPu7zuduCLE,144706
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -16,7 +16,7 @@ wolfhece/PyParams.py,sha256=u_yGvrUqgLLkytZ7lGCIFi-7rQC0H2vRDw-MtmdvKPQ,99394
 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=NILb6FUMQLIiA-tdMCnW2RXmqToBQ5Y0DiXf5Od5Fy4,287908
+wolfhece/PyVertexvectors.py,sha256=p_xAuy_suPFzewH-YDDBh-_dh63bzsVZYFtT5KJDyBE,288205
 wolfhece/PyWMS.py,sha256=WmOzHP02wVcB5RGJAlENL_NzF9rYfvLxslRFyxaEt1Q,6615
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -52,11 +52,11 @@ 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=tmNeSS0MgZCxoxqHWb3ZW-HdeZCbWYDTq4C80WG7nWs,427777
+wolfhece/wolf_array.py,sha256=B29IemUUz358RKfNCkFOrwakKRQTZyCM6w3xQKQixqM,439060
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=ecoXXmmcLuyG1oPqU2dB_k03qMTCLTVQoSq1xi1EalU,17359
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
-wolfhece/wolf_vrt.py,sha256=NcPZYW4bu06IpqQuiutoAhCvDkeZ3TzOVb8z4wTQ1h8,14319
+wolfhece/wolf_vrt.py,sha256=wbxXVN7TL9zgdyF79S-4e3pje6wJEAgBEfF_Y8kkzxs,14271
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
 wolfhece/wolfresults_2D.py,sha256=GbuYSN1haTctY9AqUyAt1xQCOVpoUgSURD9d2XIqRXw,184827
 wolfhece/xyz_file.py,sha256=1pzLFmmdHca4yBVR9Jitic6N82rY28mRytGC1zMbY28,6615
@@ -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=78epDKXV-PQjaa5Lw4DEWQ98ocEOTdy4DngHeOxmCa4,389
+wolfhece/apps/version.py,sha256=nZL6V-sALgNIq_e6OrZ3odMzZs-o2EpgMnYF36fwdE4,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
@@ -154,7 +154,7 @@ wolfhece/lagrangian/particles.py,sha256=S52_-3rzgVhift6l4Gznvsf_RTggzvNaD1dPvQUr
 wolfhece/lagrangian/velocity_field.py,sha256=oGVjNm98gEpawreFIrC1lDyC5bEhkk2CsyYAlF1Kq50,10574
 wolfhece/lazviewer/__init__.py,sha256=lz60EpQOBZ-zjvYzff6Y11jzAmC7mjOaxRYAfoqizQs,473
 wolfhece/lazviewer/_add_path.py,sha256=GDwPnzHuGRXGriDNcu1SQ6HetFDGIApeAQZEzYArGvI,605
-wolfhece/lazviewer/laz_viewer.py,sha256=bCfMzEr4w3OwQEQKHhAaDudQ2fcj6vot7g3f7zod1iE,44259
+wolfhece/lazviewer/laz_viewer.py,sha256=yxW8RJu21MdcfJhcNRidJ3v1k5qlEHElPQqqYmFYaYM,74419
 wolfhece/lazviewer/libs/Qt5Core.dll,sha256=sTJ_ctYFY9KHMNytF-lzH_078zIvnKTjN-71FDkOWPw,4924928
 wolfhece/lazviewer/libs/Qt5Gui.dll,sha256=07BeaOeYByraGkKYeDiSDYLawHM8tyd55pVJlKbZ4Y0,5436416
 wolfhece/lazviewer/libs/Qt5Network.dll,sha256=U-9FiLE9LUKru8r8EQxTnwwlMpwS8JzUtenhkKTCox0,1038336
@@ -180,7 +180,7 @@ wolfhece/lazviewer/vfuncsdir/vfuncs.cp310-win_amd64.pyd,sha256=4mvnfY9Wd-oE7rJR1
 wolfhece/lazviewer/vfuncsdir/vfuncs.cp39-win_amd64.pyd,sha256=MzAEyrgnqja-FjHGtL-jbWg9o0f2SWUDVimXBN-8kCA,135168
 wolfhece/lazviewer/viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/lazviewer/viewer/viewer.exe,sha256=pF5nwE8vMWlEzkk-SOekae9zpOsPhTWhZbqaJntumJc,202240
-wolfhece/lazviewer/viewer/viewer.py,sha256=8_MQCaQOS0Z_oRPiGoRy1lq-aCirReX3hWEBjQID0ig,24665
+wolfhece/lazviewer/viewer/viewer.py,sha256=uVJS5xae-9eDC1JvetYhSNWO7AYsIE_8UxBoDn3tyKg,24851
 wolfhece/libs/MSVCP140.dll,sha256=2GrBWBI6JFuSdZLIDMAg_qKcjErdwURGbEYloAypx3o,565640
 wolfhece/libs/WolfDll.dll,sha256=E8SeV0AHVXW5ikAQuVtijqIvaYx7UIMeqvnnsmTMCT8,132934144
 wolfhece/libs/__init__.py,sha256=x7QvPd7hjL-Xl7RjlA8y6rcvKCkYu3JpFE3YnzUJeCY,3326
@@ -254,7 +254,7 @@ wolfhece/models/waterdepths.pal,sha256=8rcQfuZOeLKzYv5sARPkhpvZYc1OToj3ZukcbuRUg
 wolfhece/models/white_black.pal,sha256=BKjVN1kuk1OtJB9S3uM5fxteWbggI3Pb8p9WdDptT4c,51
 wolfhece/opengl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/opengl/gl_utils.py,sha256=-eH2WAWdLFr6mzEwN8XdfJfM8U2rgvRryCAqjH-zeys,66136
-wolfhece/opengl/py3d.py,sha256=A7KKxpU2TD1R2zHCxc7QRBbP-VuO634YnYBqe8SBSuI,66921
+wolfhece/opengl/py3d.py,sha256=JB-ULMkULJo8vQHq4ppLGlhySJ_6b348k_3n8aG-uc8,67123
 wolfhece/opengl/tile_packer.py,sha256=0B1-Q-Jm-lKIXrw2lFbrrVL9gbtbl50jeWl67ymYbsc,15841
 wolfhece/pythonfortran/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/pythonfortran/example_makendarray.py,sha256=FNPp6lsU9Mv0O8VLN3JHWk5Qn1zZxUSCPeDyUI1-x48,2718
@@ -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.117.dist-info/METADATA,sha256=iHYdNpmm0UZPQ3tfZVdkFMm8E_N9LLzEnEeJpvROUHU,2587
-wolfhece-2.1.117.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-wolfhece-2.1.117.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.117.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.117.dist-info/RECORD,,
+wolfhece-2.1.119.dist-info/METADATA,sha256=Tf-shF_qPggy6yqiR1YhtJfHFqJBOD3vVZrJx4jSxo0,2587
+wolfhece-2.1.119.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+wolfhece-2.1.119.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.119.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.119.dist-info/RECORD,,