wolfhece 2.1.21__py3-none-any.whl → 2.1.22__py3-none-any.whl

wolfhece/PyDraw.py

@@ -63,6 +63,7 @@ from . import Lidar2002
 from .picc import Picc_data, Cadaster_data
 from .wolf_zi_db import ZI_Databse_Elt, PlansTerrier
 from .math_parser.calculator import Calculator
+from .wintab.wintab import Wintab
 
 # try:
 #     from .hydrometry_hece.kiwis_hece import hydrometry_hece as hydrometry
@@ -337,6 +338,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'), _('Duplicate'), _('Up'), _('Down'), _('Properties')]:
             item = self.popupmenu.Append(-1, text)
 
@@ -665,6 +667,32 @@ class WolfMapViewer(wx.Frame):
 
         self.InitUI()
 
+        # self._wintab = Wintab(self.GetHandle())
+
+        # if self._wintab:
+
+        #     import win32gui
+        #     import win32con
+
+        #     # self.oldWndProc = win32gui.SetWindowLong(self.GetHandle(), win32con.GWL_WNDPROC, self.MyWndProc)
+
+    # def MyWndProc(self, hWnd, msg, wParam, lParam):
+    #     import win32con
+
+    #     # Intercept a specific Windows message (for example, WM_KEYDOWN)
+    #     # if msg == 0x7FF0:
+    #     #     key_code = wParam
+    #     #     print(f"Key pressed: {key_code}")
+
+    #     #     # Process the message or do something custom
+    #     #     if key_code == win32con.VK_ESCAPE:
+    #     #         print("Escape key pressed, intercepting the event.")
+
+    #             # # You can return 0 to indicate the message has been processed
+    #             # return 0
+    #     # print(msg)
+    #     return 0
+
     @property
     def wxlogging(self):
         return self._wxlogging
@@ -860,7 +888,7 @@ class WolfMapViewer(wx.Frame):
             self.menu2d_dangermap = self.menuwolf2d.Append(wx.ID_ANY, _("Danger map"), _("Compute the danger map"))
             self.menu2d_dangermaph = self.menuwolf2d.Append(wx.ID_ANY, _("Danger map - only h"), _("Compute the danger map"))
 
-            self.menuwolf2d.AppendSeparator()            
+            self.menuwolf2d.AppendSeparator()
 
             self.menubar.Append(self.menuwolf2d, _('Results 2D'))
 
@@ -885,9 +913,9 @@ class WolfMapViewer(wx.Frame):
 
 
     def get_canvas_bounds(self, gridsize:float = None):
