wolfhece 2.2.33__py3-none-any.whl → 2.2.35__py3-none-any.whl

wolfhece/PyDraw.py

@@ -88,11 +88,12 @@ try:
     from .lazviewer.laz_viewer import myviewer, read_laz, clip_data_xyz, xyz_laz_grids, choices_laz_colormap, Classification_LAZ, Wolf_LAZ_Data, viewer as viewerlaz
     from . import Lidar2002
     from .picc import Picc_data, Cadaster_data
-    from .wolf_zi_db import ZI_Databse_Elt, PlansTerrier
+    from .wolf_zi_db import ZI_Databse_Elt, PlansTerrier, Ouvrages, Particularites, Enquetes, Profils
     from .math_parser.calculator import Calculator
     from .wintab.wintab import Wintab
     from .images_tiles import ImagesTiles
     from .PyWMS import Alaro_Navigator, get_Alaro_legend
+    from .PyPictures import PictureCollection
 
 except ImportError as e:
     print(e)
@@ -617,6 +618,7 @@ class draw_type(Enum):
     LAZ = 'laz'
     DROWNING = 'drowning'
     DIKE = 'dike'
+    PICTURECOLLECTION = 'picture_collection'
 
 class Colors_1to9(wx.Frame):
 
@@ -1924,6 +1926,7 @@ class WolfMapViewer(wx.Frame):
     mylazdata:list[Wolf_LAZ_Data]
     mydrownings: list[Drowning_victim_Viewer]
     mydikes: list[DikeWolf]
+    mypicturecollections: list[PictureCollection]
 
     mymplfigs:list[MplFigViewer]
 
@@ -1960,6 +1963,7 @@ class WolfMapViewer(wx.Frame):
     active_laz : Wolf_LAZ_Data
     active_drowning: Drowning_victim_Viewer
     active_dike : DikeWolf
+    active_picturecollection: PictureCollection
 
     active_fig: MplFigViewer
 
@@ -2098,6 +2102,7 @@ class WolfMapViewer(wx.Frame):
         self.menuimagestiles = None
         self.menudrowning = None
         self.menudike = None
+        self.menupicturecollections = None
 
         self.alaro_navigator = None
 
@@ -2191,6 +2196,7 @@ class WolfMapViewer(wx.Frame):
         addarraycrop = self.menuaddobj.Append(wx.ID_ANY, _('Add array and crop...'),
                                             _('Add array and crop (binary file - real)'))
         addvector = self.menuaddobj.Append(wx.ID_FILE2, _('Add vectors...'), _('Add vectors'))
+        addpictcollection = self.menuaddobj.Append(wx.ID_ANY, _('Add picture collection...'), _('Add a collection of pictures'))
         addtiles = self.menuaddobj.Append(wx.ID_ANY, _('Add tiles...'), _('Add tiles'))
         addimagestiles = self.menuaddobj.Append(wx.ID_ANY, _('Add images tiles...'), _('Add georeferenced images tiles'))
         addtilescomp = self.menuaddobj.Append(wx.ID_ANY, _('Add tiles comparator...'), _('Add tiles comparator'))
@@ -2396,6 +2402,7 @@ class WolfMapViewer(wx.Frame):
         self.active_weir = None
         self.active_laz = None
         self.active_dike = None
+        self.active_picturecollection = None
 
         self.active_fig = None
         self.active_drowning = None
@@ -2460,6 +2467,7 @@ class WolfMapViewer(wx.Frame):
         self.myitemswmsfore = self.treelist.AppendItem(self.root, _("WMS-foreground"))
         self.myitemsdrowning = self.treelist.AppendItem(self.root,_("Drowning"))
         self.myitemsdike    = self.treelist.AppendItem(self.root, _("Dikes"))
+        self.myitemspictcollection = self.treelist.AppendItem(self.root, _("Pictures"))
 
         width, height = self.GetClientSize()
         self.bordersize = int((w - width + self.treewidth) / 2)
