wolfhece 2.0.4__py3-none-any.whl → 2.0.6__py3-none-any.whl

wolfhece/PyDraw.py

@@ -14,8 +14,10 @@ from PIL.PngImagePlugin import PngInfo
 import io
 import json
 import glob
-from osgeo import gdal
-import cv2
+try:
+    from osgeo import gdal
+except ModuleNotFoundError:
+    raise Exception("I can't find the 'gdal' package. You should get it from https://www.lfd.uci.edu/~gohlke/pythonlibs/")
 from time import sleep
 from datetime import timedelta
 from multiprocessing import Pool
@@ -28,7 +30,7 @@ try:
 except:
     msg=_('Error importing OpenGL library')
     msg+=_('   Python version : ' + sys.version)
-    msg+=_('   Please check your version of opengl32.dll -- conflict may exist between different fils present on your desktop')
+    msg+=_('   Please check your version of opengl32.dll -- conflict may exist between different files present on your desktop')
     raise Exception(msg)
 
 import matplotlib.pyplot as plt
@@ -50,7 +52,7 @@ from .wolfresults_2D import Wolfresults_2D, views_2D
 from .PyTranslate import _
 from .PyVertex import cloud_vertices, getIfromRGB
 from .RatingCurve import SPWMIGaugingStations, SPWDCENNGaugingStations
-from .wolf_array import WOLF_ARRAY_MB, SelectionData, WolfArray, WolfArray_Sim2D, WolfArrayMB, CropDialog, header_wolf, WolfArrayMNAP
+from .wolf_array import WOLF_ARRAY_MB, SelectionData, WolfArray, WolfArray_Sim2D, WolfArrayMB, CropDialog, header_wolf, WolfArrayMNAP, WOLF_ARRAY_FULL_SINGLE, WOLF_ARRAY_FULL_INTEGER8, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_DOUBLE, WOLF_ARRAY_FULL_INTEGER
 from .PyParams import Wolf_Param, key_Param, Type_Param
 from .mesh2d.bc_manager import BcManager
 from .PyVertexvectors import *
@@ -138,8 +140,9 @@ class WolfMapViewer(wx.Frame):
     active_tile: Tiles
     active_particle_system: Particle_system
 
-    def __init__(self, wxparent, title, w=500, h=500, treewidth=200, wolfparent=None):
+    def __init__(self, wxparent, title, w=500, h=500, treewidth=200, wolfparent=None, wxlogging=None):
 
+        self._wxlogging = wxlogging
         self.action = None  # Action à entreprendre
         self.update_absolute_minmax = False  # Force la MAJ de la palette
         self.copyfrom = None  # aucun élément pointé par CTRL+C
@@ -195,7 +198,7 @@ class WolfMapViewer(wx.Frame):
         # Gestion des menus
         self.popupmenu = wx.Menu()
         self.popupmenu.Bind(wx.EVT_MENU, self.OnPopupItemSelected)
-        for text in [_('Save'), _('Save as'), _('Rename'), _('Up'), _('Down'), _('Properties')]:
+        for text in [_('Save'), _('Save as'), _('Rename'), _('Duplicate'), _('Up'), _('Down'), _('Properties')]:
             item = self.popupmenu.Append(-1, text)
 
         self.menubar = wx.MenuBar()
@@ -469,6 +472,14 @@ class WolfMapViewer(wx.Frame):
 
         self.InitUI()
 
+    @property
+    def wxlogging(self):
+        return self._wxlogging
+
+    @wxlogging.setter
+    def wxlogging(self, value):
+        self._wxlogging = value
+
     def get_mapviewer(self):
         """ Retourne une instance WolfMapViewer """
         return self
@@ -1249,6 +1260,11 @@ class WolfMapViewer(wx.Frame):
         """
         Création d'une vidéo sur base des résultats
         """