-        """ 
-        Retourne les limites de la zone d'affichage 
-        
+        """
+        Retourne les limites de la zone d'affichage
+
         :return: [xmin, ymin, xmax, ymax]
 
         """
@@ -1206,21 +1234,21 @@ class WolfMapViewer(wx.Frame):
 
                 if dlg.ShowModal() == wx.ID_CANCEL:
                     return
-                
+
                 start_step = dlg.GetValue()
-            
+
             with wx.NumberEntryDialog(None, _('Danger map'), _('To step'), _('Danger map'), self.active_res2d.get_nbresults(), start_step, self.active_res2d.get_nbresults()) as dlg:
 
                 if dlg.ShowModal() == wx.ID_CANCEL:
                     return
-                
+
                 end_step = dlg.GetValue()
 
             with wx.NumberEntryDialog(None, _('Danger map'), _('Every'), _('Danger map'), 1, 1, 60) as dlg:
-                
+
                 if dlg.ShowModal() == wx.ID_CANCEL:
                     return
-                
+
                 every = dlg.GetValue()
 
             danger_map = self.active_res2d.danger_map_only_h(start_step-1, end_step-1, every)
@@ -1229,7 +1257,7 @@ class WolfMapViewer(wx.Frame):
 
                 if dlg.ShowModal() == wx.ID_CANCEL:
                     return
-                
+
                 outdir = dlg.GetPath()
 
             danger_map.write_all(Path(outdir) / 'danger_h.tif')
@@ -1243,21 +1271,21 @@ class WolfMapViewer(wx.Frame):
 
                 if dlg.ShowModal() == wx.ID_CANCEL:
                     return
-                
+
                 start_step = dlg.GetValue()
-            
+
             with wx.NumberEntryDialog(None, _('Danger map'), _('To step'), _('Danger map'), self.active_res2d.get_nbresults(), start_step, self.active_res2d.get_nbresults()) as dlg:
 
                 if dlg.ShowModal() == wx.ID_CANCEL:
                     return
-                
+
                 end_step = dlg.GetValue()
 
             with wx.NumberEntryDialog(None, _('Danger map'), _('Every'), _('Danger map'), 1, 1, 60) as dlg:
-                
+
                 if dlg.ShowModal() == wx.ID_CANCEL:
                     return
-                
+
                 every = dlg.GetValue()
 
             danger_maps = self.active_res2d.danger_map(start_step-1, end_step-1, every)
@@ -1266,7 +1294,7 @@ class WolfMapViewer(wx.Frame):
 
                 if dlg.ShowModal() == wx.ID_CANCEL:
                     return
-                
+
                 outdir = dlg.GetPath()
 
             names = ['danger_h.tif', 'danger_u.tif', 'danger_q.tif', 'danger_Z.tif']
@@ -2782,10 +2810,10 @@ class WolfMapViewer(wx.Frame):
                                '2021': 'ORTHO_2021', '2022 printemps': 'ORTHO_2022_PRINTEMPS', '2022 été': 'ORTHO_2022_ETE',
                                '2023 été': 'ORTHO_2023_ETE',
                                }}
-        data_2021 = {'EAU': {'IDW': 'ZONES_INONDEES_IDW', 
-                             'Emprise': 'ZONES_INONDEES', 
+        data_2021 = {'EAU': {'IDW': 'ZONES_INONDEES_IDW',
+                             'Emprise': 'ZONES_INONDEES',
                              'Emprise wo Alea': 'ZONES_INONDEES_wo_alea'}}
-        
+
         for idx, (k, item) in enumerate(orthos.items()):
             for kdx, (m, subitem) in enumerate(item.items()):
                 self.add_object(which='wmsback',
@@ -5248,7 +5276,7 @@ class WolfMapViewer(wx.Frame):
                 if obj.idx=='grid':
                     pass
                 else:
-                    filterArray = "vec (*.vec)|*.vec|vecz (*.vecz)|*.vecz|all (*.*)|*.*"
+                    filterArray = "vec (*.vec)|*.vec|vecz (*.vecz)|*.vecz|Shapefile (*.shp)|*.shp|all (*.*)|*.*"
                     fdlg = wx.FileDialog(self, "Choose file name for Vector :" + obj.idx, wildcard=filterArray,
                                          style=wx.FD_SAVE)
                     ret = fdlg.ShowModal()
@@ -5468,13 +5496,27 @@ class WolfMapViewer(wx.Frame):
 
                     if which =='geotiff':
                         self.export_geotif(outdir,curarray.idx,myarrays,mynames)
+
                     elif which=='shape':
                         self.export_shape(outdir,curarray.idx,myarrays,mynames,curarray)
             del wait
 
-    def export_shape(self,outdir='',fn = '',myarrays=[], descr=[],mask:WolfArray=None):
+    def export_shape(self, outdir='', fn = '', myarrays=[], descr=[], mask:WolfArray=None):
+        """ Export multiple arrays to shapefile 
+        
+        :param outdir: output directory
+        :param fn: filename -- .shp will be added if not present
+        :param myarrays: list of Wolfarrays to export
+        :param descr: list of descriptions
+        :param mask: mask array -- export only where mask > 0
+        """
 
         if len(myarrays)==0:
+            logging.warning(_('No arrays provided for shapefile export'))
+            return
+
+        if mask is None:
+            logging.warning(_('No mask provided for shapefile export'))
             return
 
         from osgeo import gdal, osr, gdalconst,ogr
@@ -5488,7 +5530,10 @@ class WolfMapViewer(wx.Frame):
         driver = ogr.GetDriverByName("ESRI Shapefile")
 
         # create the data source
-        filename = join(outdir,fn)+'.shp'
+        filename = join(outdir,fn)
+        if not filename.endswith('.shp'):
+            filename+='.shp'
+
         ds = driver.CreateDataSource(filename)
 
         # create one layer
@@ -5533,9 +5578,18 @@ class WolfMapViewer(wx.Frame):
         # Save and close DataSource
         ds = None
 
-    def export_geotif(self,outdir='',fn = '',myarrays=[], descr=[]):
+    def export_geotif(self, outdir='', fn = '', myarrays=[], descr=[]):
+        """ Export multiple arrays to geotiff
+        
+        :param outdir: output directory
+        :param fn: filename -- .tif will be added if not present
+        :param myarrays: list of Wolfarrays to export
+        :param descr: list of descriptions -- Bands names 
+        
+        """
 
         if len(myarrays)==0:
+            logging.warning(_('No arrays provided for geotiff export'))
             return
 
         from osgeo import gdal, osr, gdalconst
@@ -5543,7 +5597,9 @@ class WolfMapViewer(wx.Frame):
         srs = osr.SpatialReference()
         srs.ImportFromEPSG(31370)
 
-        filename = join(outdir,fn)+'.tif'
+        filename = join(outdir,fn)
+        if not filename.endswith('.tif'):
+            filename+='.tif'
 
         arr=myarrays[0].array
         if arr.dtype == np.float32:
@@ -6200,7 +6256,7 @@ class WolfMapViewer(wx.Frame):
                 logging.warning('No object to add in "WMS foreground" category -- Please provide an object to add or check your code')
 
         elif which.lower() == 'particlesystem':
-            
+
             curdict = self.mypartsystems
             curtree = self.myitemsps
             if newobj is None:
@@ -6688,7 +6744,7 @@ class WolfMapViewer(wx.Frame):
                         self.selected_object.write_all()
                     fdlg.Destroy()
                 elif type(self.selected_object) is Zones:
-                    filterArray = "vec (*.vec)|*.vec|vecz (*.vecz)|*.vecz|all (*.*)|*.*"
+                    filterArray = "vec (*.vec)|*.vec|vecz (*.vecz)|*.vecz|Shapefile (*.shp)|*.shp|all (*.*)|*.*"
                     fdlg = wx.FileDialog(self, "Choose file name for Vector :" + self.selected_object.idx, wildcard=filterArray,
                                          style=wx.FD_SAVE)
                     ret = fdlg.ShowModal()
@@ -6758,6 +6814,29 @@ class WolfMapViewer(wx.Frame):
                 self.add_object('array', newobj=mb, id=self.selected_object.idx + '_mb')
             else:
                 logging.warning(_('Convert to multi-blocks not yet implemented for this type of object'))
+        
+        elif _('Export to Shape file') in text:
+
+            if isinstance(self.selected_object, Zones):
+                filterArray = "Shapefile (*.shp)|*.shp"
+                fdlg = wx.FileDialog(self, "Choose file name for Zones :" + self.selected_object.idx, wildcard=filterArray,
+                                        style=wx.FD_SAVE)
+                ret = fdlg.ShowModal()
+                if ret == wx.ID_OK:
+                    self.selected_object.export_to_shapefile(fdlg.GetPath())
+                fdlg.Destroy()
+
+        elif _('Export active zone to Shape file') in text:
+                
+            if isinstance(self.selected_object, Zones):
+            
+                filterArray = "Shapefile (*.shp)|*.shp"
+                fdlg = wx.FileDialog(self, "Choose file name for Vector :" + self.selected_object.idx, wildcard=filterArray,
+                                        style=wx.FD_SAVE)
+                ret = fdlg.ShowModal()
+                if ret == wx.ID_OK:
+                    self.selected_object.export_active_zone_to_shapefile(fdlg.GetPath())
+                fdlg.Destroy()
 
 
     def OnClose(self, event):
@@ -6931,6 +7010,13 @@ class WolfMapViewer(wx.Frame):
 
 
     def OnRightDown(self, e: wx.MouseEvent):
+        """
+        Event when the right button of the mouse is pressed.
+
+        We use this event to manage "action" set by others objects.
+
+        """
+
         pos = e.GetPosition()
         x, y = self.getXY(pos)
 
@@ -6951,6 +7037,7 @@ class WolfMapViewer(wx.Frame):
             self.rightdown = (x, y)
 
         elif 'pick landmap' in self.action:
+            # Pick a landmap if loaded
 
             if self.active_landmap is None:
                 logging.warning(_('No landmap available -- Please activate the data and retry !'))
@@ -6963,6 +7050,7 @@ class WolfMapViewer(wx.Frame):
             self.Refresh()
 
         elif self.action == 'bridge gltf':
+            # Create a bridge in gltf format
 
             self.bridgepar = (x, y)
 
@@ -6989,11 +7077,13 @@ class WolfMapViewer(wx.Frame):
 
             self.start_action('', 'None')
 
-        # Profile plots
         elif self.action == 'Plot cross section':
+            # Plot cross section
             self.plot_cross(x, y)
 
         elif self.action == 'Set 1D profile':
+            # Set 1D profile
+
             if self.active_cs is None:
                 self.active_cs = self.get_cross_sections()
 
@@ -7032,6 +7122,8 @@ class WolfMapViewer(wx.Frame):
             self.Paint()
 
         elif self.action == 'Select nearest profile':
+            # Select nearest profile
+
             if self.active_cs is None:
                 self.active_cs = self.get_cross_sections()
 
@@ -7068,6 +7160,7 @@ class WolfMapViewer(wx.Frame):
             self.Refresh()
 
         elif self.action == 'select active tile':
+            # Select active tile from Lidar data
 
             self.active_tile.select_vectors_from_point(x, y, True)
             self.active_vector = self.active_tile.get_selected_vectors()
@@ -7083,9 +7176,10 @@ class WolfMapViewer(wx.Frame):
                 self.add_object('array', newobj = tilearray, ToCheck=True, id=id_label)
 
         elif self.action.find('select active vector') > -1:
+            # Select active vector
 
-            inside = self.action.find('inside') > -1
-            onlyonezone = self.action.find('2') > -1
+            inside = self.action.find('inside') > -1 # only polygons/closed polyline if 'inside' is in the action name
+            onlyonezone = self.action.find('2') > -1 # only the active zone if '2' is in the action name, all zones otherwise
 
             if onlyonezone:
                 self.active_zone.select_vectors_from_point(x, y, inside)
@@ -7105,6 +7199,7 @@ class WolfMapViewer(wx.Frame):
                 self.active_zones.expand_tree(self.active_zone)
 
         elif 'select node by node' in self.action:
+            # Select node by node
 
             if 'results' in self.action:
                 curobj:Wolfresults_2D
@@ -7118,7 +7213,7 @@ class WolfMapViewer(wx.Frame):
             self.Paint()
 
         elif 'select by tmp vector' in self.action or 'select by vector' in self.action:
-
+            # Select nodes by vector or temporary vector
             self.active_vector.add_vertex(wolfvertex(x, y))
 
         elif 'laz tmp vector' == self.action:
@@ -7144,7 +7239,7 @@ class WolfMapViewer(wx.Frame):
             self.active_zone.find_minmax()
 
         elif self.action == 'dynamic parallel':
-
+            # Create a dynamic parallel line
             if ctrl:
                 if self.active_array is not None:
                     z = self.active_array.get_value(x, y)
@@ -7309,6 +7404,7 @@ class WolfMapViewer(wx.Frame):
                 self.Refresh()
 
     def OnLDown(self, e):
+
         if not self.move:
             pos = e.GetPosition()
             x, y = self.getXY(pos)
@@ -7387,7 +7483,7 @@ class WolfMapViewer(wx.Frame):
             #Print info in the status bar
             txt  = 'Dx : {:4f} ; Dy : {:4f}'.format(self.active_array.dx, self.active_array.dy)
             txt += ' ; Xmin : {:4f} ; Ymin : {:4f}'.format(self.active_array.origx, self.active_array.origy)
-            txt += ' ; Xmax : {:4f} ; Ymax : {:4f}'.format(self.active_array.origx + self.active_array.dx * float(self.active_array.nbx), 
+            txt += ' ; Xmax : {:4f} ; Ymax : {:4f}'.format(self.active_array.origx + self.active_array.dx * float(self.active_array.nbx),
                                                            self.active_array.origy + self.active_array.dy * float(self.active_array.nby))
             txt += ' ; Nx : {:d} ; Ny : {:d}'.format(self.active_array.nbx, self.active_array.nby)
 
@@ -7688,6 +7784,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()
@@ -7836,6 +7933,7 @@ class WolfMapViewer(wx.Frame):
 
         Each action must call self.end_action() to nullify the action and print a message.
         """