@@ -2786,6 +2794,75 @@ class WolfMapViewer(wx.Frame):
         self.action = 'select active image tile'
         logging.info(_('Select active image tile'))
 
+    def menu_pictcollection(self):
+        """ Menu for picture collections """
+
+        if self.menupicturecollections is None:
+            self.menupicturecollections = wx.Menu()
+            self.menubar.Append(self.menupicturecollections, _('&Pictures'))
+
+            scaleall = self.menupicturecollections.Append(wx.ID_ANY, _('Scale all pictures'), _('Scale all pictures in the collection'))
+            pick = self.menupicturecollections.Append(wx.ID_ANY, _('Pick a picture'), _('Right click to pick a picture'))
+            hide = self.menupicturecollections.Append(wx.ID_ANY, _('Hide all pictures'), _('Reset the picture collection'))
+            allvisible = self.menupicturecollections.Append(wx.ID_ANY, _('Show all pictures'), _('Set all pictures in the collection visible'))
+            extract = self.menupicturecollections.Append(wx.ID_ANY, _('Extract pictures'), _('Extract all visible pictures from the collection'))
+
+            self.Bind(wx.EVT_MENU, self.action_pictcollections, pick)
+            self.Bind(wx.EVT_MENU, self.action_pictcollections, scaleall)
+            self.Bind(wx.EVT_MENU, self.action_pictcollections, hide)
+            self.Bind(wx.EVT_MENU, self.action_pictcollections, allvisible)
+            self.Bind(wx.EVT_MENU, self.action_pictcollections, extract)
+
+    def action_pictcollections(self, event: wx.Event):
+        """ Action for picture collections """
+
+        if self.active_picturecollection is None:
+            logging.warning(_('No active picture collection -- Please load data first'))
+            return
+
+        item = event.GetEventObject().FindItemById(event.GetId())
+        itemlabel = item.ItemLabel
+
+        if itemlabel == _('Pick a picture'):
+            self.action = 'pick a picture'
+            logging.info(_('Pick a picture from the collection'))
+
+        elif itemlabel == _('Scale all pictures'):
+
+            scalefactor = wx.GetTextFromUser(_('Enter the scale factor (default is 1.0)'), _('Scale factor'), '1.0', self)
+            if scalefactor == '':
+                scalefactor = '1.0'
+            try:
+                scalefactor = float(scalefactor)
+            except ValueError:
+                logging.error(_('Invalid scale factor: {}').format(scalefactor))
+                wx.MessageBox(_('Invalid scale factor: {}').format(scalefactor), _('Error'), wx.OK | wx.ICON_ERROR)
+                return
+
+            self.active_picturecollection.scale_all_pictures(scalefactor)
+
+            self.Refresh()
+
+        elif itemlabel == _('Hide all pictures'):
+            self.active_picturecollection.hide_all_pictures()
+            self.Refresh()
+
+        elif itemlabel == _('Show all pictures'):
+            self.active_picturecollection.show_all_pictures()
+            self.Refresh()
+
+        elif itemlabel == _('Extract pictures'):
+
+            dlg = wx.DirDialog(self, _('Choose directory to extract picture collection'), style= wx.DD_DEFAULT_STYLE)
+            if dlg.ShowModal() == wx.ID_CANCEL:
+                dlg.Destroy()
+
+            else:
+                dirpath = dlg.GetPath()
+                dlg.Destroy()
+                self.active_picturecollection.extract_pictures(dirpath)
+                logging.info(_('Pictures extracted to {}').format(dirpath))
+
     def menu_imagestiles(self):
         """ Menu for image tiles """
         if self.menuimagestiles is None:
@@ -2828,6 +2905,7 @@ class WolfMapViewer(wx.Frame):
         if len(glob_vrt) == 0:
             file_vrt = r'tmp.vrt'
             create_vrt(dirdata, fout=file_vrt)
+            glob_vrt = file_vrt
         else:
             glob_vrt = glob_vrt[0]
 
