wolfhece 2.0.11__py3-none-any.whl → 2.0.13__py3-none-any.whl

wolfhece/PyDraw.py

@@ -80,6 +80,8 @@ ID_SORTALONG = 1001
 ID_LOCMINMAX = 1002
 ID_PLOTCS = 1003   #Manageactions ID for profile plots
 
+LIST_1TO9 = [wx.WXK_NUMPAD1, wx.WXK_NUMPAD2, wx.WXK_NUMPAD3, wx.WXK_NUMPAD4, wx.WXK_NUMPAD5, wx.WXK_NUMPAD6, wx.WXK_NUMPAD7, wx.WXK_NUMPAD8, wx.WXK_NUMPAD9 ] + [ord(str(cur)) for cur in range(1,10)]
+
 class draw_type(Enum):
     # FIXME: change this to be more robust -> Done !
     # Be careful with the enum name, it must be the same than the one used to create the tree list elements, but in lower case
@@ -1151,6 +1153,22 @@ class WolfMapViewer(wx.Frame):
 
                     return fig, ax, im
 
+                else:
+                    """ Création d'un objet bitmap wx sur base du canvas
+                    et copie dans le clipboard
+                    """
+                    # wxbitmap = wx.Bitmap().FromBuffer(myimage.width,myimage.height,myimage.tobytes())
+                    wxbitmap = wx.Bitmap().FromBufferRGBA(myimage.width,myimage.height,myimage.tobytes())
+
+                    # objet wx exportable via le clipboard
+                    dataobj = wx.BitmapDataObject()
+                    dataobj.SetBitmap(wxbitmap)
+
+                    wx.TheClipboard.SetData(dataobj)
+                    wx.TheClipboard.Close()
+
+                    return myimage
+
         else:
             wx.MessageBox("Can't open the clipboard", "Error")
 
@@ -1662,22 +1680,25 @@ class WolfMapViewer(wx.Frame):
         self.mimicme()
 
     def setsizecanvas(self,width,height):
+        """ Redimensionne la fenêtre graphique """
         self.canvas.SetClientSize(width, height)
 
     def updatescalefactors(self):
+        """ Mise à jour des facteurs d'échelle """
         width, height = self.canvas.GetSize()
 
         self.sx = 1
         self.sy = 1
-        if width > 0:
+        if self.width > 0 and width >0 :
             self.sx = float(width) / self.width
-        if height > 0:
+        if self.height > 0 and height > 0 :
             self.sy = float(height) / self.height
 
         self.sx = min(self.sx, self.sy)
         self.sy = self.sx
 
     def add_viewer_and_link(self):
+        """ Ajout d'une nouvelle fenêtre de visualisation et liaison avec la fenêtre courante """
         dlg = wx.TextEntryDialog(self, _('Enter a caption for the new window'))
 
         ret = dlg.ShowModal()
@@ -1689,6 +1710,8 @@ class WolfMapViewer(wx.Frame):
         newcap = dlg.GetValue()
         dlg.Destroy()
         newview = WolfMapViewer(None, newcap, w=600, h=600, wxlogging=self.wxlogging, wolfparent=self.wolfparent)
+        newview.add_grid()
+        newview.add_WMS()
 
         if self.linkedList is None:
             self.linkedList = [self]
@@ -1700,11 +1723,15 @@ class WolfMapViewer(wx.Frame):
             curview.linkedList = self.linkedList
             curview.link_shareopsvect = False
 
+        logging.info(_('New viewer added and linked'))
+
     def add_grid(self):
+        """ Ajout d'une grille """
         mygrid = Grid(1000.)
         self.add_object('vector', newobj=mygrid, ToCheck=False, id='Grid')
 
     def add_WMS(self):
+        """ Ajout de couches WMS """
         xmin = 0
         xmax = 0
         ymin = 0
@@ -5505,11 +5532,17 @@ class WolfMapViewer(wx.Frame):
                 self.active_zone = self.active_vector.parentzone
                 self.active_zones.expand_tree(self.active_zone)
 
