wolfhece 2.1.65__py3-none-any.whl → 2.1.67__py3-none-any.whl

wolfhece/PyDraw.py

@@ -8500,8 +8500,8 @@ class WolfMapViewer(wx.Frame):
         #     \n \
         #     !! ACTIONs !!\n \
         #     N : sélection noeud par noeud de la matrice courante\n \
-        #     B : sélection par vecteur temporaire de la matrice courante\n \
-        #     V : sélection par vecteur activé de la matrice courante - zone intérieure\n \
+        #     b, B : sélection par vecteur de la matrice courante - zone intérieure\n \
+        #     v, V : sélection par vecteur de la matrice courante - trace du vecteur\n \
         #     r : reset de la sélection de la matrice courante\n \
         #     R : reset de toutes les sélections de la matrice courante\n \
         #     P : sélection de la section transversale par click souris\n \
@@ -8533,6 +8533,7 @@ class WolfMapViewer(wx.Frame):
                      'CTRL+Shift+F4': _('Particle system : choose the step based on time'),
                      'SPACE': _('Particle system : pause/resume animation'),
 
+                     'LMB double clicks': _('Drawing : center the view on the clicked point -- future zoom will be centered on the point'),
                      'LMB and move': _('Drawing : translate the view'),
                      'Mouse wheel click and move': _('Drawing : translate the view'),
                      'Mouse wheel': _('Drawing : zoom in/out - centered on the middle of the canvas'),
@@ -8557,8 +8558,8 @@ class WolfMapViewer(wx.Frame):
                      'F11': _('Arrays : select by criteria'),
                      'F12': _('Arrays : operations'),
                      'n or N': _('Arrays : node-by-node selection'),
-                     'b or B': _('Arrays : temporary vector selection'),
-                     'v or V': _('Arrays : activated vector selection - inner zone'),
+                     'b or B': _('Arrays : temporary/active vector selection - inside polygon'),
+                     'v or V': _('Arrays : temporary/active vector selection - along polyline'),
 
                      'r': _('Arrays : reset the selection'),
                      'R': _('Arrays : reset the selection and the associated dictionnary'),
@@ -8613,7 +8614,12 @@ class WolfMapViewer(wx.Frame):
             sizer.Add(multiline, 1, wx.EXPAND)
 
             frame.SetSizer(sizer)
-            frame.SetIcon(self.GetIcon())
+
+            icon = wx.Icon()
+            icon_path = Path(__file__).parent / "apps/wolf_logo2.bmp"
+            icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
+            frame.SetIcon(icon)
+
             frame.SetAutoLayout(True)
             frame.Layout()
 
@@ -9005,6 +9011,12 @@ class WolfMapViewer(wx.Frame):
             elif key in LIST_1TO9:
 
                 if self.active_array is not None:
+
+                    if self.active_array.SelectionData.myselection == 'all':
+                        logging.warning(_('No selection to transfer to the dictionary !'))
+                        logging.info(_('Please select some nodes before transfering to the dictionary, not ALL !'))
+                        return
+
                     colors = [(0, 0, 255, 255), (0, 255, 0, 255), (0, 128, 255, 255), (255, 255, 0, 255), (255, 165, 0, 255), (128, 0, 128, 255), (255, 192, 203, 255), (165, 42, 42, 255), (128, 128, 128, 255)]
                     idx = LIST_1TO9.index(key)
                     if idx > 8:
@@ -9062,16 +9074,33 @@ class WolfMapViewer(wx.Frame):
                 if self.active_res2d is not None:
                     self.active_res2d.properties.select_node_by_node()
 
+                if self.active_array is None and self.active_res2d is None:
+                    logging.warning(_('No active array or result 2D to select node by node !'))
+
             elif key == ord('V'):  # V
                 if self.active_array is not None:
-                    self.active_array.myops.select_vector_inside_manager()
+                    if shiftdown:
+                        self.active_array.myops.select_vector_inside_manager()
+                    else:
+                        self.active_array.myops.select_vector_inside_tmp()
+                else:
+                    logging.warning(_('No active array to select the vector inside !'))
 
             elif key == ord('B'):  # B
                 if self.active_array is not None:
-                    self.active_array.myops.select_vector_inside_tmp()
+                    if shiftdown:
+                        self.active_array.myops.select_vector_under_manager()
+                    else:
+                        self.active_array.myops.select_vector_under_tmp()
+                else:
+                    logging.warning(_('No active array to select the vector inside !'))
 
             elif key == ord('P'):  # P
-                self.start_action('Select nearest profile', _('Select nearest profile'))
+
+                if self.active_cs is not None:
+                    self.start_action('Select nearest profile', _('Select nearest profile'))
+                else:
+                    logging.warning(_('No active cross section to select the nearest profile !'))
 
             elif key == ord('Z') and shiftdown:  # Z
                 self.width = self.width / 1.1

wolfhece/PyVertexvectors.py

@@ -887,16 +887,10 @@ if :\n \
 
         self.myprops.SetTitle(_('Vector properties - {}'.format(self.parent.myname)))
 
-        if self.parent.get_mapviewer() is not None:
-            self.myprops.SetIcon(self.parent.get_mapviewer().GetIcon())
-        else:
-            try:
-                icon = wx.Icon()
-                icon_path = Path(__file__).parent / "apps/wolf_logo.bmp"
-                icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
-                self.myprops.SetIcon(icon)
-            except Exception as e:
-                logging.warning('Problem with icon for properties window : {}'.format(e))
+        icon = wx.Icon()
+        icon_path = Path(__file__).parent / "apps/wolf_logo2.bmp"
+        icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
+        self.myprops.SetIcon(icon)
 
         self.myprops.Center()
         self.myprops.Raise()
@@ -4882,8 +4876,10 @@ class Zones(wx.Frame, Element_To_Draw):
 
             self.SetSizer(box)
 
-            if self.get_mapviewer() is not None:
-                self.SetIcon(self.get_mapviewer().GetIcon())
+            icon = wx.Icon()
+            icon_path = Path(__file__).parent / "apps/wolf_logo2.bmp"
+            icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
+            self.SetIcon(icon)
 
             if self.idx == '':
                 if self.parent is not None:

wolfhece/apps/version.py

@@ -5,7 +5,7 @@ class WolfVersion():
 
         self.major = 2
         self.minor = 1
-        self.patch = 65
+        self.patch = 67
 
     def __str__(self):