@@ -4244,6 +4322,15 @@ class WolfMapViewer(wx.Frame):
         else:
             return Path(config[ConfigurationKeys.DIRECTORY_LAZ])
 
+    @property
+    def default_hece_database(self) -> Path:
+        """ Return the default HECE database file from configs """
+        config = self.get_configuration()
+        if config is None:
+            return Path('')
+        else:
+            return Path(config[ConfigurationKeys.XLSX_HECE_DATABASE])
+
     @property
     def bkg_color(self):
         """ Return the background color from configs """
@@ -5158,6 +5245,7 @@ class WolfMapViewer(wx.Frame):
         self.mylazdata = []
         self.mydrownings = []
         self.mydikes = []
+        self.mypicturecollections = []
 
         self.mymplfigs = []
 
@@ -8639,7 +8727,7 @@ class WolfMapViewer(wx.Frame):
                 return
 
             try:
-                plotzone:list[zone]
+                # plotzone:list[zone]
                 plotzone = []
                 zonename = self.active_zone.myname
                 if '_left_' in zonename or '_right_' in zonename:
@@ -9426,6 +9514,77 @@ class WolfMapViewer(wx.Frame):
         elif itemlabel in [_('Create dike...'), _('Add dike...')]:
             self.new_dike(itemlabel)
 
+        elif itemlabel in [_('Add picture collection...')]:
+            # Création d'une nouvelle collection de photos
+
+            dlg = wx.SingleChoiceDialog(None, _('Choose the type of picture collection'), _('Picture Collection'),
+                                        [_('Pictures + shapefile'),
+                                         _('Wolf vec format'),
+                                         _('Georeferenced pictures'),
+                                         _('Pictures + Excel'),
+                                         _('URL zip file')])
+            ret = dlg.ShowModal()
+            if ret == wx.ID_CANCEL:
+                dlg.Destroy()
+                return
+
+            itemlabel = dlg.GetStringSelection()
+            dlg.Destroy()
+
+            if itemlabel in [_('Pictures + shapefile'), _('Georeferenced pictures'), _('Pictures + Excel')]:
+                dlgdir = wx.DirDialog(self, _('Choose directory to scan for pictures'))
+                if dlgdir.ShowModal() == wx.ID_CANCEL:
+                    dlgdir.Destroy()
+                    return
+                mydir = dlgdir.GetPath()
+                dlgdir.Destroy()
+            elif itemlabel == _('URL zip file'):
+                # Demande de l'URL du fichier zip
+                dlgurl = wx.TextEntryDialog(self, _('Enter the URL of the zip file containing the pictures'), _('URL zip file'))
+                if dlgurl.ShowModal() == wx.ID_CANCEL:
+                    dlgurl.Destroy()
+                    return
+                mydir = dlgurl.GetValue()
+                dlgurl.Destroy()
+            else:
+                dlgfile = wx.FileDialog(self, _('Choose shapefile'), style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST,
+                                        wildcard='Wolf vec (*.vec)| *.vec|Wolf vecz (*.vecz)|*.vecz|All files (*.*)|*.*')
+                if dlgfile.ShowModal() == wx.ID_CANCEL:
+                    dlgfile.Destroy()
+                    return
+                mydir = dlgfile.GetPath()
+                dlgfile.Destroy()
+
+            if itemlabel == _('Pictures + shapefile'):
+                # Création d'une nouvelle collection de photos avec shapefile
+                newcollection = PictureCollection(parent=self, mapviewer=self)
+                newcollection.load_from_directory_with_shapefile(mydir)
+            elif itemlabel == _('Georeferenced pictures'):
+                # Création d'une nouvelle collection de photos géoréférencées
+                newcollection = PictureCollection(parent=self, mapviewer=self)
+                newcollection.load_from_directory_georef_pictures(mydir)
+            elif itemlabel == _('Pictures + Excel'):
+                # Création d'une nouvelle collection de photos avec Excel
+                newcollection = PictureCollection(parent=self, mapviewer=self)
+                newcollection.load_from_directory_with_excel(mydir)
+            elif itemlabel == _('Wolf vec format'):
+                # Création d'une nouvelle collection de photos avec format Wolf vec
+                newcollection = PictureCollection(filename = mydir, parent=self, mapviewer=self)
+            elif itemlabel == _('URL zip file'):
+                # Création d'une nouvelle collection de photos à partir d'un fichier zip
+                newcollection = PictureCollection(parent=self, mapviewer=self)
+                newcollection.load_from_url_zipfile(mydir)
+
+            count = 0
+            for zone in newcollection.myzones:
+                count += zone.nbvectors
+
+            if count == 0:
+                logging.warning(_('No usable pictures found in the collection !'))
+                return
+
+            self.add_object('picture_collection', newobj=newcollection, ToCheck=True)
+
         elif itemlabel in [_('Create a drowning...'), _('Add a drowning result...')]:
 
             self.newdrowning(itemlabel)