-        elif self.action == 'select node by node':
-            currray: WolfArray
-            curarray = self.active_array
-            curarray.mngselection.add_node_to_selection(x, y)
-            curarray.mngselection.update_nb_nodes_sections()
+        elif 'select node by node' in self.action:
+
+            if 'results' in self.action:
+                curobj:Wolfresults_2D
+                curobj = self.active_res2d.mngselection
+            else:
+                curobj: WolfArray
+                curobj = self.active_array.mngselection
+
+            curobj.add_node_to_selection(x, y)
+            curobj.update_nb_nodes_sections()
             self.Paint()
 
         elif 'select by tmp vector' in self.action or 'select by vector' in self.action:
@@ -6097,6 +6130,7 @@ class WolfMapViewer(wx.Frame):
         Depending on the action, the method will call differnt routines and refresh the figure.
         """
         if self.action is not None:
+            locaction = self.action
             if 'select by tmp vector' in self.action or 'select by vector' in self.action:
                 inside_under = 'inside' in self.action
 
@@ -6110,10 +6144,15 @@ class WolfMapViewer(wx.Frame):
                 else:
                     self.active_array.mngselection.select_underpoly(self.active_vector)
 
+                if 'tmp' in locaction:
+                    # we must reset the temporary vector
+                    self.active_vector.reset()
+
             elif self.action == 'laz tmp vector':
                 self.end_action(_('End of LAZ selection'))
                 self.active_vector.myvertices.pop(-1)
                 self.plot_laz_around_active_vec()
+                self.active_vector.reset()
 
             elif self.action == 'create polygon - tiles':
                 self.end_action(_('End of polygon creation'))
@@ -6190,7 +6229,7 @@ class WolfMapViewer(wx.Frame):
             elif self.action == 'select active vector2':
                 self.end_action(_('End of vector selection'))
 
-            elif self.action == 'select node by node':
+            elif 'select node by node' in self.action:
                 self.end_action(_('End of node by node selection'))
 
         self.copyfrom = None
@@ -6267,26 +6306,27 @@ class WolfMapViewer(wx.Frame):
                      'Z': _('Drawing : zoom in'),
                      'z': _('Drawing : zoom out'),
                      'Arrows': _('Drawing : lateral movements'),
-                     'CTRL+C': _('Drawing : copy canvas to Clipboard wo axes'),
-                     'ALT+C': _('Drawing : copy Matplotlib image to Clipboard with axes'),
+                     'c or C': _('Drawing : copy canvas to Clipboard wo axes'),
+                     'CTRL+C': _('Drawing : copy canvas to Clipboard as Matplotlib image'),
 
                      'F9': _('Arrays : select all cells'),
                      'F11': _('Arrays : select by criteria'),
                      'F12': _('Arrays : operations'),
-                     'N': _('Arrays : node-by-node selection'),
-                     'B': _('Arrays : temporary vector selection'),
-                     'V': _('Arrays : activated vector selection - inner zone'),
+                     'n or N': _('Arrays : node-by-node selection'),
+                     'b or B': _('Arrays : temporary vector selection'),
+                     'v or V': _('Arrays : activated vector selection - inner zone'),
                      'r': _('Arrays : reset the selection'),
                      'R': _('Arrays : reset all selections'),
-                     '1,2': _('Arrays : transfer the selection to the dictionary'),
+                     '1,2...9': _('Arrays : transfer the selection to the dictionary'),
                      'i': _('Arrays : 2D interpolation based on the selection on the current matrix'),
-                     'CTRL+C': _('Arrays : Set copy source'),
+                     'CTRL+C': _('Arrays : Set copy source and current selection to clipboard as string'),
                      'CTRL+V': _('Arrays : paste selected values'),
+                     'CTRL+ALT+C or ALTGr+C': _('Arrays : Set copy source and current selection to clipboard as script'),
                      'CTRL+ALT+V or ALTGr+V': _('Arrays : paste selection to active array'),
 
-                     'P': _('Cross sections : Pick a profile/cross section'),
+                     'p or P': _('Cross sections : Pick a profile/cross section'),
 
-                     'F, CTRL+F': _('Zones : search for the polyline in the current zone or in all zones'),
+                     'f or F, CTRL+F': _('Zones : search for the polyline in the current zone or in all zones'),
 
                      'RETURN': _('Action : End the current action (see also right double-click -- OnRDClick)'),
 
@@ -6349,7 +6389,6 @@ class WolfMapViewer(wx.Frame):
 
     def end_action(self, message:str=''):
         """ Message to end action """
-
         self.action = None
         logging.info(_('ACTION : ') + _(message) if message != '' else _('ACTION : End of action') )
         self.msg_action(1)
@@ -6362,6 +6401,7 @@ class WolfMapViewer(wx.Frame):
         key = e.GetKeyCode()
         ctrldown = e.ControlDown()
         altdown = e.AltDown()
+        shiftdown = e.ShiftDown()
 
         myobj = e.EventObject
 
@@ -6372,7 +6412,7 @@ class WolfMapViewer(wx.Frame):
             logging.debug(_('Alt is down'))
 
         if ctrldown or altdown:
-            if key == wx.WXK_F2 and not e.ShiftDown():
+            if key == wx.WXK_F2 and not shiftdown:
 
                 if self.active_res2d is not None:
                     nb = self.active_res2d.get_nbresults()
@@ -6389,7 +6429,7 @@ class WolfMapViewer(wx.Frame):
                 else:
                     logging.info(_('Please activate a simulation before search a specific result'))
 
-            elif key == wx.WXK_F2 and e.ShiftDown():
+            elif key == wx.WXK_F2 and shiftdown:
 
                 if self.active_res2d is not None:
                     nb = self.active_res2d.get_nbresults()
@@ -6417,7 +6457,7 @@ class WolfMapViewer(wx.Frame):
                 else:
                     logging.info(_('Please activate a simulation before searching a specific result'))
 
-            if key == wx.WXK_F4 and not e.ShiftDown():
+            if key == wx.WXK_F4 and not shiftdown:
 
                 if self.active_particle_system is not None:
 
@@ -6435,7 +6475,7 @@ class WolfMapViewer(wx.Frame):
                 else:
                     logging.info(_('Please activate a particle system before searching a specific result'))
 
-            elif key == wx.WXK_F4 and e.ShiftDown():
+            elif key == wx.WXK_F4 and shiftdown:
 
                 if self.active_particle_system is not None:
 
@@ -6462,12 +6502,12 @@ class WolfMapViewer(wx.Frame):
                 else:
                     logging.info(_('Please activate a simulation before search a specific result'))
 
-
-            elif key == 388: #+ from numpad
+            elif key == wx.WXK_NUMPAD_ADD: #+ from numpad
                 if self.active_res2d is not None:
                     self.active_res2d.update_zoom_2(1.1)
                     self.Refresh()
-            elif key == 390: #- from numpad
+
+            elif key == wx.WXK_NUMPAD_SUBTRACT: #- from numpad
                 if self.active_res2d is not None:
                     self.active_res2d.update_zoom_2(1./1.1)
                     self.Refresh()
@@ -6505,39 +6545,47 @@ class WolfMapViewer(wx.Frame):
 
             elif key == wx.WXK_UP:
                 self.upobj()
+
             elif key == wx.WXK_DOWN:
                 self.downobj()
 
-            elif key == ord('C') and e.AltDown():
+            elif key == ord('C') and altdown and not ctrldown:
                 # ALT+C
                 #Copie du canvas dans le clipboard pour transfert vers autre application
                 self.copy_canvasogl()
 
-            elif key == ord('C') and e.ControlDown():
+            elif key == ord('C') and ctrldown and not altdown:
                 # CTRL+C
-                # CTRL+ALT+C ou Alt Gr + C
+                if self.active_array is None:
+                    dlg = wx.MessageDialog(self,
+                                        _('The active array is None - Please active an array from which to copy the values !'),
+                                        style=wx.OK)
+                    dlg.ShowModal()
+                    dlg.Destroy()
+                    return
 
-                #Copie du canvas dans le clipboard pour transfert vers autre application
-                # self.copy_canvasogl()
+                logging.info(_('Start copying values / Current selection to clipboard'))
+                self.copyfrom = self.active_array
+                self.mimicme_copyfrom()  # force le recopiage de copyfrom dans les autres matrices liées
 
+                self.active_array.mngselection.copy_to_clipboard()
+
+            elif key == ord('C') and ctrldown and altdown:
                 if self.active_array is None:
-                    if e.AltDown():
-                        dlg = wx.MessageDialog(self,
-                                            _('The active array is None - Please active an array from which to copy the selection !'),
-                                            style=wx.OK)
-                    else:
-                        dlg = wx.MessageDialog(self,
-                                            _('The active array is None - Please active an array from which to copy the values !'),
-                                            style=wx.OK)
+                    dlg = wx.MessageDialog(self,
+                                        _('The active array is None - Please active an array from which to copy the selection !'),
+                                        style=wx.OK)
                     dlg.ShowModal()
+                    dlg.Destroy()
                     return
 
-                logging.info(_('Copy selection'))
+                logging.info(_('Start copying selection / Current selection to clipboard as script (Python)'))
                 self.copyfrom = self.active_array
                 self.mimicme_copyfrom()  # force le recopiage de copyfrom dans les autres matrices liées
 
+                self.active_array.mngselection.copy_to_clipboard(type='script')
 
-            elif key == ord('V') and e.ControlDown():
+            elif key == ord('V') and ctrldown:
                 # CTRL+V
                 # CTRL+ALT+V ou Alt Gr + V
 
@@ -6580,10 +6628,29 @@ class WolfMapViewer(wx.Frame):
                     elif len(cursel) > 0:
                         z = fromarray.mngselection.get_values_sel()
                         self.active_array.set_values_sel(cursel, z)
+
         else:
             if key == wx.WXK_DELETE:
                 self.removeobj()
 
+            elif key == wx.WXK_ESCAPE:
+
+                logging.info(_('Escape key pressed -- Set all active objects and "action" to None'))
+
+                self.action = None
+                self.active_array = None
+                self.active_vector = None
+                self.active_zone = None
+                self.active_zones = None
+                self.active_res2d = None
+                self.active_tile = None
+                self.active_particle_system = None
+                self.active_vertex = None
+
+            elif key == ord('C'):
+
+                 self.copy_canvasogl(mpl = False)
+
             elif key == wx.WXK_SPACE:
                 if self.timer_ps is not None and self.active_particle_system is not None :
                     if self.timer_ps.IsRunning():
@@ -6598,12 +6665,13 @@ class WolfMapViewer(wx.Frame):
                 if self.active_res2d is not None:
                     self.active_res2d.update_arrowpixelsize_vectorfield(-1)
                     self.Refresh()
+
             elif key == 390: #- from numpad
                 if self.active_res2d is not None:
                     self.active_res2d.update_arrowpixelsize_vectorfield(1)
                     self.Refresh()
 
-            elif key == 13 or key==370:
+            elif key == 13 or key==370 or key == wx.WXK_RETURN or key == wx.WXK_NUMPAD_ENTER:
                 # 13 = RETURN classic keyboard
                 # 370 = RETURN NUMPAD
                 self._endactions()
@@ -6616,23 +6684,23 @@ class WolfMapViewer(wx.Frame):
                 if self.active_zone is not None:
                     self.start_action('select active vector2 all', _('Select active vector2 all'))
 
-            elif key == ord('1') or key == 325: #325 is 1 on keypad
-                if self.active_array is not None:
-                    if len(self.active_array.mngselection.myselection)>0:
-                        self.active_array.mngselection.move_selectionto(1,(0,0,255,255))
+            elif key in LIST_1TO9:
 
-            elif key == ord('2') or key == 326: #326 is 2 on keypad:
                 if self.active_array is not None:
-                    if len(self.active_array.mngselection.myselection)>0:
-                        self.active_array.mngselection.move_selectionto(2,(0,255,0,255))
+                    colors = [(0, 0, 255, 255), (0, 255, 0, 255), (0, 128, 255, 255), (255, 255, 0, 255), (255, 165, 0, 255), (128, 0, 128, 255), (255, 192, 203, 255), (165, 42, 42, 255), (128, 128, 128, 255)]
+                    idx = LIST_1TO9.index(key)
+                    if idx > 8:
+                        idx -= 9
+
+                    self.active_array.mngselection.move_selectionto(str(idx+1), colors[idx])
 
             elif key == wx.WXK_F1:
                 self.read_last_result()
 
-            elif key == wx.WXK_F2 and e.ShiftDown():
+            elif key == wx.WXK_F2 and shiftdown:
                 self.simul_previous_step()
 
-            elif key == wx.WXK_F4 and e.ShiftDown():
+            elif key == wx.WXK_F4 and shiftdown:
                 self.particle_previous_step()
 
             elif key == wx.WXK_F4:
@@ -6644,6 +6712,7 @@ class WolfMapViewer(wx.Frame):
             elif key == wx.WXK_F5:
                 # Autoscale
                 self.Autoscale()
+
             elif key == wx.WXK_F7:
                 self.update()
 
@@ -6671,38 +6740,53 @@ class WolfMapViewer(wx.Frame):
             elif key == ord('N'):  # N
                 if self.active_array is not None:
                     self.active_array.myops.select_node_by_node()
+
+                if self.active_res2d is not None:
+                    self.active_res2d.properties.select_node_by_node()
+
             elif key == ord('V'):  # V
                 if self.active_array is not None:
                     self.active_array.myops.select_vector_inside_manager()
+
             elif key == ord('B'):  # B
                 if self.active_array is not None:
                     self.active_array.myops.select_vector_inside_tmp()
+
             elif key == ord('P'):  # P
                 self.start_action('Select nearest profile', _('Select nearest profile'))
 
-            elif key == ord('Z'):  # Z
+            elif key == ord('Z') and shiftdown:  # Z
                 self.width = self.width / 1.1
                 self.height = self.height / 1.1
                 self.setbounds()
-            elif key == ord('z'):  # z
+
+            elif key == ord('Z'):  # z
                 self.width = self.width * 1.1
                 self.height = self.height * 1.1
                 self.setbounds()
-            elif key == ord('R'):  # R
+
+            elif key == ord('R') and shiftdown:  # R
                 if self.active_array is not None:
                     self.active_array.myops.reset_all_selection()
-            elif key == ord('r'):  # r
+                    self.Refresh()
+
+            elif key == ord('R'):  # r
                 if self.active_array is not None:
                     self.active_array.myops.reset_selection()
+                    self.Refresh()
+
             elif key == wx.WXK_UP:
                 self.mousey = self.mousey + self.height / 10.
                 self.setbounds()
+
             elif key == wx.WXK_DOWN:
                 self.mousey = self.mousey - self.height / 10.
                 self.setbounds()
+
             elif key == wx.WXK_LEFT:
                 self.mousex = self.mousex - self.width / 10.
                 self.setbounds()
+
             elif key == wx.WXK_RIGHT:
                 self.mousex = self.mousex + self.width / 10.
                 self.setbounds()
@@ -6855,8 +6939,6 @@ class WolfMapViewer(wx.Frame):
             # Dessin du Front
             self._plotting(draw_type.WMSFORE)
 
-            # glFinish()
-
             # Gestion des BC (si actif)
             if self.active_bc is not None:
                 self.active_bc.plot()
@@ -6866,7 +6948,7 @@ class WolfMapViewer(wx.Frame):
             # except:
             #     pass
 
-            glFlush()
+            # glFlush()
             self.canvas.SwapBuffers()
         else:
             raise NameError(

wolfhece/PyGui.py

@@ -27,7 +27,7 @@ except:
 from .PyConfig import WolfConfiguration, ConfigurationKeys
 from .pylogging import create_wxlogwindow
 
-# FIXME : Is it necessary to override wx.Frame ? WolfMapManager is a wx.Frame. 
+# FIXME : Is it necessary to override wx.Frame ? WolfMapManager is a wx.Frame.
 #         Is it sufficient to run a wx.App ?
 class GenMapManager(wx.Frame):
     mapviewer:WolfMapViewer
@@ -75,12 +75,12 @@ class GenMapManager(wx.Frame):
         """
         Setup of a WolfMapViewer
         """
-        self.mapviewer = WolfMapViewer(None, 
-                                       title=title, 
-                                       wolfparent= wolfparent, 
+        self.mapviewer = WolfMapViewer(None,
+                                       title=title,
+                                       wolfparent= wolfparent,
                                        wxlogging=self.mylogs)
-        self.add_grid()
-        self.add_WMS()
+        self.mapviewer.add_grid()
+        self.mapviewer.add_WMS()
 
     def get_mapviewer(self):
         # Retourne une instance WolfMapViewer
@@ -89,45 +89,53 @@ class GenMapManager(wx.Frame):
     def get_configuration(self):
         return self._configuration
 
-    def add_grid(self):
-        mygrid=Grid(1000.)
-        self.mapviewer.add_object('vector',newobj=mygrid,ToCheck=False,id='Grid')
-
-    def add_WMS(self):
-        xmin=0
-        xmax=0
-        ymin=0
-        ymax=0
-        orthos={'IMAGERIE':{'1971':'ORTHO_1971','1994-2000':'ORTHO_1994_2000',
-                        '2006-2007':'ORTHO_2006_2007',
-                        '2009-2010':'ORTHO_2009_2010',
-                        '2012-2013':'ORTHO_2012_2013',
-                        '2015':'ORTHO_2015','2016':'ORTHO_2016','2017':'ORTHO_2017',
-                        '2018':'ORTHO_2018','2019':'ORTHO_2019','2020':'ORTHO_2020',
-                        '2021':'ORTHO_2021'}}
-        for idx,(k,item) in enumerate(orthos.items()):
-            for kdx,(m,subitem) in enumerate(item.items()):
-                self.mapviewer.add_object(which='wmsback',
-                                            newobj=imagetexture('PPNC',m,k,subitem,
-                                                                self.mapviewer,xmin,xmax,ymin,ymax,-99999,1024),
-                                            ToCheck=False,id='PPNC '+m)
-
-        self.mapviewer.add_object(which='wmsback',
-                                  newobj=imagetexture('PPNC','Orthos France','OI.OrthoimageCoverage.HR','',
-                                                      self.mapviewer,xmin,xmax,ymin,ymax,-99999,1024,France=True,epsg='EPSG:27563'),
-                                          ToCheck=False,id='Orthos France')
-
-        forelist={'EAU':{'Aqualim':'RES_LIMNI_DGARNE','Alea':'ALEA_INOND','Lidaxes':'LIDAXES','Juillet 2021':'ZONES_INONDEES','Juillet 2021 IDW':'ZONES_INONDEES$IDW'},
-                    'LIMITES':{'Secteurs Statistiques':'LIMITES_QS_STATBEL'},
-                    'INSPIRE':{'Limites administratives':'AU_wms'},
-                    'PLAN_REGLEMENT':{'Plan Percellaire':'CADMAP_2021_PARCELLES'}}
-
-        for idx,(k,item) in enumerate(forelist.items()):
-            for kdx,(m,subitem) in enumerate(item.items()):
-                self.mapviewer.add_object(which='wmsfore',
-                            newobj=imagetexture('PPNC',m,k,subitem,
-                            self.mapviewer,xmin,xmax,ymin,ymax,-99999,1024),
-                            ToCheck=False,id=m)
+    # def add_grid(self, tomapviewer:WolfMapViewer=None):
+    #     """ Add a grid to the mapviewer """
+    #     mygrid=Grid(1000.)
+
+    #     if tomapviewer is None:
+    #         tomapviewer = self.mapviewer
+    #     tomapviewer.add_object('vector',newobj=mygrid,ToCheck=False,id='Grid')
+
+    # def add_WMS(self, tomapviewer:WolfMapViewer=None):
+    #     """ Add WMS layers to the mapviewer """
+    #     if tomapviewer is None:
+    #         tomapviewer = self.mapviewer
+
+    #     xmin=0
+    #     xmax=0
+    #     ymin=0
+    #     ymax=0
+    #     orthos={'IMAGERIE':{'1971':'ORTHO_1971','1994-2000':'ORTHO_1994_2000',
+    #                     '2006-2007':'ORTHO_2006_2007',
+    #                     '2009-2010':'ORTHO_2009_2010',
+    #                     '2012-2013':'ORTHO_2012_2013',
+    #                     '2015':'ORTHO_2015','2016':'ORTHO_2016','2017':'ORTHO_2017',
+    #                     '2018':'ORTHO_2018','2019':'ORTHO_2019','2020':'ORTHO_2020',
+    #                     '2021':'ORTHO_2021'}}
+    #     for idx,(k,item) in enumerate(orthos.items()):
+    #         for kdx,(m,subitem) in enumerate(item.items()):
+    #             tomapviewer.add_object(which='wmsback',
+    #                                         newobj=imagetexture('PPNC',m,k,subitem,
+    #                                                             tomapviewer,xmin,xmax,ymin,ymax,-99999,1024),
+    #                                         ToCheck=False,id='PPNC '+m)
+
+    #     tomapviewer.add_object(which='wmsback',
+    #                               newobj=imagetexture('PPNC','Orthos France','OI.OrthoimageCoverage.HR','',
+    #                                                   tomapviewer,xmin,xmax,ymin,ymax,-99999,1024,France=True,epsg='EPSG:27563'),
+    #                                       ToCheck=False,id='Orthos France')
+
+    #     forelist={'EAU':{'Aqualim':'RES_LIMNI_DGARNE','Alea':'ALEA_INOND','Lidaxes':'LIDAXES','Juillet 2021':'ZONES_INONDEES','Juillet 2021 IDW':'ZONES_INONDEES$IDW'},
+    #                 'LIMITES':{'Secteurs Statistiques':'LIMITES_QS_STATBEL'},
+    #                 'INSPIRE':{'Limites administratives':'AU_wms'},
+    #                 'PLAN_REGLEMENT':{'Plan Percellaire':'CADMAP_2021_PARCELLES'}}
+
+    #     for idx,(k,item) in enumerate(forelist.items()):
+    #         for kdx,(m,subitem) in enumerate(item.items()):
+    #             tomapviewer.add_object(which='wmsfore',
+    #                         newobj=imagetexture('PPNC',m,k,subitem,
+    #                         tomapviewer,xmin,xmax,ymin,ymax,-99999,1024),
+    #                         ToCheck=False,id=m)
 
 class MapManager(GenMapManager):
     def __init__(self,*args, **kw):
@@ -294,8 +302,8 @@ class HydrologyModel(GenMapManager):
         self.mapviewer.add_object(which='other',newobj=self.SPWstations,ToCheck=False,id='SPW-MI stations')
         self.mapviewer.add_object(which='other',newobj=self.DCENNstations,ToCheck=False,id='SPW-DCENN stations')
 
-        self.add_grid()
-        self.add_WMS()
+        self.mapviewer.add_grid()
+        self.mapviewer.add_WMS()
 
         self.mapviewer.findminmax(True)
         self.mapviewer.Autoscale(False)

wolfhece/PyPalette.py

@@ -480,10 +480,17 @@ class wolfpalette(wx.Frame,LinearSegmentedColormap):
                 myfile.write(str(self.colors[i,1])+'\n')
                 myfile.write(str(self.colors[i,2])+'\n')
 
-    def isopop(self,array: ma.masked_array,nbnotnull=99999):
+    def isopop(self, array: ma.masked_array, nbnotnull:int=99999):
         """Remplissage des valeurs de palette sur base d'une équirépartition de valeurs"""
 
         sortarray = array.flatten(order='F')