+        try:
+            import cv2
+        except:
+            logging.error(_('Please install opencv-python'))
+            return
 
         if fn=='':
             dlg = wx.FileDialog(patent   = None,
@@ -1669,7 +1685,7 @@ class WolfMapViewer(wx.Frame):
 
         newcap = dlg.GetValue()
         dlg.Destroy()
-        newview = WolfMapViewer(None, newcap, w=600, h=600)
+        newview = WolfMapViewer(None, newcap, w=600, h=600, wxlogging=self.wxlogging)
 
         if self.linkedList is None:
             self.linkedList = [self]
@@ -1720,11 +1736,20 @@ class WolfMapViewer(wx.Frame):
                                                     self, xmin, xmax, ymin, ymax, -99999, 1024),
                                 ToCheck=False, id=m)
 
-    def set_compare(self, ListArrays=None, share_colormap=True):
+    def set_compare(self, ListArrays:list[WolfArray]=None, share_colormap:bool=True):
+        """
+        Comparison of 2 arrays
+
+        :param ListArrays: List of 2 arrays to compare
+        :param share_colormap: Share the colormap between the 2 arrays
+        """
+
+        # assert len(ListArrays) == 2, _('List of arrays must contain 2 and only 2 arrays - Here, you have provided {} arrays'.format(len(ListArrays)))
+
         # Création de 3 fenêtres de visualisation basées sur la classe "WolfMapViewer"
         first = self
-        second = WolfMapViewer(None, 'Comparison', w=600, h=600)
-        third = WolfMapViewer(None, 'Difference', w=600, h=600)
+        second = WolfMapViewer(None, 'Comparison', w=600, h=600, wxlogging=self.wxlogging)
+        third = WolfMapViewer(None, 'Difference', w=600, h=600, wxlogging=self.wxlogging)
 
         second.add_grid()
         third.add_grid()
@@ -1732,12 +1757,12 @@ class WolfMapViewer(wx.Frame):
         third.add_WMS()
 
         # Création d'une liste contenant les 3 instances d'objet "WolfMapViewer"
-        list = []
+        list:list[WolfMapViewer] = []
         list.append(first)
         list.append(second)
         list.append(third)
 
-        # On indique que les objets sont liés en actiavt le Booléen et en pointant la liste précédente
+        # On indique que les objets sont liés en activant le Booléen et en pointant la liste précédente
         for curlist in list:
             curlist.linked = True
             curlist.linkedList = list
@@ -1748,8 +1773,10 @@ class WolfMapViewer(wx.Frame):
                 mns = ListArrays[1]
             else:
                 logging.warning(_('List of arrays must contain 2 and only 2 arrays - Here, you have provided {} arrays'.format(len(ListArrays))))
+                return
         else:
             logging.warning(_('You must fill the List of arrays with 2 and only 2 arrays - Here, the list is void'))
+            return
 
         mns: WolfArray
         mnt: WolfArray
@@ -1778,6 +1805,7 @@ class WolfMapViewer(wx.Frame):
         diff.mypal = wolfpalette()
         if isinstance(diff, WolfArrayMB):
             diff.link_palette()
+
         diff.mypal.readfile(fn)
         diff.mypal.automatic = False
         diff.myops.palauto.SetValue(0)
@@ -1806,16 +1834,24 @@ class WolfMapViewer(wx.Frame):
         mns.reset_plot()
         diff.reset_plot()
 
-    def set_compare_all(self, ListArrays=None):
+    def set_compare_all(self, ListArrays=None, names:list[str] = None):
+        """ Comparison of 2 or 3 arrays """
+
+        assert len(ListArrays) == 2 or len(ListArrays) == 3, _('List of arrays must contain 2 or 3 arrays - Here, you have provided {} arrays'.format(len(ListArrays)))
+        if names is not None:
+            assert len(names) == len(ListArrays)-1, _('List of names must contain the number of names as arrays minus one - Here, you have provided {} names for {} arrays'.format(len(names), len(ListArrays)))
+        else:
+            names = ['comp1', 'comp2']
+
         # Création de 3 fenêtres de visualisation basées sur la classe "WolfMapViewer"
         first = self
