wolfhece 2.1.120__py3-none-any.whl → 2.1.122__py3-none-any.whl

wolfhece/PyDraw.py

@@ -3451,14 +3451,16 @@ class WolfMapViewer(wx.Frame):
     #     self.active_tri = mytri
 
     def triangulate_cs(self):
+        """ Triangulate the active cross sections """
 
         msg = ''
         if self.active_zones is None:
             msg += _(' The active zones is None. Please activate the desired object !\n')
         if self.active_cs is None:
-            msg += _(' The is no cross section. Please active the desired object or load file!')
+            msg += _(' The is no cross section. Please active the desired object or load file !')
 
         if msg != '':
+            logging.warning(msg)
             dlg = wx.MessageBox(msg, 'Required action')
             return
 
@@ -3471,9 +3473,17 @@ class WolfMapViewer(wx.Frame):
         ds = float(dlg.GetValue()) / 100.
         dlg.Destroy()
 
-        self.myinterp = Interpolators(self.active_zones, self.active_cs, ds)
+        self.set_interp_cs(Interpolators(self.active_zones, self.active_cs, ds))
 
-        self.add_object('vector', newobj=self.myinterp.myzones, ToCheck=False, id='Interp_mesh')
+    def set_interp_cs(self, obj:Interpolators, add_zones:bool = True):
+        """ Set the active cross-sections interpolator """
+
+        assert isinstance(obj, Interpolators), _('Please provide an Interpolators object')
+
+        self.myinterp = obj
+
+        if add_zones:
+            self.add_object('vector', newobj=self.myinterp.myzones, ToCheck=False, id='Interp_mesh')
 
         if self.menuviewerinterpcs is None:
             self.menuviewerinterpcs = self.cs_menu.Append(wx.ID_ANY, _("New cloud Viewer..."),
@@ -3481,6 +3491,8 @@ class WolfMapViewer(wx.Frame):
         if self.menuinterpcs is None:
             self.menuinterpcs = self.cs_menu.Append(wx.ID_ANY, _("Interpolate on active array..."), _("Interpolate"))
 
+        self.Refresh()
+
     def interpolate_cloud(self):
         """
         Interpolation d'un nuage de point sur une matrice
@@ -3514,25 +3526,39 @@ class WolfMapViewer(wx.Frame):
             self.active_cloud.interp_on_array(self.active_array,keyvalue,method)
 
     def interpolate_cs(self):
-        if self.active_array is not None and self.myinterp is not None:
+        """ Interpolate the active cross sections by interpolators """
 
-            choices = ["nearest", "linear", "cubic"]
-            dlg = wx.SingleChoiceDialog(None, "Pick an interpolate method", "Choices", choices)
-            ret = dlg.ShowModal()
-            if ret == wx.ID_CANCEL:
-                dlg.Destroy()
-                return
+        if self.active_array is None:
+            logging.warning(_('No active array -- Please activate an array first'))
+            return
 
-            method = dlg.GetStringSelection()
+        if self.myinterp is None:
+            logging.warning(_('No active interpolator -- Please create an interpolator first'))
+            return
+
+        choices = ["nearest", "linear", "cubic"]
+        dlg = wx.SingleChoiceDialog(None, "Pick an interpolate method", "Choices", choices)
+        ret = dlg.ShowModal()
+        if ret == wx.ID_CANCEL:
             dlg.Destroy()
+            return
+
+        method = dlg.GetStringSelection()
+        dlg.Destroy()
 
-            self.myinterp.interp_on_array(self.active_array, method)
+        self.myinterp.interp_on_array(self.active_array, method)
 
     def interpolate_triangulation(self):
 
-        if self.active_array is not None and self.active_tri is not None:
+        if self.active_array is None:
+            logging.warning(_('No active array -- Please activate an array first'))
+            return
 
-            self.active_array.interpolate_on_triangulation(self.active_tri.pts, self.active_tri.tri, )
+        if self.active_tri is None:
+            logging.warning(_('No active triangulation -- Please activate a triangulation first'))
+            return
+
+        self.active_array.interpolate_on_triangulation(self.active_tri.pts, self.active_tri.tri, )
 
     def compare_cloud2array(self):
         """
@@ -5338,7 +5364,7 @@ class WolfMapViewer(wx.Frame):
         if myproject.is_in(curgroup):
             if check_params(myproject, curgroup):
                 try:
-                    self.init_laz_from_gridinfos(myproject[curgroup, 'data_dir'], myproject[(curgroup, 'classification')])
+                    self.init_laz_from_gridinfos(curdir / myproject[curgroup, 'data_dir'], myproject[(curgroup, 'classification')])
                 except Exception as e:
                     logging.error(_('Error in laz_grid import : ')+ str(e))
             else:
@@ -5873,7 +5899,7 @@ class WolfMapViewer(wx.Frame):
 
         logging.info(_('Clip LAZ grid on current zoom'))
         logging.info(_('Bounds {}-{}  {}-{}').format(curbounds[0][0],curbounds[0][1],curbounds[1][0],curbounds[1][1]))
-        logging.info(_('Nb points : {}').format(self.active_laz.num_points))
+        logging.info(_('Nb points : {:_}').format(self.active_laz.num_points))
 
     def filter_active_laz(self):
         """ Filter active laz data """
@@ -5892,7 +5918,7 @@ class WolfMapViewer(wx.Frame):
                 used_codes = [codes[cur] for cur in used_codes]
                 self.active_laz.filter_data(used_codes)
 
-                logging.info(_('Filter done - Nb points : {}').format(self.active_laz.num_points))
+                logging.info(_('Filter done - Nb points : {:_}').format(self.active_laz.num_points))
             else:
                 logging.info(_('Filter cancelled'))
 
@@ -6251,7 +6277,7 @@ class WolfMapViewer(wx.Frame):
         """
 
         if fn is None:
-            filternpz = "npz (*.npz)|*.npz|LAZ (*.laz)|*.laz|LAS (*.las)|*.las|all (*.*)|*.*"
+            filternpz = "LAZ (*.laz)|*.laz|LAS (*.las)|*.las|npz (*.npz)|*.npz|all (*.*)|*.*"
             dlg = wx.FileDialog(None, _('Choose a file containing LAS data'), wildcard=filternpz)
             ret = dlg.ShowModal()
             if ret != wx.ID_OK:
@@ -6261,12 +6287,14 @@ class WolfMapViewer(wx.Frame):
             fn = dlg.GetPath()
             dlg.Destroy()
 
-        self.mylazdata.append(Wolf_LAZ_Data())
-        self.active_laz = self.mylazdata[-1]
-        self.active_laz.from_file(fn)
+        lazobj = Wolf_LAZ_Data()
+        lazobj.from_file(fn)
+
+        self.add_object('laz', newobj= lazobj)
 
         logging.info(_('LAZ data read from file : ')+ fn)
         logging.info(_('Stored in internal variable'))
+        logging.info(_('Nb points : {:_}').format(self.active_laz.num_points))
 
         if self.linked:
             if len(self.linkedList) > 0:
@@ -6882,6 +6910,7 @@ class WolfMapViewer(wx.Frame):
                 begin = choice_bes.begin
                 end = choice_bes.end
                 interval = choice_bes.step
+                all = choice_bes.check_all
 
             finally:
                 choice_bes.Destroy()
@@ -6890,7 +6919,7 @@ class WolfMapViewer(wx.Frame):
                 logging.info(_('No interval chosen - Aborting !'))
                 return
 
-            ret = self.active_res2d.export_some_values_to_csv(all_selected, which, filename, for_steps= (begin-1, end-1, interval))
+            ret = self.active_res2d.export_some_values_to_csv(all_selected, which, filename, for_steps= (begin-1, end-1, interval), all_values=all)
 
             if not ret:
                 logging.error(_('Error in exporting values !'))
@@ -6989,7 +7018,7 @@ class WolfMapViewer(wx.Frame):
                 logging.info(_('No interval chosen - Aborting !'))
                 return
 
-            ret = self.active_res2d.export_some_values_to_csv(self.active_vector, which, filename=filename, for_steps= (begin-1, end-1, interval))
+            ret = self.active_res2d.export_some_values_to_csv(self.active_vector, which, filename=filename, for_steps= (begin-1, end-1, interval), all_values=all)
 
         elif itemlabel == _("Plot stats unknown (inside active zone)..."):
 
@@ -7102,7 +7131,7 @@ class WolfMapViewer(wx.Frame):
 
 
             for idx, (curvect, name) in enumerate(zip(self.active_zone.myvectors, unique_name)):
-                self.active_res2d.export_some_values_to_csv(curvect, which, filename=directory / name, for_steps= (begin-1, end-1, interval))
+                self.active_res2d.export_some_values_to_csv(curvect, which, filename=directory / name, for_steps= (begin-1, end-1, interval), all_values=all)
 
         elif itemlabel == _("Plot active vector..."):
             """ Plot data along active vector """
@@ -7562,13 +7591,21 @@ class WolfMapViewer(wx.Frame):
                 autoscale=False
                 self.clip_laz_gridded()
 
+                if self.active_laz.nb_points ==0:
+                    logging.warning(_('No points in the active LAZ object -- Aborting !'))
+                    return
+
                 self.active_laz.create_viewer(self._choice_laz_colormap(), self.mylazgrid.colors)
                 self.myviewerslaz.append(self.active_laz.viewer)
                 self.active_viewerlaz = self.myviewerslaz[-1]
 
                 # self.myviewer = myviewer(self.active_laz.data, ass_values[idx], palette_classif = self.mylazgrid.colors)
             else:
-                self.active_laz.create_viewer(classification= self.mylazgrid.colors)
+                if self.active_laz.nb_points ==0:
+                    logging.warning(_('No points in the active LAZ object -- Aborting !'))
+                    return
+
+                self.active_laz.create_viewer()
                 self.myviewerslaz.append(self.active_laz.viewer)
                 self.active_viewerlaz = self.myviewerslaz[-1]
 
@@ -8812,6 +8849,8 @@ class WolfMapViewer(wx.Frame):
                 logging.warning("Warning : the following file is not present here : " + filename)
                 return -1
 
+        all_ids = self.get_list_keys(None, checked_state=None)
+
         curtree = None
         if which.lower() == 'array' or which.lower() == 'array_crop':
 
@@ -8874,18 +8913,20 @@ class WolfMapViewer(wx.Frame):
                     testobj.read_txt_header()
 
                     if testobj.wolftype in WOLF_ARRAY_MB:
-                        with wx.lib.busy.BusyInfo(_('Importing array')):
-                            wait = wx.BusyCursor()
-                            newobj = WolfArrayMB(filename, mapviewer=self)
-                            del wait
+                        # with wx.lib.busy.BusyInfo(_('Importing array')):
+                        #     wait = wx.BusyCursor()
+                        #     newobj = WolfArrayMB(filename, mapviewer=self)
+                        #     del wait
+                        newobj = WolfArrayMB(filename, mapviewer=self)
                     else:
                         if which.lower() == 'array_crop':
                             newobj = WolfArray(filename, mapviewer=self, crop='newcrop')
                         else:
-                            with wx.lib.busy.BusyInfo(_('Importing array')):
-                                wait = wx.BusyCursor()
-                                newobj = WolfArray(filename, mapviewer=self)
-                                del wait
+                            # with wx.lib.busy.BusyInfo(_('Importing array')):
+                            #     wait = wx.BusyCursor()
+                            #     newobj = WolfArray(filename, mapviewer=self)
+                            #     del wait
+                            newobj = WolfArray(filename, mapviewer=self)
 
                 if newobj is not None:
                     if newobj.dx==0. or newobj.dy==0.:
@@ -9398,6 +9439,7 @@ class WolfMapViewer(wx.Frame):
             self.mypartsystems.append(newobj)
             self.active_particle_system = newobj
 
+        # ID chooser
         if id == '':
             dlg = wx.TextEntryDialog(self, 'ID ? (case insensitive)', 'Choose an identifier', '')
             if filename != '':
@@ -9405,26 +9447,29 @@ class WolfMapViewer(wx.Frame):
             else:
                 dlg.SetValue('')
 
-            if len(curdict) == 0:
+            endid = 1
+            # ids = self.get_list_keys(None, checked_state=None) #[cur.idx for cur in curdict]
+            while id.lower() in all_ids or id =='':
                 if dlg.ShowModal() == wx.ID_OK:
                     id = dlg.GetValue()
                     if id =='':
-                        id = '001'
-            else:
-                ids = [cur.idx for cur in curdict]
-                while id.lower() in ids:
-                    if dlg.ShowModal() == wx.ID_OK:
-                        id = dlg.GetValue()
-                        if id =='':
-                            id = '001'
+                        id = str(endid).zfill(3)
+                    endid += 1
             dlg.Destroy()
 
-        ids = [cur.idx for cur in curdict]
-        if id.lower() in ids:
-            # endid = '_'
+        # ids = [cur.idx for cur in curdict]
+        # if id.lower() in ids:
+        #     endid = 1
+        #     while (id + str(endid).zfill(3)).lower() in ids:
+        #         endid += 1
+        #     id = id + str(endid).zfill(3)
+
+        # all_ids = self.get_list_keys(None, checked_state=None)
+        if id.lower() in all_ids:
             endid = 1
             while (id + str(endid).zfill(3)).lower() in ids:
                 endid += 1
+            id = id + str(endid).zfill(3)
 
         newobj.idx = id.lower()
 
@@ -9489,7 +9534,7 @@ class WolfMapViewer(wx.Frame):
             except:
                 return None
 
-    def _get_list(self, drawing_type:draw_type):
+    def _get_list(self, drawing_type:draw_type = None):
         """ return the list of objects of type drawing_type """
 
         # ARRAYS = 'arrays'
@@ -9506,6 +9551,10 @@ class WolfMapViewer(wx.Frame):
         # WMSBACK = 'wms-background'
         # WMSFORE = 'wms-foreground'
 
+        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
+
         if drawing_type == draw_type.ARRAYS:
             return self.myarrays
         elif drawing_type == draw_type.VECTORS or drawing_type == draw_type.BRIDGES or drawing_type == draw_type.WEIRS or drawing_type == draw_type.CROSS_SECTIONS :
@@ -9536,19 +9585,27 @@ class WolfMapViewer(wx.Frame):
             logging.error('Unknown drawing type : ' + drawing_type)
             return None
 
+    def get_list_keys(self, drawing_type:draw_type = None, checked_state:bool=True):
+        """ Create a list of keys of type draw_type
 
-    def get_list_keys(self, drawing_type:draw_type, checked_state:bool=True):
-        """ Create a list of keys of type draw_type """
+        :param drawing_type: type of object to search - If None, return all objects
+        :param checked_state: if True/False, return only keys of objects that are plotted or not. None return all objects.
+        """
 
         if checked_state is None:
             return [curobj.idx for curobj in self._get_list(drawing_type)]
         else:
             return [curobj.idx for curobj in self._get_list(drawing_type) if curobj.plotted == checked_state]
 
-    def get_list_objects(self, drawing_type:draw_type, checked_state:bool=True):
+    def get_list_ids(self, drawing_type:draw_type = None, checked_state:bool=True):
+        """ Alias for get_list_keys """
+
+        return self.get_list_keys(drawing_type, checked_state)
+
+    def get_list_objects(self, drawing_type:draw_type = None, checked_state:bool=True):
         """ Create a list of objects of type draw_type
 
-        :param drawing_type: type of object to search
+        :param drawing_type: type of object to search -- If None, return all objects.
         :param checked_state: if True/False, return only objects that are plotted or not. None return all objects.
         """
 
@@ -10775,6 +10832,7 @@ class WolfMapViewer(wx.Frame):
 
             self.active_vector.move(delta_x, delta_y)
             self.active_vector.clear_cache()
+            self.active_vector._move_start = None
             self.end_action(_('End move vector'))
 
         elif self.action == 'rotate vector':
@@ -10796,6 +10854,7 @@ class WolfMapViewer(wx.Frame):
 
             self.active_vector.rotate_xy(x, y)
             self.active_vector.clear_cache()
+            self.active_vector._rotation_center = None
             self.end_action(_('End rotate vector'))
 
         elif self.action == 'move zone':
@@ -10816,6 +10875,7 @@ class WolfMapViewer(wx.Frame):
 
             self.active_zone.move(x - self.active_zone._move_start[0], y - self.active_zone._move_start[1])
             self.active_zone.clear_cache()
+            self.active_zone._move_start = None
             self.end_action(_('End move zone'))
 
         elif self.action == 'rotate zone':
@@ -10830,6 +10890,7 @@ class WolfMapViewer(wx.Frame):
 
             self.active_zone.rotate_xy(x, y)
             self.active_zone.clear_cache()
+            self.active_zone._rotation_center = None
             self.end_action(_('End rotate zone'))
 
         elif self.action == 'dynamic parallel':

wolfhece/PyGui.py

@@ -217,7 +217,7 @@ class MapManager(GenMapManager):
                                     ToCheck=False,
                                     id='Land maps')
         except:
-            logging.error("Can't load some data (hydrometry, picc, cadaster, landmaps) -- Please check the data directories and/or report the issue")
+            logging.warning("Can't load some data (hydrometry, picc, cadaster, landmaps) -- Please check the data directories and/or report the issue")
 
         self.mapviewer.menu_walous()