+
+        idx_nan = np.where(np.isnan(sortarray))
+        if idx_nan[0].size > 0:
+            sortarray = np.delete(sortarray, idx_nan)
+            nbnotnull -= idx_nan[0].size
+            logging.warning('NaN values found in array - removed from palette')
+
         sortarray.sort(axis=-1)
 
         #valeurs min et max

wolfhece/Results2DGPU.py

@@ -18,7 +18,7 @@ try:
     from wolfgpu.results_store import ResultsStore, ResultType
 except :
     logging.error(_("Unable to import wolfgpu.results_store.ResultsStore. Please install wolfgpu package or add a symlink to the wolfgpu package in the wolfhece directory"))
-    raise ImportError(_("Unable to import wolfgpu.results_store.ResultsStore. Please install wolfgpu package or add a symlink to the wolfgpu package in the wolfhece directory"))
+    # raise ImportError(_("Unable to import wolfgpu.results_store.ResultsStore. Please install wolfgpu package or add a symlink to the wolfgpu package in the wolfhece directory"))
 
 def _load_res(x) -> tuple[csr_array, csr_array, csr_array]:
     store:ResultsStore

wolfhece/mesh2d/bc_manager.py

@@ -721,7 +721,7 @@ class BcManager(wx.Frame):
                     namebc=self._find_EnumName_TypeBC(tbc)
 
                     if(str(val)!='99999.0'):
-                        text+= "simul.add_boundary_condition(i={}, j={},bc_type=BoundaryConditionsTypes.{}, bc_value={}, border=Direction.{}\n".format(i,j,namebc,val,direction)
+                        text+= "simul.add_boundary_condition(i={}, j={},bc_type=BoundaryConditionsTypes.{}, bc_value={}, border=Direction.{})\n".format(i,j,namebc,val,direction)
         return text
 
     def parse(self, text:str):