@@ -10229,7 +10388,8 @@ class WolfMapViewer(wx.Frame):
                                  'wmsfore',
                                  'drowning',
                                  'imagestiles',
-                                 'dike'] = 'array',
+                                 'dike',
+                                 'picture_collection'] = 'array',
                    filename='',
                    newobj=None,
                    ToCheck=True,
@@ -10247,7 +10407,7 @@ class WolfMapViewer(wx.Frame):
         filterCloud = "xyz (*.xyz)|*.xyz|dxf (*.dxf)|*.dxf|text (*.txt)|*.txt|shp (*.shp)|*.shp|all (*.*)|*.*"
         filterlaz = "laz (*.laz)|*.laz|las (*.las)|*.las|Numpy (*.npz)|*.npz|all (*.*)|*.*"
         filtertri = "tri (*.tri)|*.tri|text (*.txt)|*.txt|dxf (*.dxf)|*.dxf|gltf (*.gltf)|*.gltf|gltf binary (*.glb)|*.glb|*.*'all (*.*)|*.*"
-        filterCs = "vecz WOLF (*.vecz)|*.vecz|txt 2022 (*.txt)|*.txt|WOLF (*.sxy)|*.sxy|text 2000 (*.txt)|*.txt|all (*.*)|*.*"
+        filterCs = "vecz WOLF (*.vecz)|*.vecz|txt 2022 (*.txt)|*.txt|WOLF (*.sxy)|*.sxy|text 2000 (*.txt)|*.txt|xlsx 2025 (*.xlsx)|*.xlsx|all (*.*)|*.*"
         filterimage = "Geotif (*.tif)|*.tif|all (*.*)|*.*"
 
         if filename == '' and newobj is None:
@@ -10290,6 +10450,8 @@ class WolfMapViewer(wx.Frame):
                 file = wx.DirDialog(self, "Choose directory containing the drowning")
             elif which.lower() == 'dike':
                 file = wx.DirDialog(self, "Choose directory", wildcard=filterall)
+            elif which.lower() == 'picture_collection':
+                file = wx.DirDialog(self, "Choose directory containing pictures")
 
             # FIXME : particularize filters for wmsback and wmsfore
             elif which.lower() == 'wmsback':
@@ -10440,6 +10602,19 @@ class WolfMapViewer(wx.Frame):
             self.active_array = newobj
             self._set_active_bc()
 
+        elif which.lower() == 'picture_collection':
+
+            curdict = self.mypicturecollections
+            curtree = self.myitemspictcollection
+
+            if newobj is None:
+                newobj = PictureCollection(parent=self, mapviewer=self)
+                newobj.load_from_directory_with_shapefile(filename)
+
+            curdict.append(newobj)
+            self.active_picturecollection = newobj
+            self.menu_pictcollection()
+
         elif which.lower() == 'array_tiles':
 
             res = wolfres2DGPU(filename, plotted=False)
