wolfhece 2.1.66__py3-none-any.whl → 2.1.68__py3-none-any.whl

wolfhece/Model1D.py

@@ -131,9 +131,9 @@ class Creator_1D:
     This object contains the methods operations
     performed in the creation of 1D models.
     They consist of the following operations:
-     - Concatenation of information in 1 and 2 dimensions,
-     - Extraction of information from 2D data if provided,
-     - Creation of a 1D model (simulation).
+        - Concatenation of information in 1 and 2 dimensions,
+        - Extraction of information from 2D data if provided,
+        - Creation of a 1D model (simulation).
 
     .. todo:: 1) FIXME Create unittests for methods in this class,
     .. todo:: 2) FIXME Fasten the methods in this class using multiprocess.
@@ -168,9 +168,11 @@ class Creator_1D:
         :type zones2: Zones
         :param id1:  Position in `.myzones` of the zone
         containing the vectors, defaults to 0
+
         :type id1: int, optional
         :param id2: Position in `.myzones` of the zone
         containing the vectors, defaults to 0
+
         :type id2: int, optional
         :return: The 2 zones with the aligned vertices.
         :rtype: Zones
@@ -220,16 +222,20 @@ class Creator_1D:
         :type zones2: Zones
         :param id1: Position in `.myzones` of the zone
         containing the vectors, defaults to 0
+
         :type id1: int, optional
         :param id2: Position in `.myzones` of the zone
         containing the vectors, defaults to 0
+
         :type id2: int, optional
         :param buffer: number of vertices to process on each vector
         starting from the end of the vector (None means all vertices are processed),
         defaults to None
+
         :type buffer: int, optional
         :return: The vectors with the deleted overlaps.
         :rtype: Zones
+
         .. todo:: 1) FIXME Generalize the method to work with any number of vectors.
         .. todo:: 2) FIXME iS there a way to perform this operation geometrically with shapely line string?
         .. todo:: 3) FIXME Create unittests for this method.
@@ -416,6 +422,7 @@ class Creator_1D:
         this is the number of vertices to process on each vector
         starting from the end of the vector
         (None means all vertices are processed),defaults to None, defaults to None
+
         :type buffer: int, defaults to None
         :param save_as: File path of the new vector, defaults to None
         :type save_as: str, optional
@@ -466,6 +473,7 @@ class Creator_1D:
         :type buffer: While deleting overlaps, this is the number of vertices
         to process on each vector starting from the end of the vector
         (None means all vertices are processed),defaults to None
+
         :param save_as: _description_, defaults to None
         :type save_as: File path of the new vector, optional
         :raises Exception: With a GUI, to warn the user that the list of zones is missing.
@@ -554,7 +562,7 @@ class Creator_1D:
         contained in those vectors to a new zone that will be returned.
         FIXME: Remove Id from all methods and delete the parameter from the method signature.
 
-        :param zones_list:List of vectors (`Zones`).
+        :param zones_list: List of vectors (`Zones`).
         :type zones_list: list[Zones]
         :param id: Depreciated, defaults to 1
         :type id: int, optional
@@ -750,6 +758,7 @@ class Creator_1D:
         :type save_as: str, optional
         :return: The new Zones containing the supports.
         :rtype: Zones
+
         .. todo:: 1) FIXME create a test for this method
         .. todo:: 2) FIXME Think about a faster way to create the supports
         .. todo:: 3) FIXME could it replace the current method for the cration of bed in wolfpy?
@@ -882,9 +891,11 @@ class Creator_1D:
         :type zones: Zones
         :param filename: .csv file containing the sections and their minimum altitudes,
         first column is the section name and second column is the minimum altitude.
+
         :type filename: str
         :param save_as: path to the the file where the modified Zones will be saved
         if no path is given the results is not saved but only returned , defaults to ''
+
         :type save_as: str, optional
         :return: New Zones object with the modified altitudes
         :rtype: Zones
@@ -921,9 +932,11 @@ class Creator_1D:
         :type zones: Zones
         :param filename: .csv file containing the sections and their minimum altitudes,
         first column is the section name and second column is the minimum altitude.
+
         :type filename: str
         :param save_as: path to the the file where the modified Zones will be saved
         if no path is given the results is not saved but only returned , defaults to ''
+
         :type save_as: str, optional
         :return: New Zones object with the modified altitudes
         :rtype: Zones
@@ -961,9 +974,11 @@ class Creator_1D:
         :type zones: Zones
         :param filename: .csv file containing the sections and their minimum altitudes,
         first column is the section name and second column is the minimum altitude.
+
         :type filename: str
         :param save_as: path to the the file where the modified Zones will be saved
         if no path is given the results is not saved but only returned , defaults to ''
+
         :type save_as: str, optional
         :return: New Zones object with the modified altitudes
         :rtype: Zones