+
         if self.action is not None:
             locaction = self.action
             if 'select by tmp vector' in self.action or 'select by vector' in self.action:
@@ -7965,10 +8063,8 @@ class WolfMapViewer(wx.Frame):
 
                 self.end_action(_('End of dynamic parallel'))
 
-            elif self.action == 'select active vector' :
-                self.end_action(_('End of vector selection'))
+            elif 'select active vector' in self.action:
 
-            elif self.action == 'select active vector2':
                 self.end_action(_('End of vector selection'))
 
             elif 'select node by node' in self.action:
@@ -8124,8 +8220,9 @@ class WolfMapViewer(wx.Frame):
 
     def msg_action(self, which:int = 0):
         """ Message to end action """
+
         if which == 0:
-            self.StatusBar.SetStatusText(_('Action in progress... -- To quit, press "RETURN" or "double clicks RIGHT"'))
+            self.StatusBar.SetStatusText(_('Action in progress... -- To quit, press "RETURN" or "double clicks RIGHT" or press "ESC"'))
         else:
             self.StatusBar.SetStatusText('')
 
@@ -8142,6 +8239,7 @@ 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)
@@ -8595,7 +8693,13 @@ class WolfMapViewer(wx.Frame):
                 self.setbounds()
 
     def paste_values(self,fromarray:WolfArray):
