wolfhece 2.1.89__py3-none-any.whl → 2.1.90__py3-none-any.whl

wolfhece/PyDraw.py

@@ -622,9 +622,6 @@ class WolfMapViewer(wx.Frame):
         self.menupontgltfonebyone = self.cs_menu.Append(wx.ID_ANY, _("Create bridge and export gltf..."),
                                                           _("Bridge gltf"))
         # self.menuimport3dfaces_from_DXF = self.toolsmenu.Append(wx.ID_ANY, _("Import triangulation..."), _("DXF"))
-        self.menuinteractptri = self.cs_menu.Append(wx.ID_ANY, _("Interpolate on active triangulation..."), _("InterpolateTri"))
-        self.menucomparecloud = self.cs_menu.Append(wx.ID_ANY, _("Compare cloud to array..."), _("Comparison"))
-        self.menucomparetri = self.cs_menu.Append(wx.ID_ANY, _("Compare triangles to array..."), _("Comparison"))
 
         #Profile plots
         #The action for plotting cross section's profile is initialised.
@@ -816,6 +813,8 @@ class WolfMapViewer(wx.Frame):
         self.myfigprof = None
 
         self.cloudmenu=None
+        self.trianglesmenu = None
+
         self._configuration = None
 
         self.compare_results = None
@@ -914,14 +913,37 @@ class WolfMapViewer(wx.Frame):
     def do_quit(self):
         pass
 
+    def create_triangles_menu(self):
+        """ Menu for triangulations """
+
+        if self.trianglesmenu is None:
+
+            self.trianglesmenu = wx.Menu()
+            self.menubar.Append(self.trianglesmenu, _('&Triangulations'))
+
+            self._menuinteractptri = self.trianglesmenu.Append(wx.ID_ANY, _("Interpolate on active triangulation..."), _("InterpolateTri"))
+            self._menucomparetri = self.trianglesmenu.Append(wx.ID_ANY, _("Compare triangles to array..."), _("Comparison"))
+
+
     def create_cloud_menu(self):
+        """ Menu for cloud points """
 
         if self.cloudmenu is None:
             self.cloudmenu = wx.Menu()
             self.menubar.Append(self.cloudmenu, _('Cloud'))
 
-            interpcloudonarray = self.cloudmenu.Append(wx.ID_ANY, _("Interpolate active cloud on active array..."),
-                                           _("Interpolation"))
+            interpcloudonarray = self.cloudmenu.Append(wx.ID_ANY, _("Interpolate active cloud on active array..."),_("Interpolation"))
+            self._menucomparecloud = self.cloudmenu.Append(wx.ID_ANY, _("Compare cloud to array..."), _("Comparison"))
+            split_cloud = self.cloudmenu.Append(wx.ID_ANY, _("Split cloud..."), _("Split cloud"))
+
+    def split_cloud_by_vector(self):
+        """ Split cloud by vector """
+
+        inside_cloud, outside_cloud = self.active_vector.split_cloud(self.active_cloud)
+
+        self.add_object('cloud', newobj = inside_cloud, id = inside_cloud.idx)
+        self.add_object('cloud', newobj = outside_cloud, id = outside_cloud.idx)
+
 
     def get_choices_arrays(self):
         """Boîte de dialogue permettant de choisir une ou plusieurs matrices parmi celles chargées"""
@@ -2336,19 +2358,32 @@ class WolfMapViewer(wx.Frame):
                         #     palette = self.active_res2d.mypal
 
                     if palette is not None:
-                        bufpal = io.BytesIO()
-                        palette.export_image(bufpal,'v')
-                        bufpal.seek(0)
+                        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)))
 
-                        #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))
 
-                        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))
-                        imnew.paste(impal.convert('RGB'),(im.size[0]-10, int((im.size[1]-impal.size[1])/3)))
                         im=imnew
 
                     #création d'un objet bitmap wx
@@ -2724,7 +2759,11 @@ class WolfMapViewer(wx.Frame):
                 ax.set_xlabel('X [m]')
                 ax.set_ylabel('Y [m]')
 