@@ -10776,8 +10951,13 @@ class WolfMapViewer(wx.Frame):
                         newobj = crosssections(filename, format='vecz', dirlaz=dirlaz, mapviewer=self)
                     elif curfilter == 2:  # sxy
                         newobj = crosssections(filename, format='sxy', dirlaz=dirlaz, mapviewer=self)
-                    else:  # txt 2000
+                    elif curfilter == 3:  # txt 2000
                         newobj = crosssections(filename, format='2000', dirlaz=dirlaz, mapviewer=self)
+                    elif curfilter == 4:  # xlsx
+                        newobj = crosssections(filename, format='2025_xlsx', dirlaz=dirlaz, mapviewer=self)
+                    else:
+                        newobj = crosssections(filename, format='2000', dirlaz=dirlaz, mapviewer=self)
+
                     del wait
             self.myvectors.append(newobj)
             newobj.mapviewer = self
@@ -11081,10 +11261,11 @@ class WolfMapViewer(wx.Frame):
         # RES2D = 'wolf2d'
         # WMSBACK = 'wms-background'
         # WMSFORE = 'wms-foreground'
+        # PICTURE_COLLECTION = 'picture collections'
 
         if drawing_type is None:
             # return all_lists
-            return self.myarrays + self.myvectors + self.myclouds + self.mytri + self.mypartsystems + self.myothers + self.myviews + self.myres2D + self.mydikes + self.mydrownings
+            return self.myarrays + self.myvectors + self.myclouds + self.mytri + self.mypartsystems + self.myothers + self.myviews + self.myres2D + self.mydikes + self.mydrownings + self.mypicturecollections
 
         if drawing_type == draw_type.ARRAYS:
             return self.myarrays
@@ -11116,6 +11297,8 @@ class WolfMapViewer(wx.Frame):
             return self.mydrownings
         elif drawing_type == draw_type.DIKE:
             return self.mydikes
+        elif drawing_type == draw_type.PICTURECOLLECTION:
+            return self.mypicturecollections
         else:
             logging.error('Unknown drawing type : ' + drawing_type)
             return None
@@ -11576,6 +11759,16 @@ class WolfMapViewer(wx.Frame):
                     if ret == wx.ID_OK:
                         self.selected_object.saveas(fdlg.GetPath())
                     fdlg.Destroy()