@@ -1003,6 +1018,7 @@ class Creator_1D:
         :type zones: Zones
         :param save_as: path to the the file where the modified Zones will be saved
         if no path is given the results is not saved but only returned , defaults to ''
+
         :type save_as: str, optional
         :return: New Zones object with the reversed vectors
         :rtype: Zones
@@ -1223,6 +1239,7 @@ class Creator_1D:
         :type zones_list: list[Zones]
         :param id: Index of the zone containing the vector object
         in all `Zones`, defaults to 0
+
         :type id: int, optional
 
         .. todo:: 1) FIXME Add detailed information (legends, title, an so on) to the plot.
@@ -1301,14 +1318,14 @@ class Creator_1D:
             - The discretization step is chosen by the user.
 
         .. notes:: The procedure is the following:
-        From the 3 vectors of the zone, the center vector is discretized
-        based on the discretization step provided by the user (1 length unit by default).
-        The number of points is calculated as the length of the center vector divided by the discretization step.
-        the number of points selected is the smallest integer greater than the division result.
-        The newpoints  are then projected on the left and right vectors.
-        The distance between the left and right vectors is then calculated,
-        and plotted as a function of the distance along the center vector, after a postprocessing check using
-        subtrings and vectors.
+            From the 3 vectors of the zone, the center vector is discretized
+            based on the discretization step provided by the user (1 length unit by default).
+            The number of points is calculated as the length of the center vector divided by the discretization step.
+            the number of points selected is the smallest integer greater than the division result.
+            The newpoints  are then projected on the left and right vectors.
+            The distance between the left and right vectors is then calculated,
+            and plotted as a function of the distance along the center vector, after a postprocessing check using
+            subtrings and vectors.
 
         :param zones: `Zones` object containing the vectors,
         :type zones: Zones
@@ -1316,12 +1333,14 @@ class Creator_1D:
         :type id: int, optional
         :param discretization: After how many unit a disctance should be sampled, defaults to 1
         :type discretization: float, optional
-        :param Figure_title:Title to be displayed on the figure, defaults to ''
+        :param Figure_title: Title to be displayed on the figure, defaults to ''
         :type Figure_title: str, optional
         :param ticks_spacing: Discretization of the x axis, defaults to 1000
         :type ticks_spacing: int, optional
 
-        .. notes:: FIXME Should be an option in GUI and check whether the substring step is necessary.
+        .. notes::
+            FIXME Should be an option in GUI and check whether the substring step is necessary.
+
         .. todo:: 1) FIXME Add detailed information (legends, title, an so on) to the plot.
         .. todo:: 2) FIXME Think about a test for this method. could it be used in GUI?
         """
@@ -1657,6 +1676,7 @@ class Creator_1D:
         :param file_out: File path of the new WolfArray, file_out is provided ('' by default)
         a folder of the mask (given array) is used  to store the output under the same name
         as the previous but with a prefix `new_` added, defaults to ''
+
         :type file_out: str, optional
         :param load: If the new WolfArray should be loaded or not, defaults to True
         :type load: bool, optional
@@ -1714,6 +1734,7 @@ class Creator_1D:
         :type vrt_file: str
         :param wolfarray_not_tif: If the new WolfArrays should be saved as a `.bin` file or `.tif` file,
         defaults to True
+
         :type wolfarray_not_tif: bool, optional
         :return: List of new WolfArrays
         :rtype: list[WolfArray]
@@ -2417,6 +2438,7 @@ class Creator_1D:
         :type mycross: crosssections
         :param vect: `vector` containing the profiles
         in case the profiles should be sorted, defaults to None
+
         :type vect: vector, optional
         :param profile_name: Index of the profile, defaults to 1
         :type profile_name: int, optional
@@ -3065,7 +3087,8 @@ class Creator_1D:
         :param directory: Directory path, defaults to ''
         :type directory: str, optional
 
-        .. notes:: FIXME delete from_steady  arguments wherever it's still implemented in this module.
+        .. notes::
+            FIXME delete from_steady  arguments wherever it's still implemented in this module.
         """
 
         if directory == '':
@@ -5405,6 +5428,7 @@ class Creator_1D:
         :type directory: str
         :param plot: wheter the process should open a matplotlib figure
         containing the steady state solution or not, defaults to True
+
         :type plot: bool, optional
         """
         self.write_parameters(directory, write_type= 2, max_time=0)

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 - trace du vecteur\n \
+        #     v, V : sélection par vecteur de la matrice courante - zone intérieure\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 \
@@ -8558,8 +8558,9 @@ 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 - along polyline'),
+                     'v or V': _('Arrays : temporary/active vector selection - inside polygon'),
 
                      'r': _('Arrays : reset the selection'),
                      'R': _('Arrays : reset the selection and the associated dictionnary'),
@@ -9011,6 +9012,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:
@@ -9068,16 +9075,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/apps/version.py

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