-        logging.info(_('Copy selection values'))
+        """ Paste selected values from a WolfArray to the active array """
+
+        if self.active_array is None:
+            logging.warning(_('The active array is None - Please active an array into which to paste the values !'))
+            return
+
+        logging.info(_('Paste selection values'))
         cursel = fromarray.SelectionData.myselection
         if cursel == 'all':
             self.active_array.paste_all(fromarray)
@@ -8604,6 +8708,12 @@ class WolfMapViewer(wx.Frame):
             self.active_array.set_values_sel(cursel, z)
 
     def paste_selxy(self,fromarray:WolfArray):
+        """ Paste selected nodes from a WolfArray to the active array """
+
+        if self.active_array is None:
+            logging.warning(_('The active array is None - Please active an array into which to paste the selection !'))
+            return
+
         logging.info(_('Paste selection position'))
         cursel = fromarray.SelectionData.myselection
         if cursel == 'all':
@@ -8626,6 +8736,8 @@ class WolfMapViewer(wx.Frame):
             tracks.append(_('Convert to mono-block'))
             tracks.append(_('Convert to mono-block (result)'))
             tracks.append(_('Convert to multi-blocks (result)'))
+            tracks.append(_('Export to Shape file'))
+            tracks.append(_('Export active zone to Shape file'))
 
             # Récupération des items du menu contextuel
             menuitems = self.popupmenu.GetMenuItems()