-        second = WolfMapViewer(None, 'Comparison MNS', w=600, h=600)
-        third = WolfMapViewer(None, 'Difference MNS', w=600, h=600)
+        second = WolfMapViewer(None, 'Comparison {}'.format(names[0]), w=600, h=600, wxlogging=self.wxlogging)
+        third = WolfMapViewer(None, 'Difference {}'.format(names[0]), w=600, h=600, wxlogging=self.wxlogging)
         if len(ListArrays) == 3:
-            fourth = WolfMapViewer(None, 'Comparison MNT', w=600, h=600)
-            fifth = WolfMapViewer(None, 'Difference MNT', w=600, h=600)
+            fourth = WolfMapViewer(None, 'Comparison {}'.format(names[1]), w=600, h=600, wxlogging=self.wxlogging)
+            fifth = WolfMapViewer(None, 'Difference {}'.format(names[1]), w=600, h=600, wxlogging=self.wxlogging)
 
-        # Création d'une liste contenant les 3 instances d'objet "WolfMapViewer"
+        # Création d'une liste contenant les multiples instances d'objet "WolfMapViewer"
         list = []
         list.append(first)
         list.append(second)
@@ -1969,11 +2005,11 @@ class WolfMapViewer(wx.Frame):
 
         # Création de fenêtres de visualisation basées sur la classe "WolfMapViewer"
         first = self
-        second = WolfMapViewer(None, 'Sculpting', w=600, h=600)
-        third = WolfMapViewer(None, 'Difference', w=600, h=600)
-        fourth = WolfMapViewer(None, 'Gradient', w=600, h=600)
-        fifth = WolfMapViewer(None, 'Laplace', w=600, h=600)
-        sixth = WolfMapViewer(None, 'Unitary Mask', w=600, h=600)
+        second = WolfMapViewer(None, 'Sculpting', w=600, h=600, wxlogging=self.wxlogging)
+        third = WolfMapViewer(None, 'Difference', w=600, h=600, wxlogging=self.wxlogging)
+        fourth = WolfMapViewer(None, 'Gradient', w=600, h=600, wxlogging=self.wxlogging)
+        fifth = WolfMapViewer(None, 'Laplace', w=600, h=600, wxlogging=self.wxlogging)
+        sixth = WolfMapViewer(None, 'Unitary Mask', w=600, h=600, wxlogging=self.wxlogging)
 
         # Création d'une liste contenant les 3 instances d'objet "WolfMapViewer"
         list = []
@@ -2059,7 +2095,7 @@ class WolfMapViewer(wx.Frame):
         self.mimicme()
 
     def update_blender_sculpting(self):
-
+        """ Mise à jour des fenêtres de visualisation pour la comparaison avec Blender """
         if not self.linked:
             return
         if len(self.linkedList) != 6:
@@ -2139,7 +2175,17 @@ class WolfMapViewer(wx.Frame):
             Back.SetLabel("{:.2f}".format(np.sum(diff.array[diff.array > 0.])) + ' [m³]')
             Bal.SetLabel("{:.2f}".format(np.sum(diff.array)) + ' [m³]')
 
-    def zoomon_activevector(self, size=500., forceupdate=True):
+    def zoomon_activevector(self, size:float=500., forceupdate:bool=True):
+        """
+        Zoom on active vector
+
+        :param size: size of the zoomed window
+        :param forceupdate: force the update of the window
+        """
+
+        if self.active_vector is None:
+            logging.warning(_('No active vector'))
+            return
 
         curvec = self.active_vector
         if curvec.xmin == -99999:
@@ -2167,7 +2213,30 @@ class WolfMapViewer(wx.Frame):
                         cur.update()
 
     def zoom_on(self, zoom_dict = None, width = 500, height = 500, center = None, xll = None, yll = None, forceupdate=True, canvas_height=1024):