+
+                elif type(self.selected_object) in [PictureCollection, Particularites, Enquetes, Ouvrages, Profils]:
+                    filterArray = "vec (*.vec)|*.vec|vecz (*.vecz)|*.vecz"
+                    fdlg = wx.FileDialog(self, "Choose file name for Collection :" + self.selected_object.idx, wildcard=filterArray,
+                                         style=wx.FD_SAVE)
+                    ret = fdlg.ShowModal()
+                    if ret == wx.ID_OK:
+                        self.selected_object.saveas(fdlg.GetPath())
+                    fdlg.Destroy()
+
                 elif type(self.selected_object) is Triangulation:
                     filterArray = "tri (*.tri)|*.tri|all (*.*)|*.*"
                     fdlg = wx.FileDialog(self, "Choose file name for triangulation :" + self.selected_object.idx, wildcard=filterArray,
@@ -12118,6 +12311,34 @@ class WolfMapViewer(wx.Frame):
                         else:
                             logging.warning(_('Landmap not initialized'))
 
+                    elif isinstance(curobj, Ouvrages):
+                        if curobj.initialized:
+                            self.menu_pictcollection()
+                            logging.info(_('Ouvrages collection initialized'))
+                        else:
+                            logging.warning(_('Ouvrages collection not initialized'))
+
+                    elif isinstance(curobj, Particularites):
+                        if curobj.initialized:
+                            self.menu_pictcollection()
+                            logging.info(_('Particularites collection initialized'))
+                        else:
+                            logging.warning(_('Particularites collection not initialized'))
+
+                    elif isinstance(curobj, Enquetes):
+                        if curobj.initialized:
+                            self.menu_pictcollection()
+                            logging.info(_('Enquetes collection initialized'))
+                        else:
+                            logging.warning(_('Enquetes collection not initialized'))
+
+                    elif isinstance(curobj, Profils):
+                        if curobj.initialized:
+                            self.menu_pictcollection()
+                            logging.info(_('Profils collection initialized'))
+                        else:
+                            logging.warning(_('Profils collection not initialized'))
+
                 except Exception as ex:
                     wx.LogMessage(str(ex))
                     wx.MessageBox(str(ex), _("Error"), wx.ICON_ERROR)
@@ -12338,6 +12559,28 @@ class WolfMapViewer(wx.Frame):
                 self.active_landmap.load_texture(x,y, which='low')
             self.Refresh()
 
+        elif self.action == 'pick a picture':
+            # Pick a picture
+
+            if self.active_picturecollection is None:
+                logging.warning(_('No picture collection available -- Please activate the data and retry !'))
+                return
+
+            vec = self.active_picturecollection.find_vector_containing_point(x, y)
+            vec.myprop.imagevisible = not vec.myprop.imagevisible
+
+            if shiftdown:
+                # show/hide the legend
+                vec.myprop.legendvisible = not vec.myprop.legendvisible
+
+            vec.myprop.update_myprops()
+            # vec.myprop.load_unload_image()
+            vec.parentzone.reset_listogl()
+
+            self.active_picturecollection.Activate_vector(vec)
+
+            self.Refresh()
+
         elif self.action == 'pick bridge':
             self.pick_bridge(x, y)
 
@@ -12546,6 +12789,28 @@ class WolfMapViewer(wx.Frame):
             self.active_vector.find_minmax()
             self.active_zone.find_minmax()
 
+        elif self.action == 'offset/scale image':
+
+            if self.active_vector is None:
+                logging.warning(_('No vector selected -- Please select a vector first !'))
+                return
+
+            if self.active_vector.myprop.textureimage is None:
+                logging.warning(_('No image available -- Please load an image first !'))
+                return
+
+            if self.active_vector._move_start is None:
+                self.active_vector._move_start = (x, y)
+                return
+
+            delta_x = x - self.active_vector._move_start[0]
+            delta_y = y - self.active_vector._move_start[1]
+
+            self.active_vector.myprop.offset_image(delta_x, delta_y)
+            self.active_vector.myprop.update_myprops()
+            self.active_vector._move_start = None
+            self.end_action(_('End offset/scale image'))
+
         elif self.action == 'move vector':
 
             if self.active_vector is None:
@@ -12749,6 +13014,24 @@ class WolfMapViewer(wx.Frame):
             self.Refresh()
             return
 
+        elif shiftdown:
+
+            if self.active_vector is None:
+                logging.warning(_('No vector selected -- Please select a vector first !'))
+                return
+
+            if self.active_vector.myprop.textureimage is None:
+                logging.warning(_('No image available -- Please load an image first !'))
+                return
+
+            self.active_vector.myprop.image_scale /= (1 - .1 * (r / max(d, 1)))
+            # limit to 1. or upper
+            self.active_vector.myprop.image_scale = max(self.active_vector.myprop.image_scale, 1.)
+            self.active_vector.myprop.update_myprops()
+            self.active_vector.myprop.update_image_texture()
+            self.Refresh()
+            return
+
         # Allow the user to zoom onto the pixel where the
         # mouse cursor is
 
@@ -12780,6 +13063,13 @@ class WolfMapViewer(wx.Frame):
         self.setbounds()
 
     def On_Right_Double_Clicks(self, e):
+
+        pos = e.GetPosition()
+        ctrldown = e.ControlDown()
+        altdown = e.AltDown()
+        shiftdown = e.ShiftDown()
+        x, y = self.getXY(pos)
+
         self._endactions()
 
     def On_Left_Double_Clicks(self, e:wx.MouseEvent):
@@ -12892,6 +13182,12 @@ class WolfMapViewer(wx.Frame):
             if ctrl:
                 myobj.show_properties()
 
+        elif type(myobj) == PictureCollection:
+            self.active_picturecollection = myobj
+
+            if ctrl:
+                myobj.show_properties()
+
         elif type(myobj) == Wolf_LAZ_Data:
 
             self.active_laz = myobj
@@ -12914,6 +13210,9 @@ class WolfMapViewer(wx.Frame):
         elif isinstance(myobj, PlansTerrier):
             self.active_landmap = myobj
 
+        elif isinstance(myobj, Particularites | Enquetes | Ouvrages | Profils):
+            self.active_picturecollection = myobj
+
         elif type(myobj) == hydrometry_wolfgui:
             if ctrl:
                 myobj.show_properties()
@@ -13397,6 +13696,22 @@ class WolfMapViewer(wx.Frame):
             if self.mousedown[0] == -99999: # only if the mouse was clicked before
                 self.mousedown = [x, y]
 
+            if shiftdown:
+                if self.active_vector is None:
+                    logging.warning(_('Shift key pressed but no active vector -- Please select a vector first !'))
+                    return
+                if self.active_vector.myprop.textureimage is None:
+                    logging.warning(_('Shift key pressed but no image texture -- Please select a vector with an image first !'))
+                    return
+                # We move the image texture
+                delta_x = x - self.mousedown[0]
+                delta_y = y - self.mousedown[1]
+                self.active_vector.myprop._offset_image_texture(delta_x, delta_y)
+                self.active_vector.myprop.update_myprops()
+                self.active_vector.myprop.update_image_texture()
+                self.Refresh()
+                return
+
             self.mousex -= x - self.mousedown[0]
             self.mousey -= y - self.mousedown[1]
 
@@ -13544,6 +13859,10 @@ class WolfMapViewer(wx.Frame):
         # Store the position of the mouse as last known position
         self._last_mouse_pos = (x,y,pos)
 
+        if self.active_vector is not None:
+            if self.active_vector.myprop.textureimage is not None:
+                self.active_vector.myprop._reset_cached_offset()
+
         # Update the tooltip with the values of the active arrays and results at position x,y
         self._update_mytooltip()
 
@@ -13668,6 +13987,7 @@ class WolfMapViewer(wx.Frame):
 
             if 'select by tmp vector' in locaction or 'select by vector' in locaction:
                 inside_under = 'inside' in self.action
+                outside_under = 'outside' in self.action
 
                 self.end_action(_('End of vector selection'))
 
@@ -13676,6 +13996,9 @@ class WolfMapViewer(wx.Frame):
                 if inside_under:
                     self.active_vector.close_force()
                     self.active_array.SelectionData.select_insidepoly(self.active_vector)
+                elif outside_under:
+                    self.active_vector.close_force()
+                    self.active_array.SelectionData.select_outsidepoly(self.active_vector)
                 else:
                     self.active_array.SelectionData.select_underpoly(self.active_vector)
 
@@ -14468,7 +14791,7 @@ class WolfMapViewer(wx.Frame):
                         self.active_array.SelectionData.myselection = 'all'
                     elif len(cursel) > 0:
                         self.active_array.SelectionData.myselection = cursel.copy()
-                        self.active_array.SelectionData.update_nb_nodes_selection()
+                        # self.active_array.SelectionData.update_nb_nodes_selection()
 
                 else:
                     logging.info(_('Paste selection values'))
@@ -15078,6 +15401,9 @@ class WolfMapViewer(wx.Frame):
             # Dessin du Front
             self._plotting(draw_type.WMSFORE)
 
+            # Dessin des images
+            self._plotting(draw_type.PICTURECOLLECTION)
+
             # Gestion des BC (si actif)
             if self.active_bc is not None:
                 self.active_bc.plot()
@@ -15171,6 +15497,15 @@ class WolfMapViewer(wx.Frame):
                     ymax = max(locvector.ymax, ymax)
                 k += 1
 
+        for locvector in self.mypicturecollections:
+            if locvector.plotted or force:
+                locvector.find_minmax()
+                xmin = min(locvector.xmin, xmin)
+                xmax = max(locvector.xmax, xmax)
+                ymin = min(locvector.ymin, ymin)
+                ymax = max(locvector.ymax, ymax)
+                k += 1
+
         for locvector in self.mytiles:
             if locvector.plotted or force:
                 if locvector.idx != 'grid':
@@ -15252,6 +15587,13 @@ class WolfMapViewer(wx.Frame):
                     ymin = min(locothers.ymin, ymin)
                     ymax = max(locothers.ymax, ymax)
                     k += 1
+            elif type(locothers) in [Particularites, Enquetes, Ouvrages, Profils]:
+                if locothers.initialized:
+                    xmin = min(locothers.xmin, xmin)
+                    xmax = max(locothers.xmax, xmax)
+                    ymin = min(locothers.ymin, ymin)
+                    ymax = max(locothers.ymax, ymax)
+                    k += 1
 
         for drown in self.mydrownings:
             if drown.plotted or force:

wolfhece/PyGui.py

@@ -70,7 +70,7 @@ try:
     from .hydrology.forcedexchanges import forced_exchanges
     from .PyParams import Wolf_Param
     from .picc import Picc_data, Cadaster_data
-    from .wolf_zi_db import ZI_Databse_Elt, PlansTerrier
+    from .wolf_zi_db import ZI_Databse_Elt, PlansTerrier, Ouvrages, Enquetes, Particularites, Profils
     from .CpGrid import CpGrid
     from .mesh2d.gpu_2d import Sim_2D_GPU
     from .mesh2d.wolf2dprev import prev_sim2D
@@ -228,6 +228,48 @@ class MapManager(GenMapManager):
                                     newobj=self.landmaps,
                                     ToCheck=False,
                                     id='Land maps')