@@ -8660,9 +8772,18 @@ class WolfMapViewer(wx.Frame):
                 self.popupmenu.Append(wx.ID_ANY, _('Convert to mono-block (result)'), _('Convert to mono-block'))
                 self.popupmenu.Append(wx.ID_ANY, _('Convert to multi-blocks (result)'), _('Convert to multi-blocks'))
 
+            if isinstance(self.selected_object, Zones):
+                self.popupmenu.Append(wx.ID_ANY, _('Export to Shape file'), _('Export to Shape file'))
+                self.popupmenu.Append(wx.ID_ANY, _('Export active zone to Shape file'), _('Export active zone to Shape file'))
+
             self.treelist.PopupMenu(self.popupmenu)
 
     def update(self):
+        """
+        Update backgournd et foreground elements and arrays if local minmax is checked.
+
+        """
+
         # dessin du background
         for obj in self.iterator_over_objects(draw_type.WMSBACK):
             obj.reload()
@@ -8682,7 +8803,6 @@ class WolfMapViewer(wx.Frame):
                 curarray.delete_lists()
 
         self.Paint()
-        # self.Refresh()
 
     def _plotting(self, drawing_type: draw_type, checked_state: bool = True):
         """ Drawing objets on canvas"""
@@ -8722,6 +8842,7 @@ class WolfMapViewer(wx.Frame):
         return self.canvas.SetCurrent(self.context)
 
     def Paint(self):