-                self.palette_for_copy.export_image(None, h_or_v='v', figax=(fig,axes[1]))
+                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')
 
                 # if self.active_array is not None:
                 #     self.active_array.mypal.export_image(None, h_or_v='v', figax=(fig,axes[1]))
@@ -3847,7 +3886,8 @@ class WolfMapViewer(wx.Frame):
                     if curid != 'format' and curid != 'dirlaz':
                         mycs = crosssections(curname[key_Param.VALUE],
                                             format=myproject.myparams['cross_sections']['format'][key_Param.VALUE],
-                                            dirlaz=myproject.myparams['cross_sections']['dirlaz'][key_Param.VALUE])
+                                            dirlaz=myproject.myparams['cross_sections']['dirlaz'][key_Param.VALUE],
+                                            mapviewer = self)
 
                         self.add_object('cross_sections', newobj=mycs, id=curid)
 
@@ -3875,7 +3915,7 @@ class WolfMapViewer(wx.Frame):
             if 'vector' in myproject.myparams.keys():
                 for curid, curname in zip(myproject.myparams['vector'].keys(), myproject.myparams['vector'].values()):
                     if exists(curname[key_Param.VALUE]):
-                        myvec = Zones(curname[key_Param.VALUE], parent=self)
+                        myvec = Zones(curname[key_Param.VALUE], parent=self, mapviewer = self)
                         self.add_object('vector', newobj=myvec, id=curid)
                     else:
                         logging.info(_('Bad parameter in project file - vector : ')+ curname[key_Param.VALUE])
@@ -3884,7 +3924,7 @@ class WolfMapViewer(wx.Frame):
                 for curid, curname in zip(myproject.myparams['array'].keys(), myproject.myparams['array'].values()):
 
                     if exists(curname[key_Param.VALUE]):
-                        curarray = WolfArray(curname[key_Param.VALUE])
+                        curarray = WolfArray(curname[key_Param.VALUE], mapviewer=self)
                         self.add_object('array', newobj=curarray, id=curid)
                     else:
                         logging.info(_('Bad parameter in project file - array : ')+ curname[key_Param.VALUE])
@@ -3892,7 +3932,7 @@ class WolfMapViewer(wx.Frame):
             if 'cloud' in myproject.myparams.keys():
                 for curid, curname in zip(myproject.myparams['cloud'].keys(), myproject.myparams['cloud'].values()):
                     if exists(curname[key_Param.VALUE]):
-                        mycloud = cloud_vertices(curname[key_Param.VALUE])
+                        mycloud = cloud_vertices(curname[key_Param.VALUE], mapviewer=self)
                         self.add_object('cloud', newobj=mycloud, id=curid)
                     else:
                         logging.info(_('Bad parameter in project file - cloud : ')+ curname[key_Param.VALUE])
@@ -3900,7 +3940,7 @@ class WolfMapViewer(wx.Frame):
             if 'wolf2d' in myproject.myparams.keys():
                 for curid, curname in zip(myproject.myparams['wolf2d'].keys(), myproject.myparams['wolf2d'].values()):
                     if exists(curname[key_Param.VALUE]):
-                        curwolf = Wolfresults_2D(curname[key_Param.VALUE])
+                        curwolf = Wolfresults_2D(curname[key_Param.VALUE], mapviewer=self)
                         self.add_object('res2d', newobj=curwolf, id=curid)
                     else:
                         logging.info(_('Bad parameter in project file - wolf2d : ')+ curname[key_Param.VALUE])
@@ -3912,10 +3952,10 @@ class WolfMapViewer(wx.Frame):
                     if exists(curname[key_Param.VALUE]):
 
                         if 'simul_gpu_results' in curname[key_Param.VALUE]:
-                            curwolf = wolfres2DGPU(Path(curname[key_Param.VALUE]))
+                            curwolf = wolfres2DGPU(Path(curname[key_Param.VALUE]), mapviewer=self)
                         else:
                             if exists(join(curname[key_Param.VALUE], 'simul_gpu_results')):
-                                curwolf = wolfres2DGPU(Path(join(curname[key_Param.VALUE], 'simul_gpu_results')))
+                                curwolf = wolfres2DGPU(Path(join(curname[key_Param.VALUE], 'simul_gpu_results')), mapviewer=self)
                             else:
                                 logging.info(_('Bad directory : ')+ curname[key_Param.VALUE])
 