+        """
+        Zoom on a specific area
+
+        It is possible to zoom on a specific area by providing the zoom parameters in :
+          - a dictionnary
+          - width and height of the zoomed window and the lower left corner coordinates
+          - width and height of the zoomed window and the center coordinates
+
+        :param zoom_dict: dictionnary containing the zoom parameters - possible keys : 'width', 'height', 'center', 'xmin', 'ymin', 'xmax', 'ymax'
+        :param width: width of the zoomed window [m]
+        :param height: height of the zoomed window [m]
+        :param center: center of the zoomed window [m] - tuple (x,y)
+        :param xll: lower left X coordinate of the zoomed window [m]
+        :param yll: lower left Y coordinate of the zoomed window [m]
+        :param forceupdate: force the update of the window
+        :param canvas_height: height of the canvas [pixels]
 
+
+        Examples :
+
+          - zoom_on(zoom_dict = {'center':(500,500), 'width':1000, 'height':1000})
+          - zoom_on(width = 1000, height = 1000, xll = 500, yll = 500)
+          - zoom_on(width = 1000, height = 1000, center = (500,500))
+        """
         if zoom_dict is not None:
             width  = 99999
             height = 99999
@@ -2222,7 +2291,8 @@ class WolfMapViewer(wx.Frame):
                     if cur is not self:
                         cur.update()
 
-    def zoomon_active_profile(self, size=500., forceupdate=True):
+    def zoomon_active_profile(self, size:float=500., forceupdate:bool=True):
+        """ Zoom on active profile """
 
         curvec = self.active_profile
         if curvec.xmin == -99999:
@@ -3451,8 +3521,10 @@ class WolfMapViewer(wx.Frame):
 
             if keyvalue == _('Arrays'):
                 ListArrays = []
-                filterProject = "Array (*.bin)|*.bin|all (*.*)|*.*"
-                file = wx.FileDialog(self, "Choose Source file", wildcard=filterProject)
+                filterArray = "bin (*.bin)|*.bin|Elevation WOLF2D (*.top)|*.top|Geotif (*.tif)|*.tif|Float ESRI (*.flt)|*.flt|Numpy (*.npy)|*.npy|Numpy named arrays(*.npz)|*.npz|all (*.*)|*.*"
+
+                # filterProject = "Array (*.bin)|*.bin|all (*.*)|*.*"
+                file = wx.FileDialog(self, "Choose Source file", wildcard=filterArray)
                 if file.ShowModal() == wx.ID_CANCEL:
                     file.Destroy()
                     return
@@ -3461,7 +3533,7 @@ class WolfMapViewer(wx.Frame):
                     ListArrays.append(file.GetPath())
                     file.Destroy()
 
-                file = wx.FileDialog(self, _("Choose Comparison file"), wildcard=filterProject)
+                file = wx.FileDialog(self, _("Choose Comparison file"), wildcard=filterArray)
                 if file.ShowModal() == wx.ID_CANCEL:
                     file.Destroy()
                     return
@@ -3483,6 +3555,9 @@ class WolfMapViewer(wx.Frame):
                     first.mask_data(0.)
                     sec.mask_data(0.)
                     self.set_compare([first, sec], share_colormap=sharecmap)
+                else:
+                    logging.error(_('Arrays have different dimensions !'))
+
             elif keyvalue == _('Modelling'):
                 ListArrays = []
                 filterProject = "all (*.*)|*.*"
@@ -3647,7 +3722,7 @@ class WolfMapViewer(wx.Frame):
 
             if self.active_array is not None:
 
