wolfhece 2.2.3__py3-none-any.whl → 2.2.5__py3-none-any.whl

wolfhece/PyDraw.py

@@ -41,7 +41,6 @@ try:
     from datetime import timedelta
     from multiprocessing import Pool
     from pathlib import Path
-    from time import sleep
 except ImportError as e:
     print(e)
     raise ImportError("Error importing time, datetime, multiprocessing, pathlib. Please check your installation.")
@@ -131,7 +130,7 @@ except ImportError as e:
     raise ImportError("Error importing apps.curvedigitizer. Please check your installation.")
 
 try:
-    from .drowning_victims.Class import Drowning_victim_Viewer
+    from .drowning_victims.drowning_class import Drowning_victim_Viewer
 except ImportError as e:
     print(e)
     raise ImportError("Error importing Drowning_victims.Class. Please check your installation.")
@@ -1957,6 +1956,27 @@ class WolfMapViewer(wx.Frame):
 
     active_fig: MplFigViewer
 
+
+    # def check_user_activity(self, *args):
+    #     while True:
+    #         sleep(1)
+    #         if datetime.now() - self._last_activity_time > timedelta(seconds=3): # 5 secondes d'inactivité
+    #             args[0]._user_active = False
+
+    # def _user_activity_true(self):
+    #     self._user_active = True
+    #     self._last_activity_time = datetime.now()
+
+    # def background_task(self, *args):
+
+    #     while args[0]._user_active:
+    #         sleep(1)
+
+    #     args[0]._update_background()
+    #     args[0].Paint()
+
+    #     args[0]._thread_update_background = None
+
     def __init__(self,
                  wxparent = None,
                  title:str = _('Default Wolf Map Viewer'),
@@ -1979,6 +1999,12 @@ class WolfMapViewer(wx.Frame):
 
         """
 
+        # self._user_active = True # True if the user is active in the viewer
+        # self._last_activity_time  = datetime.now() # last time the user was active in the viewer
+        # self._check_activity_thread = threading.Thread(target=self.check_user_activity, args=[self]) # thread to check user activity
+        # self._check_activity_thread.start() # start the thread
+        # self._thread_update_background = None # thread to update the background
+
         self.treewidth = treewidth
         super(WolfMapViewer, self).__init__(wxparent, title=title, size=(w + self.treewidth, h))
 
@@ -4978,6 +5004,7 @@ class WolfMapViewer(wx.Frame):
         self.canvas.Bind(wx.EVT_RIGHT_DCLICK, self.On_Right_Double_Clicks)
         self.canvas.Bind(wx.EVT_LEFT_DCLICK, self.On_Left_Double_Clicks)
         self.canvas.Bind(wx.EVT_LEFT_DOWN, self.On_Mouse_Left_Down)
+        self.canvas.Bind(wx.EVT_LEFT_UP, self.On_Mouse_Left_Up)
         self.canvas.Bind(wx.EVT_MIDDLE_DOWN, self.On_Mouse_Left_Down)
         self.canvas.Bind(wx.EVT_RIGHT_DOWN, self.On_Mouse_Right_Down)
         self.canvas.Bind(wx.EVT_RIGHT_UP, self.On_Mouse_Right_Up)
@@ -5255,9 +5282,8 @@ class WolfMapViewer(wx.Frame):
                                      '2019': '2019',
                                      '2020': '2020',
                                      '2021': '2021',
-                                     '2021': '2021',
                                      '2022': '2022',
-}}
+                                     }}
 
         for idx, (k, item) in enumerate(orthos.items()):
             for kdx, (m, subitem) in enumerate(item.items()):
@@ -11537,6 +11563,7 @@ class WolfMapViewer(wx.Frame):
         We use this event to manage "action" set by others objects.
 
         """
+        #self._user_activity_true()
 
         pos = e.GetPosition()
         x, y = self.getXY(pos)
@@ -11956,6 +11983,9 @@ class WolfMapViewer(wx.Frame):
 
 
     def On_Mouse_Right_Up(self, e):
+
+        #self._user_activity_true()
+
         pos = e.GetPosition()
         x, y = self.getXY(pos)
 
@@ -11984,6 +12014,9 @@ class WolfMapViewer(wx.Frame):
                     pass
 
     def On_Mouse_Button(self, e: wx.MouseEvent):
+
+        #self._user_activity_true()
+
         d = e.GetWheelDelta()
         r = e.GetWheelRotation()
         a = e.GetWheelAxis()
@@ -12092,6 +12125,7 @@ class WolfMapViewer(wx.Frame):
 
     def On_Mouse_Left_Down(self, e):
         """ Event when the left button of the mouse is pressed """
+        #self._user_activity_true()
 
         # if not self.move:
         pos = e.GetPosition()
@@ -12099,6 +12133,14 @@ class WolfMapViewer(wx.Frame):
         self.mousedown = (x, y)
         # self.move = True
 
+    def On_Mouse_Left_Up(self, e):
+        """ Event when the left button of the mouse is released """
+
+        pass
+        # if self._thread_update_background is None:
+        #     self._thread_update_background = threading.Thread(target=self.background_task, args=[self]) # thread to update the background
+        #     self._thread_update_background.start() # start the thread
+
     def _set_active_bc(self):
         """Search and activate BCManager according to active_array"""
         if self.active_bc is not None:
@@ -12605,10 +12647,12 @@ class WolfMapViewer(wx.Frame):
 
         self.mytooltip.PopulateOnePage()
 
-
     def On_Mouse_Motion(self, e: wx.MouseEvent):
         """ Mouse move event """
 
+
+        #self._user_activity_true()
+
         # Déplacement de la souris sur le canvas OpenGL
         posframe = self.GetPosition() # Get the position of the frame -> useful to set the tooltip position
         pos = e.GetPosition() # Get the position of the mouse in the canvas
@@ -14110,20 +14154,33 @@ class WolfMapViewer(wx.Frame):
         self.update()
 
 
-    def update(self):
+    def _update_background(self):
         """
-        Update backgournd et foreground elements and arrays if local minmax is checked.
-
+        Update background
         """
 
         # dessin du background
         for obj in self.iterator_over_objects(draw_type.WMSBACK):
             obj.reload()
 
+    def _update_foreground(self):
+        """
+        Update foreground
+        """
         # dessin du foreground
         for obj in self.iterator_over_objects(draw_type.WMSFORE):
             obj.reload()
 
+    def update(self):
+        """
+        Update backgournd et foreground elements and arrays if local minmax is checked.
+
+        """
+
+        self._update_background()
+
+        self._update_foreground()
+
         if self.locminmax.IsChecked() or self.update_absolute_minmax:
             for curarray in self.iterator_over_objects(draw_type.ARRAYS):
                 curarray: WolfArray

wolfhece/PyPalette.py

@@ -96,7 +96,10 @@ class wolfpalette(wx.Frame, LinearSegmentedColormap):
         self.set_over(tuple(self.colormax))
 
     def get_rgba(self, x: np.ndarray):
-        """Récupération de la couleur en fonction de la valeur x"""
+        """Récupération de la couleur en fonction de la valeur x
+
+        :param x: tableau de valeurs
+        """
 
         dval = self.values[-1]-self.values[0]
         if dval == 0.:
@@ -260,6 +263,7 @@ class wolfpalette(wx.Frame, LinearSegmentedColormap):
         if self.interval_cst:
             discrete_cmap = ListedColormap(self.colorsflt[:, :3])
             colorbar = ScalarMappable(BoundaryNorm(self.values, ncolors=self.nb-1), cmap=discrete_cmap)
+            return colorbar
         else:
             return ScalarMappable(Normalize(self.values[0], self.values[-1]), cmap=self)
 
@@ -453,6 +457,26 @@ class wolfpalette(wx.Frame, LinearSegmentedColormap):
         ax.set_xticks(pos)
         ax.set_xticklabels(txt, rotation=30, fontsize=6)
 
+    @property
+    def cmap(self):
+        """ Récupération de la palette de couleurs """
+        return self
+
+    @property
+    def vmin(self):
+        """ Récupération de la valeur minimale """
+        return self.values[0]
+
+    @property
+    def vmax(self):
+        """ Récupération de la valeur maximale """
+        return self.values[-1]
+
+    @property
+    def norm(self):
+        """ Récupération de la normalisation """
+        return Normalize(self.values[0], self.values[-1])
+
     def fillgrid(self, gridto: CpGrid):
         """ Remplissage d'une grille avec les valeurs de la palette """
 
@@ -692,7 +716,7 @@ class wolfpalette(wx.Frame, LinearSegmentedColormap):
             normval = np.ones([len(self.values)])
 
             if dval > 0.:
-                normval = (self.values-self.values[0])/(self.values[-1]-self.values[0])
+                normval = (self.values-self.values[0])/dval
 
             normval[0] = 0.
             normval[-1] = 1.

wolfhece/PyVertex.py

@@ -822,6 +822,20 @@ class cloud_vertices(Element_To_Draw):
         # read data
         gdf:gpd.GeoDataFrame = gpd.read_file(fn, bbox=bbox)
 
+        if gdf is None:
+            logging.error(_('Error during import of shapefile : ')+fn)
+            return
+
+        # check if the file is empty
+        if gdf.empty:
+            logging.error(_('Imported shapefile is empty : ')+fn)
+            return
+
+        #check if the number of lines is > 0
+        if len(gdf) == 0:
+            logging.error(_('Imported shapefile is empty : ')+fn)
+            return
+
         # Bouclage sur les éléments du Shapefile
         if targetcolumn in gdf.columns:
             k=0
@@ -839,8 +853,7 @@ class cloud_vertices(Element_To_Draw):
         elif 'geometry' in gdf.columns:
 
             try:
-                for k, (xx,yy) in enumerate(zip(gdf.get_coordinates()['x'], gdf.get_coordinates()['y'])):
-
+                for k, (xx,yy) in enumerate(zip(gdf.geometry.x, gdf.geometry.y)):
                     curvert = wolfvertex(xx, yy)
                     curdict = self.myvertices[k] = {}
                     curdict['vertex'] = curvert

wolfhece/PyWMS.py

@@ -202,7 +202,8 @@ def getLifeWatch(cat:Literal['None'],
                 yr:float,
                 w:int = None,
                 h:int = None,
-                tofile=True) -> BytesIO:
+                tofile=True,
+                format:Literal['image/png', 'image/png; mode=8bit']='image/png') -> BytesIO:
 
     wms=WebMapService(f'https://maps.elie.ucl.ac.be/cgi-bin/mapserv72?map=/maps_server/lifewatch/mapfiles/LW_Ecotopes/latest/{cat}.map&SERVICE=wms',
                         version='1.3.0')
@@ -226,6 +227,16 @@ def getLifeWatch(cat:Literal['None'],
         # w = int(real_w * ppkm)
         h = int(real_h * ppkm)
 
+    MAXSIZE = 2048
+    if w > MAXSIZE:
+        pond = w / MAXSIZE
+        w = MAXSIZE
+        h = int(h / pond)
+    if h > MAXSIZE:
+        pond = h / MAXSIZE
+        h = MAXSIZE
+        w = int(w / pond)
+
     if tofile:
         img=wms.getmap(layers=['lc_hr_raster'],
                     #    styles=['default'],
@@ -250,7 +261,7 @@ def getLifeWatch(cat:Literal['None'],
                            srs='EPSG:31370',
                            bbox=(xl,yl,xr,yr),
                            size=(w,h),
-                           format='image/png',
+                           format=format,
                            transparent=False)
             return BytesIO(img.read())
         except:

wolfhece/apps/version.py

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