@@ -5146,6 +5186,19 @@ class WolfMapViewer(wx.Frame):
             autoscale = False
             self.compare_cloud2array()
 
+        elif itemlabel==_("Split cloud..."):
+            autoscale = False
+
+            if self.active_cloud is None:
+                logging.warning(_('No active cloud !'))
+                return
+
+            if self.active_vector is None:
+                logging.warning(_('No active vector !'))
+                return
+
+            self.split_cloud_by_vector()
+
         elif itemlabel==_("Compare triangles to array..."):
             autoscale = False
             self.compare_tri2array()
@@ -6753,6 +6806,8 @@ class WolfMapViewer(wx.Frame):
             self.myclouds.append(newobj)
             self.active_cloud = newobj
 
+            newobj.set_mapviewer(self)
+
             self.create_cloud_menu()
 
         elif which.lower() == 'triangulation':
@@ -6768,6 +6823,8 @@ class WolfMapViewer(wx.Frame):
             self.mytri.append(newobj)
             self.active_tri = newobj
 
+            self.create_triangles_menu()
+
         elif which.lower() == 'other':
 
             if not newobj is None:
@@ -7376,6 +7433,8 @@ class WolfMapViewer(wx.Frame):
             myobj = self.selected_object
             if type(myobj) in [WolfArray, WolfArrayMB, WolfArrayMNAP, Zones, Wolfresults_2D, wolfres2DGPU, Particle_system, Picc_data, Cadaster_data, hydrometry_wolfgui]:
                 myobj.show_properties()
+            elif isinstance(myobj, cloud_vertices):
+                myobj.show_properties()
 
         elif text == _('Boundary conditions'):
             bc = self.get_boundary_manager(self.selected_object)
@@ -9828,10 +9887,10 @@ class WolfMapViewer(wx.Frame):
         for loctri in self.mytri:
             if loctri.plotted or force:
                 loctri.find_minmax(force)
-                xmin = min(loctri.minx, xmin)
-                xmax = max(loctri.maxx, xmax)
-                ymin = min(loctri.miny, ymin)
-                ymax = max(loctri.maxy, ymax)
+                xmin = min(loctri.xmin, xmin)
+                xmax = max(loctri.xmax, xmax)
+                ymin = min(loctri.ymin, ymin)
+                ymax = max(loctri.ymax, ymax)
                 k += 1
 
         for locres2d in self.myres2D:

wolfhece/PyPalette.py

@@ -203,6 +203,10 @@ class wolfpalette(wx.Frame, LinearSegmentedColormap):
         :param : fn : filepath or io.BytesIO()
         :param : h_or_v : configuration to save 'h' = horizontal, 'v' = vertical, '' = both
         """
+        if self.values is None:
+            logging.warning('No values in palette - Nothing to do !')
+            return None, None
+
         if fn == '':
             file = wx.FileDialog(None, "Choose .pal file", wildcard="png (*.png)|*.png|all (*.*)|*.*", style=wx.FD_SAVE)
             if file.ShowModal() == wx.ID_CANCEL:

wolfhece/PyParams.py

@@ -18,6 +18,7 @@ from typing import Union, Literal
 from enum import Enum
 from copy import deepcopy
 import numpy as np
+from pathlib import Path
 
 try:
     from .PyTranslate import _
@@ -39,19 +40,17 @@ class Type_Param(Enum):
     Strings are also used by Fortran Code -- modify with care
     """
     Integer_or_Float = 'Integer_or_Float'
-    Integer = 'integer'
+    Integer = 'Integer'
     Logical = 'Logical'
     Float = 'Float'
     File = 'File'
-    file = 'file'
     Directory = 'Directory'
-    directory = 'directory'
     Color = 'Color'
     Fontname = 'Fontname'
     String = 'String'
     Empty = ''
-    Double = 'double'
-    Real = 'real'
+    Double = 'Double'
+    Real = 'Real'
 
 
 class key_Param(Enum):