-                choices = {'WOLF prev':1, 'WOLF OO':2, 'GPU':1}
+                choices = {'WOLF prev':1, 'WOLF OO':2, 'GPU':3}
 
                 dlg = wx.SingleChoiceDialog(None,
                                             _("Which version of BC Manager"),
@@ -4267,7 +4342,7 @@ class WolfMapViewer(wx.Frame):
         filterVector = "vec (*.vec)|*.vec|vecz (*.vecz)|*.vecz|dxf (*.dxf)|*.dxf|shp (*.shp)|*.shp|all (*.*)|*.*"
         filterCloud = "xyz (*.xyz)|*.xyz|dxf (*.dxf)|*.dxf|text (*.txt)|*.txt|all (*.*)|*.*"
         filtertri = "tri (*.tri)|*.tri|text (*.txt)|*.txt|dxf (*.dxf)|*.dxf|gltf (*.gltf)|*.gltf|gltf binary (*.glb)|*.glb|*.*'all (*.*)|*.*"
-        filterCs = "txt 2022 (*.txt)|*.txt|vecz WOLF (*.vecz)|*.vecz|WOLF (*.sxy)|*.sxy|text 2000 (*.txt)|*.txt|all (*.*)|*.*"
+        filterCs = "vecz WOLF (*.vecz)|*.vecz|txt 2022 (*.txt)|*.txt|WOLF (*.sxy)|*.sxy|text 2000 (*.txt)|*.txt|all (*.*)|*.*"
 
         if filename == '' and newobj is None:
             # ouverture d'une boîte de dialogue
@@ -4700,9 +4775,9 @@ class WolfMapViewer(wx.Frame):
 
                 with wx.lib.busy.BusyInfo(_('Importing cross sections')):
                     wait = wx.BusyCursor()
-                    if curfilter == 0:  # txt 2022
+                    if curfilter == 1:  # txt 2022
                         newobj = crosssections(filename, format='2022', dirlaz=dirlaz, mapviewer=self)
-                    if curfilter == 1:  # vecz
+                    if curfilter == 0:  # vecz
                         newobj = crosssections(filename, format='vecz', dirlaz=dirlaz, mapviewer=self)
                     elif curfilter == 2:  # sxy
                         newobj = crosssections(filename, format='sxy', dirlaz=dirlaz, mapviewer=self)
@@ -5174,6 +5249,70 @@ class WolfMapViewer(wx.Frame):
 
                         break
 
+        elif text ==  _('Duplicate'):
+
+            # Duplication de l'objet sélectionné
+            if self.selobj is not None:
+                #récupération de l'id courant
+                label = self.selobj.idx + '_copy'
+                dlg = wx.TextEntryDialog(self, message=_('Chose a label for the copy:'), value=label)
+                ret=dlg.ShowModal()
+                newlab = dlg.GetValue()
+                dlg.Destroy()
+
+                if isinstance(self.selobj, WolfArray) and (not type(self.selobj) in [WolfArrayMB, WolfArrayMNAP, WolfArray_Sim2D]):
+
+                    curtype = self.selobj.dtype
+
+                    if curtype == np.float64:
+                        curtype = 'float64'
+                    elif curtype == np.float32:
+                        curtype = 'float32'
+                    elif curtype == np.int32:
+                        curtype = 'int32'
+                    elif curtype == np.int16:
+                        curtype = 'int16'
+                    elif curtype == np.int8:
+                        curtype = 'int8'
+
+                    dlg = wx.MessageDialog(None, _('The type of the data is {}.\nDo you want to change this type?'.format(curtype)), style=wx.YES_NO | wx.NO_DEFAULT)
+                    ret = dlg.ShowModal()
+                    dlg.Destroy()
+
+                    if ret == wx.ID_YES:
+                        dlg = wx.SingleChoiceDialog(None, _('Choose a type'), _('Type'), ['float32','float64','int32','int16','int8'], style=wx.CHOICEDLG_STYLE)
+                        ret = dlg.ShowModal()
+
+                        if ret != wx.ID_OK:
+                            dlg.Destroy()
+                            return
+
+                        idx = dlg.GetSelection()
+                        dlg.Destroy()
+
+                        if idx == 0:
+                            curtype = WOLF_ARRAY_FULL_SINGLE # np.float32
+                        elif idx == 1:
+                            curtype = WOLF_ARRAY_FULL_DOUBLE # np.float64
+                        elif idx == 2:
+                            curtype = WOLF_ARRAY_FULL_INTEGER # np.int32
+                        elif idx == 3:
+                            curtype = WOLF_ARRAY_FULL_INTEGER16 #np.int16
+                        elif idx == 4:
+                            curtype = WOLF_ARRAY_FULL_INTEGER8 #np.int8
+
+                        newarray = WolfArray(srcheader=self.selobj.get_header(), whichtype=curtype)
+
+                        newarray.allocate_ressources()
+                        newarray.copy_mask(self.selobj, forcenullvalue=True, link=False)
+                    else:
+                        newarray = WolfArray(mold=self.selobj)
+
+                    self.add_object('array', newobj=newarray, id=newlab)
+                    self.Refresh()
+                else:
+                    logging.warning(_('Not yet implemented'))
+
         elif text == _('Save as'):
             # save objet to file, choosing the file name
 
@@ -5225,21 +5364,28 @@ class WolfMapViewer(wx.Frame):
 
 
     def OnClose(self, event):
+        nb = 0
         if self.linked:
             if self.linkedList is not None:
                 if self in self.linkedList:
                     id = self.linkedList.index(self)
                     self.linkedList.pop(id)
+                    nb = len(self.linkedList)
 
+        if nb == 0:
+            if self.wxlogging is not None:
+                dlg = wx.MessageDialog(None, _('Do you want to quit Wolf ?'), _('Quit Wolf'), wx.YES_NO | wx.NO_DEFAULT)
+                ret = dlg.ShowModal()
+                dlg.Destroy()
+                if ret == wx.ID_YES:
+                    self.Destroy()
+                    #FIXME : It is not a really proper way to quit the application
+                    wx.Exit()
+                    return
+                else:
+                    return
         self.Destroy()
 
-    # def OnActivatedItem(self,e):
-    #     myitem=e.GetItem()
-    #     nameitem=self.treelist.GetItemText(myitem).lower()
-    #     self.selobj = self.getobj(nameitem)
-    #     self.selitem.SetLabel(nameitem)
-    #     pass
-
     def onselectitem(self,event):
         myitem = event.GetItem()
 
@@ -5392,6 +5538,12 @@ class WolfMapViewer(wx.Frame):
         shiftdown = e.ShiftDown()
 
         if self.action is None:
+            if self.active_bc is not None:
+                self.action = 'select bc'
+                tmpvec = vector()
+                self.active_vector = tmpvec
+                tmpvec.add_vertex(wolfvertex(x, y))
+
             self.rightdown = (x, y)
 
         elif self.action == 'bridge gltf':
@@ -5554,23 +5706,24 @@ class WolfMapViewer(wx.Frame):
         pos = e.GetPosition()
         x, y = self.getXY(pos)
 
-        try:
-            minx = min(self.rightdown[0], x)
-            miny = min(self.rightdown[1], y)
-            maxx = max(self.rightdown[0], x)
-            maxy = max(self.rightdown[1], y)
-
-            if minx != maxx and maxy != miny:
-                self.active_bc.ray_tracing_numpy([[minx, miny], [maxx, miny], [maxx, maxy], [minx, maxy]], 'X')
-                self.active_bc.ray_tracing_numpy([[minx, miny], [maxx, miny], [maxx, maxy], [minx, maxy]], 'Y')
-            else:
-                self.active_bc.query_kdtree((x, y))
+        if self.active_bc is not None:
+            try:
+                minx = min(self.rightdown[0], x)
+                miny = min(self.rightdown[1], y)
+                maxx = max(self.rightdown[0], x)
+                maxy = max(self.rightdown[1], y)
+
+                if minx != maxx and maxy != miny:
+                    self.active_bc.ray_tracing_numpy([[minx, miny], [maxx, miny], [maxx, maxy], [minx, maxy]], 'X')
+                    self.active_bc.ray_tracing_numpy([[minx, miny], [maxx, miny], [maxx, maxy], [minx, maxy]], 'Y')
+                else:
+                    self.active_bc.query_kdtree((x, y))
 
-            self.active_bc.update_selection()
-            self.Refresh()
+                self.active_bc.update_selection()
+                self.Refresh()
 
-        except:
-            pass
+            except:
+                pass
 
     def OnButton(self, e: wx.MouseEvent):
         d = e.GetWheelDelta()
@@ -5947,7 +6100,7 @@ class WolfMapViewer(wx.Frame):
 
 
     def OnMotion(self, e: wx.MouseEvent):
-
+        """ Mouse move event """
         # Déplacement de la souris sur le canvas OpenGL
         posframe = self.GetPosition()
         pos = e.GetPosition()
@@ -5961,6 +6114,13 @@ class WolfMapViewer(wx.Frame):
 
             self.setbounds(False)
             return
+        elif e.RightIsDown():
+            if self.action == 'select bc':
+                self.active_vector.myvertices=[wolfvertex(self.rightdown[0],self.rightdown[1]),
+                                               wolfvertex(self.rightdown[0],y),
+                                               wolfvertex(x,y),
+                                               wolfvertex(x,self.rightdown[1]),
+                                               wolfvertex(self.rightdown[0],self.rightdown[1])]
         else:
             self.move=False
 
@@ -6681,6 +6841,7 @@ class WolfMapViewer(wx.Frame):
 
             if self.active_vector is not None:
                 if self.active_vector.parentzone is None:
+                    # we must plot this vector because it is a temporary vector outside any zone
                     self.active_vector.plot()
 
             # Dessin des triangulations
@@ -6782,7 +6943,7 @@ class WolfMapViewer(wx.Frame):
                     k += 1
 
         for loccloud in self.myclouds:
-            if self.added['clouds'][loccloud.idx].checked or force:
+            if self.added[draw_type.CLOUD][loccloud.idx].checked or force:
                 loccloud.find_minmax(force)
                 xmin = min(loccloud.xbounds[0], xmin)
                 xmax = max(loccloud.xbounds[1], xmax)
@@ -6791,7 +6952,7 @@ class WolfMapViewer(wx.Frame):
                 k += 1
 
         for loctri in self.mytri:
-            if self.added['triangulations'][loctri.idx].checked or force:
+            if self.added[draw_type.TRIANGULATION][loctri.idx].checked or force:
                 loctri.find_minmax(force)
                 xmin = min(loctri.minx, xmin)
                 xmax = max(loctri.maxx, xmax)

wolfhece/PyGui.py

@@ -27,6 +27,8 @@ except:
 from .PyConfig import WolfConfiguration, ConfigurationKeys
 from .pylogging import create_wxlogwindow
 
+# 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
     wx_exists:bool
@@ -73,7 +75,10 @@ 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()
 
@@ -1134,8 +1139,6 @@ class Wolf2DModel(GenMapManager):
         curhead.translx = self.myparam.translx
         curhead.transly = self.myparam.transly
 
-        curhead.nbdims = 2
-
         return curhead
 
     def read_fine_array(self,which=''):

wolfhece/PyPalette.py

@@ -140,8 +140,8 @@ class wolfpalette(wx.Frame,LinearSegmentedColormap):
         """
         Export image from colormap
 
-        @param : fn : filepath or io.BytesIO()
-        @param : h_or_v : configuration to save 'h' = horizontal, 'v' = vertical, '' = both
+        :param : fn : filepath or io.BytesIO()
+        :param : h_or_v : configuration to save 'h' = horizontal, 'v' = vertical, '' = both
         """
         if fn=='':
             file=wx.FileDialog(None,"Choose .pal file", wildcard="png (*.png)|*.png|all (*.*)|*.*",style=wx.FD_SAVE)