+
+            config = self.get_configuration()
+            if config is None:
+                hece_db_path = None
+            else:
+                hece_db_path = Path(config[ConfigurationKeys.XLSX_HECE_DATABASE])
+
+            if hece_db_path is not None:
+
+                self.ouvragesponts = Ouvrages(mapviewer=self.mapviewer, parent = self.mapviewer, idx='Pictures - bridge', plotted=True)
+                logging.info("MapManager - Ouvrages Ponts created")
+                self.ouvragessuiles= Ouvrages(mapviewer=self.mapviewer, parent = self.mapviewer, idx='Pictures - weirs', plotted=True)
+                logging.info("MapManager - Ouvrages Seuils created")
+                self.enquetes       = Enquetes(mapviewer=self.mapviewer, parent = self.mapviewer, idx='Surveys', plotted=True)
+                logging.info("MapManager - Enquetes created")
+                self.particularites = Particularites(mapviewer=self.mapviewer, parent = self.mapviewer, idx='Features', plotted=True)
+                logging.info("MapManager - Particularites created")
+                self.profils        = Profils(mapviewer=self.mapviewer, parent = self.mapviewer, idx='CrossSections', plotted=True)
+                logging.info("MapManager - PlansTerrier created")
+
+                self.mapviewer.add_object(which='other',
+                                        newobj=self.ouvragesponts,
+                                        ToCheck=False,
+                                        id=_('Pictures "bridge"'))
+                self.mapviewer.add_object(which='other',
+                                        newobj=self.ouvragessuiles,
+                                        ToCheck=False,
+                                        id=_('Pictures "weirs"'))
+                self.mapviewer.add_object(which='other',
+                                        newobj=self.enquetes,
+                                        ToCheck=False,
+                                        id=_('Pictures "surveys"'))
+                self.mapviewer.add_object(which='other',
+                                        newobj=self.particularites,
+                                        ToCheck=False,
+                                        id=_('Pictures "features"'))
+
+                self.mapviewer.add_object(which='other',
+                                            newobj=self.profils,
+                                            ToCheck=False,
+                                            id='Pictures "Cross sections"')
+
         except:
             logging.warning("Can't load some data (hydrometry, picc, cadaster, landmaps) -- Please check the data directories and/or report the issue")