@@ -99,17 +98,17 @@ def new_infos_incr(groupname:str= None, paramname:str='nb', min:int=1, max:int=1
 def search_type(chain:str) -> Type_Param:
     """ recherche du typage dans une chaîne de caractères """
 
-    if chain.lower().find(Type_Param.Integer.value)>-1 and chain.find(Type_Param.Double.value)>-1:
+    if chain.lower().find(Type_Param.Integer.value.lower())>-1 and chain.find(Type_Param.Double.value.lower())>-1:
         return Type_Param.Integer_or_Float
-    elif chain.lower().find(Type_Param.Integer.value)>-1:
+    elif chain.lower().find(Type_Param.Integer.value.lower())>-1:
         return Type_Param.Integer
-    elif chain.find(Type_Param.Logical.value)>-1:
+    elif chain.lower().find(Type_Param.Logical.value.lower())>-1:
         return Type_Param.Logical
-    elif chain.find(Type_Param.Double.value)>-1 or chain.find('dble')>-1 or chain.find(Type_Param.Real.value)>-1:
+    elif chain.lower().find(Type_Param.Double.value.lower())>-1 or chain.find('dble')>-1 or chain.find(Type_Param.Real.value.lower())>-1:
         return Type_Param.Float
-    elif chain.find('({})'.format(Type_Param.file))>-1:
+    elif chain.lower().find('({})'.format(Type_Param.File.value.lower()))>-1:
         return Type_Param.File
-    elif chain.find('({})'.format(Type_Param.directory))>-1 or chain.find('(dir)')>-1:
+    elif chain.lower().find('({})'.format(Type_Param.Directory.value.lower()))>-1 or chain.find('(dir)')>-1:
         return Type_Param.Directory
     else:
         return Type_Param.String
@@ -1511,13 +1510,13 @@ class Wolf_Param(wx.Frame):
                 # recherche du type dans le commentaire
                 curparam[key_Param.TYPE]=search_type(paramloc[2])
                 if curparam[key_Param.TYPE] == Type_Param.String:
-                    # recherche du type dans la châine complète
+                    # recherche du type dans la chaîne complète
                     type_in_fulchain = search_type(param)
 
                     if type_in_fulchain != Type_Param.String:
                         curparam[key_Param.TYPE] = type_in_fulchain
                 try:
-                    # tentaive de recherche du type dans les valeurs par défaut
+                    # tentative de recherche du type dans les valeurs par défaut
                     param_def=self.myparams_default[groupname][paramloc[0]]
                     curparam[key_Param.TYPE]=param_def[key_Param.TYPE]
                 except:
@@ -1903,14 +1902,21 @@ class Wolf_Param(wx.Frame):
 
         if isinstance(value, float):
             return Type_Param.Float
-        elif isinstance(value, int):
-            return Type_Param.Integer
+        # ATTEENTION : les booléens sont des entiers --> il faut les traiter avant
         elif isinstance(value, bool):
             return Type_Param.Logical
+        elif isinstance(value, int):
+            return Type_Param.Integer
         elif isinstance(value, tuple):
             return Type_Param.Color
         else:
-            return Type_Param.String
+            tmp_path = Path(value)
+            if tmp_path.is_file():
+                return Type_Param.File
+            elif tmp_path.is_dir():
+                return Type_Param.Directory
+            else:
+                return Type_Param.String
 
     def change_param(self, group:str, name:str, value:Union[float, int, str, bool]):
         """ Modify the value of the parameter if found, otherwise None obj """

wolfhece/PyVertex.py

@@ -843,6 +843,20 @@ class cloud_vertices(Element_To_Draw):
             self._updatebounds(newcloud=cloud)
         pass
 
+    def add_vertices(self, vertices:list[wolfvertex]):
+        """ Add a list of vertices to the cloud """
+
+        first_id = len(self.myvertices)
+        for curid, curvert in enumerate(vertices):
+            self.myvertices[first_id + curid] = {}
+            self.myvertices[first_id + curid]['vertex'] = curvert
+            self._updatebounds(curvert)
+
+    def get_vertices(self):
+        """ Return the vertices as a list """
+
+        return [self.myvertices[item]['vertex'] for item in self.myvertices]
+
     # def _create_textures(self):
     #     """ Create textures for the cloud """
 
@@ -879,11 +893,29 @@ class cloud_vertices(Element_To_Draw):
 
             mapviewer = self.get_mapviewer()
 
+            which_legend = self.myprop.legendtext
+
             for id, item in enumerate(self.myvertices):
+
                 curvert = self.myvertices[item]['vertex']
 
                 if curvert.x > xmin and curvert.x < xmax and curvert.y > ymin and curvert.y < ymax:
 
+                    if which_legend == '':
+                        text_legend = str(item)
+                    elif which_legend == 'ID':
+                        text_legend = str(id)
+                    elif which_legend == 'X':
+                        text_legend = str(curvert.x)
+                    elif which_legend == 'Y':
+                        text_legend = str(curvert.y)
+                    elif which_legend == 'Z':
+                        text_legend = str(curvert.z)
+                    elif which_legend in self.myvertices[item]:
+                        text_legend = self.myvertices[item][which_legend]
+                    else:
+                        text_legend = which_legend
+
                     r,g,b = getRGBfromI(self.myprop.legendcolor)
 
                     curtxt_infos = Text_Infos(self.myprop.legendpriority,
@@ -896,7 +928,7 @@ class cloud_vertices(Element_To_Draw):
                                             relative_position=self.myprop.legendrelpos
                                             )
 
-                    text = Text_Image_Texture(item, mapviewer, curtxt_infos, None, curvert.x, curvert.y)
+                    text = Text_Image_Texture(text_legend, mapviewer, curtxt_infos, None, curvert.x, curvert.y)
 
                     text.paint()
 

wolfhece/PyVertexvectors.py

@@ -18,7 +18,7 @@ from wx.core import BoxSizer, FlexGridSizer, TreeItemId
 from OpenGL.GL  import *
 from shapely.geometry import LineString, MultiLineString,Point,MultiPoint,Polygon,JOIN_STYLE, MultiPolygon
 from shapely.ops import nearest_points,substring, split, polygonize
-from shapely import delaunay_triangles
+from shapely import delaunay_triangles, prepare, is_prepared, destroy_prepared
 import pygltflib
 from scipy.interpolate import interp1d
 import matplotlib.pyplot as plt
@@ -39,7 +39,7 @@ from .wolf_texture import genericImagetexture
 from .textpillow import Font_Priority
 from .PyTranslate import _
 from .CpGrid import CpGrid
-from .PyVertex import wolfvertex,getIfromRGB,getRGBfromI
+from .PyVertex import wolfvertex,getIfromRGB,getRGBfromI, cloud_vertices
 from .PyParams import Wolf_Param, key_Param, Type_Param, new_json, new_infos_incr
 from .lazviewer.laz_viewer import myviewer
 from .wolf_texture import Text_Image_Texture,Text_Infos
@@ -1010,6 +1010,7 @@ class vector:
             self.myprop=vectorproperties(parent=self)
 
         self.linestring = None
+        self.polygon = None
 
         # Utile surtout pour les sections en travers
         self.zdatum = 0.
@@ -1276,13 +1277,26 @@ class vector:
             xyz[:,2]+=self.zdatum
         return xyz
 
-    def prepare_shapely(self):
+    def prepare_shapely(self, prepare_shapely:bool = True):
         """
         Conversion Linestring Shapely et rétention de l'objet afin d'éviter de multiples appel
-        par ex. dans une boucle
+        par ex. dans une boucle.
+
+        :param prepare_shapely: Préparation de l'objet Shapely pour une utilisation optimisée
+                                - True par défaut
+                                - see https://shapely.readthedocs.io/en/stable/reference/shapely.prepare.html
+
         """
 
+        self.reset_linestring()
+
         self.linestring = self.asshapely_ls()
+        self.polygon = self.asshapely_pol()
+
+        if prepare_shapely:
+            prepare(self.linestring)
+            prepare(self.polygon)
+
 
     def projectontrace(self, trace):
         """
@@ -1343,7 +1357,7 @@ class vector:
         else:
             return None
 
-    def intersection(self, vec2 = None, eval_dist=False,norm=False, force_single=False):
+    def intersection(self, vec2:"vector" = None, eval_dist=False,norm=False, force_single=False):
         """
         Calcul de l'intersection avec un autre vecteur
 
@@ -1380,7 +1394,20 @@ class vector:
     def reset(self):
         """Remise à zéro"""
         self.myvertices=[]
-        self.linestring=None
+        self.reset_linestring()
+
+    def reset_linestring(self):
+        """Remise à zéro de l'objet Shapely"""
+
+        if self.linestring is not None:
+            if is_prepared(self.linestring):
+                destroy_prepared(self.linestring)
+            self.linestring=None
+
+        if self.polygon is not None:
+            if is_prepared(self.polygon):
+                destroy_prepared(self.polygon)
+            self.polygon=None
 
     def add_vertex(self,addedvert: Union[list[wolfvertex], wolfvertex]):
         """
@@ -1817,7 +1844,7 @@ class vector:
         while k<self.nbvertices:
             self.myvertices.pop(k)
 
-        if self.linestring is not None:
+        if self.linestring is not None or self.polygon is not None:
             self.prepare_shapely()
 
         self._reset_listogl()
@@ -2391,11 +2418,11 @@ class vector:
         return np.asarray([[curvert.x, curvert.y, curvert.in_use] for curvert in self.myvertices])
 
     @property
-    def sz(self):
+    def sz_curvi(self):
         return self.get_sz()
 
     @property
-    def s(self):
+    def s_curvi(self):
         sz = self.get_sz()
         return sz[0]
 
@@ -2649,6 +2676,40 @@ class vector:
             self.parentzone.reset_listogl()
 
 
+    def select_points_inside(self, xy:cloud_vertices | np.ndarray):
+        """ Select the points inside a polygon
+
+        :param xy: cloud_vertices or np.ndarray with x,y coordinates
+        :return: list of boolean
+        """
+
+        self.prepare_shapely()
+
+        if isinstance(xy, cloud_vertices):
+            xy = xy.get_xyz()[:,0:2]
+
+        inside = [self.polygon.contains(Point(curxy)) for curxy in xy]
+
+        return inside
+
+    def split_cloud(self, cloud_to_split:cloud_vertices):
+        """ Split a cloud of vertices on the vector """
+
+        inside = self.select_points_inside(cloud_to_split)
+
+        cloud_inside = cloud_vertices(idx = 'inside_'+cloud_to_split.idx)
+        cloud_outside = cloud_vertices(idx = 'outside_'+cloud_to_split.idx)
+
+        vertices = cloud_to_split.get_vertices()
+
+        for idx, (locinside, curvert) in enumerate(zip(inside, vertices)):
+            if locinside:
+                cloud_inside.add_vertex(curvert)
+            else:
+                cloud_outside.add_vertex(curvert)
+
+        return cloud_inside, cloud_outside
+
 class zone:
     """
     Objet de gestion d'informations vectorielles

wolfhece/apps/version.py

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

wolfhece/gpuview.py

@@ -277,7 +277,15 @@ class VectorField(Element_To_Draw):
 
         super().__init__(idx, plotted, mapviewer, need_for_wx)
 
-        self.mapviewer.SetCurrentContext()
+        if self.mapviewer is None:
+            logging.error("No mapviewer defined for VectorField")
+            return
+
+        try:
+            self.mapviewer.SetCurrentContext()
+        except:
+            logging.error("Error during OpenGL context setup -- VectorField")
+            return
 
         self._gpu_program_ref = 1
         while self._gpu_program_ref in _global_gpu_state:

{wolfhece-2.1.89.dist-info → wolfhece-2.1.90.dist-info}/METADATA

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

@@ -7,16 +7,16 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=UNtl5UzZ399JqjJT67-4DWaIkv76sc1FiEsSDJpXlL0,10458
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=3pd5ynlveRs43Qr5eOhcNdkywxPifuq-qnsT5gabImo,425009
+wolfhece/PyDraw.py,sha256=CvnaK7NgeB25hlzlF-BxU38LT7-3ffuPnana6Mm9PDE,427447
 wolfhece/PyGui.py,sha256=HY0beOMSp1JEyq8-vfVynzVrmKxvaO_sJSMwlNqCNrg,105289
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
-wolfhece/PyPalette.py,sha256=3ehK6H2PvqSe0zICR1HyNs6KQokR1DmnAh4LwYnLIcU,28009
-wolfhece/PyParams.py,sha256=LGt9uBFRVeS0F_kObJw8bPkWFqYSzf5pUTscxVU5Mxo,97725
+wolfhece/PyPalette.py,sha256=QCzXBnYlv7YfHjpJWyO_8F-uOLOe7O_RbkyrnMYzgM4,28146
+wolfhece/PyParams.py,sha256=6fREK5cUCGw84SDyPvuSzidnX-9BXOX3fve5XBG1K_I,98114
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
-wolfhece/PyVertex.py,sha256=MtZVjIWIi62QX_oqNosb56xPgjhOGVeGz-XsD82tsNg,40614
-wolfhece/PyVertexvectors.py,sha256=mKwu_gMHMPTayfBNscbXEvi4cEVU3TUMz4ZBwfTSflo,249665
+wolfhece/PyVertex.py,sha256=aj1Xp6n0pMb_q6AMADHnQ9pgjjRU4EQm0m4Tmc1uoEM,41912
+wolfhece/PyVertexvectors.py,sha256=BLIs97SN45nFQn2T1brzN9c4FIzNNzB0WaM1kUd-E1g,251815
 wolfhece/PyWMS.py,sha256=fyyzm2HFwq8aRwVYHKiBatcZOeKnFi6DWhv4nfscySQ,4602
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -30,7 +30,7 @@ wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,3
 wolfhece/drawing_obj.py,sha256=7vY04B6r08nurTTFmBXHyR5tVIF1YzAEw_uz4pqTDIw,4233
 wolfhece/flow_SPWMI.py,sha256=XDAelwAY-3rYOR0WKW3fgYJ_r8DU4IP6Y5xULW421tk,20956
 wolfhece/friction_law.py,sha256=MtZJLo-pTj3-Fw-w12z1LSgSIDrH-JGR0iD9wer_fpQ,5498
-wolfhece/gpuview.py,sha256=ggFoxBntUjHqsoxwTZQOE-UsbtC8YAIwZD1i3veAe-o,24204
+wolfhece/gpuview.py,sha256=Rrq8R4Bjp_CCJbJ08gmolpYjXKIzV5qmnJJTiQLhFTY,24463
 wolfhece/import_ascfiles.py,sha256=6Zl8qBR9c6VtyziookQ8YE9KC0GtW_J9WFt5ubyGp-s,4465
 wolfhece/ins.py,sha256=uUeLMS1n3GPnfJhxl0Z2l-UXpmPUgthuwct282OOEzk,36184
 wolfhece/irm_qdf.py,sha256=KyrIk0Gu50Q702EWxRpwKTWI2KGjtHA1l8CL-Y469O0,26394
@@ -75,7 +75,7 @@ wolfhece/apps/curvedigitizer.py,sha256=Yps4bcayzbsz0AoVc_dkSk35dEhhn_esIBy1Ziefg
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=gKztaJeoBX2Q6XCl3TmwMp6Xp9OnTRA-2mTDn5PQ7Z4,388
+wolfhece/apps/version.py,sha256=0ewKEdaYlj_bYhGOPsIk1mktB1LQK_EnKtWL-Vk3Dl8,388
 wolfhece/apps/wolf.py,sha256=j_CgvsL8rwixbVvVD5Z0s7m7cHZ86gmFLojKGuetMls,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -285,8 +285,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=8PlMYrb_8jI8h9F0_EagpM
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=ORy7fz4dcp691qKzaOZHrRLZ0uXNhL-LIHxmpDGL6BI,5007
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.89.dist-info/METADATA,sha256=SdYAj8yeKFdq3QpmcSFCy-WAbIThcct1H2RnLGWBn7k,2570
-wolfhece-2.1.89.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-wolfhece-2.1.89.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.89.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.89.dist-info/RECORD,,
+wolfhece-2.1.90.dist-info/METADATA,sha256=Nf-U-idNQhjOSifNKkIGDY8shuwNX8TV1B3AyAZcXlA,2570
+wolfhece-2.1.90.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+wolfhece-2.1.90.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.90.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.90.dist-info/RECORD,,