+        """ Dessin des éléments ajoutés au viewer """
 
         if self.currently_readresults:
             return
@@ -8806,6 +8927,7 @@ class WolfMapViewer(wx.Frame):
 
     def OnPaint(self, e):
         """ event handler for paint event"""
+
         self.Paint()
         if e is not None:
             e.Skip()
@@ -8938,7 +9060,13 @@ class WolfMapViewer(wx.Frame):
             self.ymin = ymin
             self.ymax = ymax
 
-    def resizeFrame(self, w, h):
+    def resizeFrame(self, w:int, h:int):
+        """ Resize the frame
+
+        :param w: width in pixels
+        :param h: height in pixels
+        """
+
         self.SetClientSize(w, h)
 
     def mimicme(self):
@@ -8990,6 +9118,8 @@ class WolfMapViewer(wx.Frame):
                     curFrame.forcemimic = True
 
     def Active_vector(self, vect):
+        """ Active un vecteur et sa zone parent si existante """
+
         self.active_vector = vect
 
         if vect is not None:
@@ -9000,6 +9130,8 @@ class WolfMapViewer(wx.Frame):
         self.mimicme()
 
     def Active_zone(self, zone: zone):
+        """ Active une zone et son parent si existant """
+
         self.active_zone = zone
         self.active_zones = zone.parent
         logging.info(_('Activating zone : ' + zone.myname))

wolfhece/PyGui.py

@@ -82,7 +82,6 @@ class GenMapManager(wx.Frame):
             # super().__init__(*args)
             self.mylogs = create_wxlogwindow(_('Informations'))
 
-
     def setup_mapviewer(self, title:str, wolfparent):
         """ Setup of a WolfMapViewer """
 
@@ -282,7 +281,7 @@ class HydrologyModel(GenMapManager):
 
             for curfile in self.files_hydrology_array['Characteristic_maps']:
                 curext=curfile[0]
-                curidx=curfile[1]                
+                curidx=curfile[1]
                 self.mapviewer.add_object(which='array',filename=self.mydircharact+curext,id=curidx,ToCheck=False)
 
 
@@ -298,7 +297,7 @@ class HydrologyModel(GenMapManager):
                     cur_vect = cur_zone.myvectors[0]
                     cur_vect.set_legend_to_centroid(cur_sub.name + ' - ' + str(cur_sub.iDSorted), visible=True)
                     cur_vect.myprop.legendfontsize = 12
-                
+
                 delimit.reset_listogl()
 
                 self.mapviewer.add_object(which='vector',newobj = delimit, id=curidx, ToCheck=True)