wolfhece 2.1.123__py3-none-any.whl → 2.1.125__py3-none-any.whl

wolfhece/PyDraw.py

@@ -2738,7 +2738,14 @@ class WolfMapViewer(wx.Frame):
 
                 every = dlg.GetValue()
 
-            danger_maps = self.active_res2d.danger_map(start_step-1, end_step-1, every)
+            pgbar = wx.ProgressDialog(_('Danger map'), _('Danger map'), maximum = end_step-1, parent=self, style = wx.PD_APP_MODAL | wx.PD_AUTO_HIDE)
+            def _callback(id, msg):
+                pgbar.Update(id+1-start_step, msg)
+
+            danger_maps = self.active_res2d.danger_map(start_step-1, end_step-1, every, _callback)
+
+            pgbar.Hide()
+            pgbar.Destroy()
 
             with wx.DirDialog(None, _('Choose a directory'), style=wx.DD_DEFAULT_STYLE) as dlg:
 
@@ -2747,7 +2754,7 @@ class WolfMapViewer(wx.Frame):
 
                 outdir = dlg.GetPath()
 
-            names = ['danger_h.tif', 'danger_u.tif', 'danger_q.tif', 'danger_Z.tif']
+            names = ['danger_h.tif', 'danger_u.tif', 'danger_q.tif', 'danger_Z.tif', 'danger_head.tif']
             for name, danger_map in zip(names, danger_maps):
                 danger_map.write_all(Path(outdir) / name)
 
@@ -6598,12 +6605,13 @@ class WolfMapViewer(wx.Frame):
         dlg = wx.SingleChoiceDialog(None, _("Pick a colormap"), "Choices", choices)
 
         if self.active_laz is not None:
-            dlg.SetSelection(ass_values.index(self.active_laz.associated_color))
+            if self.active_laz.associated_color is not None:
+                dlg.SetSelection(ass_values.index(self.active_laz.associated_color))
 
         ret = dlg.ShowModal()
         if ret == wx.ID_CANCEL:
             dlg.Destroy()
-            return
+            return self.active_laz.associated_color
 
         colormap = dlg.GetStringSelection()
         idx = choices.index(colormap)
@@ -10249,7 +10257,10 @@ class WolfMapViewer(wx.Frame):
 
                 xyz = self.selected_object.xyz_selected
                 if xyz.shape[0] ==0:
-                    logging.warning('No points selected')
+                    logging.warning(_('No points selected'))
+
+                    if self.selected_object._myprops[('Selection', 'Codes')] != '':
+                        logging.info(_('You filtered the points with the codes : {}'.format(self.selected_object._myprops[('Selection', 'Codes')])))
                     return
 
                 if xyz.shape[0] > 100000:
@@ -11044,6 +11055,8 @@ class WolfMapViewer(wx.Frame):
         pos = e.GetPosition()
 
         ctrldown = e.ControlDown()
+        altdown = e.AltDown()
+        shiftdown = e.ShiftDown()
 
         x, y = self.getXY(pos)
 
@@ -11053,7 +11066,7 @@ class WolfMapViewer(wx.Frame):
         self.oneclick = False
         self.setbounds()
 
-        if ctrldown:
+        if shiftdown:
             if self.active_array is not None:
                 if self.active_viewer3d is not None:
                     self.active_viewer3d.force_view(self.mousex, self.mousey, self.active_array.get_value(self.mousex, self.mousey))