Davout 0.1.1.dev101__tar.gz → 0.1.1.dev103__tar.gz

{davout-0.1.1.dev101/source/Davout.egg-info → davout-0.1.1.dev103}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Davout
-Version: 0.1.1.dev101
+Version: 0.1.1.dev103
 Summary: Scientific computing utilities combining FEM, ANN and tooling
 Author: Matheus Janczkowski
 Author-email: Matheus Janczkowski <matheusj2009@hotmail.com>

{davout-0.1.1.dev101 → davout-0.1.1.dev103}/pyproject.toml

@@ -63,7 +63,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "Davout"
-version = "0.1.1.dev101"
+version = "0.1.1.dev103"
 description = "Scientific computing utilities combining FEM, ANN and tooling"
 readme = "README.md"
 authors = [

{davout-0.1.1.dev101 → davout-0.1.1.dev103}/source/Davout/GraphUtilities/collage_tools.py

@@ -561,7 +561,8 @@ compress_level=None):
                     general_axes, collage, 0.0, layout_width_milimeters, 0.0, 
                     layout_height_milimeters, x_min, x_max, y_min, y_max, 
                     input_path, depth_order, arrows_and_lines_file, 
-                    interactive_window_info, verbose=verbose)
+                    interactive_window_info, line_style_class, 
+                    arrow_style_class, colors_class, verbose=verbose)
 
                     # Updates the counter of redrawing occurrences
 
@@ -679,7 +680,8 @@ compress_level=None):
                     general_axes, collage, 0.0, layout_width_milimeters, 
                     0.0, layout_height_milimeters, x_min, x_max, y_min, 
                     y_max, input_path, depth_order, arrows_and_lines_file, 
-                    interactive_window_info, verbose=verbose)
+                    interactive_window_info, line_style_class, 
+                    arrow_style_class, colors_class, verbose=verbose)
 
                     # Updates the counter of redrawing occurrences
 
@@ -791,7 +793,8 @@ compress_level=None):
                 collage, 0.0, layout_width_milimeters, 0.0, 
                 layout_height_milimeters, x_min, x_max, y_min, y_max, 
                 input_path, depth_order, arrows_and_lines_file, 
-                interactive_window_info, verbose=verbose)
+                interactive_window_info, line_style_class, 
+                arrow_style_class, colors_class, verbose=verbose)
 
                 # Updates the counter of redrawing occurrences
 

{davout-0.1.1.dev101 → davout-0.1.1.dev103}/source/Davout/GraphUtilities/tool_box/collage_classes.py

@@ -57,7 +57,7 @@ class ColorMiscellany:
 
     # Defines a function to get the color
 
-    def __call__(self, key):
+    def __call__(self, key, throw_error=True):
         
         # Verifies if it is one of the keys
 
@@ -88,10 +88,67 @@ class ColorMiscellany:
 
                 available_colors += "\n'"+str(color)+"'"
 
-            raise ValueError("'"+str(key)+"' is not a key of the dicti"+
+            error_message = ("'"+str(key)+"' is not a key of the dicti"+
             "onary of colors nor is a list with RGB values (3 componen"+
             "ts). Check the valid color names:"+available_colors)
 
+            # If an error is to be thrown
+
+            if throw_error:
+
+                raise ValueError(error_message)
+            
+            # Otherwise, just returns False
+
+            return False
+
+    # Defines a function to verify if the color is there
+
+    def verify_color_name(self, key, throw_error=False):
+        
+        # Verifies if it is one of the keys
+
+        if key in self.color_dictionary:
+
+            return key
+        
+        # Otherwise, verifies if it is a list
+
+        elif isinstance(key, list):
+
+            # Verifies if it has 3 elements
+
+            if len(key)!=3:
+
+                raise IndexError("'"+str(key)+"' does not have 3 eleme"+
+                "nts. It must have 3 for they are the RGB values")
+            
+            return key 
+        
+        # Otherwise, throws an error
+
+        else:
+
+            available_colors = ""
+
+            for color in self.color_dictionary:
+
+                available_colors += "\n'"+str(color)+"'"
+
+            error_message = ("'"+str(key)+"' is not a key of the dicti"+
+            "onary of colors nor is a list with RGB values (3 componen"+
+            "ts). Check the valid color names:"+available_colors)
+
+            # If an error is to be thrown
+
+            if throw_error:
+
+                raise ValueError(error_message)
+            
+            # Otherwise, just returns False
+
+            return False
+
 # Defines a class with ready-to-use layout sizes
 
 class TemplateSizes:
@@ -107,7 +164,7 @@ class TemplateSizes:
 
     # Defines a function to get the color
 
-    def __call__(self, key):
+    def __call__(self, key, throw_error=True):
         
         # Verifies if it is one of the keys
 
@@ -139,10 +196,20 @@ class TemplateSizes:
 
                 available_sizes += "\n'"+str(size)+"'"
 
-            raise ValueError("'"+str(key)+"' is not a key of the dicti"+
+            error_message = ("'"+str(key)+"' is not a key of the dicti"+
             "onary of sizes nor is a list with layout sizes (2 compone"+
             "nts---width and height). Check the valid size names:"+
             available_sizes)
+
+            # If an error is to be thrown
+
+            if error_message:
+
+                raise NameError(error_message)
+            
+            # Otherwise, just returns False
+
+            return False
         
 # Defines a class to store alignment options
 
@@ -166,7 +233,7 @@ class AlignmentOptions:
         "p")}
 
     def __call__(self, alignment, position, width, height, 
-    text_alignment=False):
+    text_alignment=False, throw_error=True):
         
         # If text alignment is to be given
 
@@ -201,9 +268,19 @@ class AlignmentOptions:
 
                 alignments_options += "\n'"+str(name)+"'"
 
-            raise NameError("There is no '"+str(alignment)+"' option f"+
-            "or alignment. Check the available options:"+
+            error_message = ("There is no '"+str(alignment)+"' option "+
+            "for alignment. Check the available options:"+
             alignments_options)
+
+            # If error is to be thrown
+
+            if throw_error:
+
+                raise NameError(error_message)
+            
+            # Otherwise, returns False
+
+            return False
         
         # Gets the coefficients
 
@@ -232,7 +309,8 @@ class LineStyles:
 
         return max(int(round(number)), 1)
 
-    def __call__(self, line_style, base_thickness, style_key_name):
+    def __call__(self, line_style, base_thickness, style_key_name, 
+    throw_error=True):
         
         # Verifies if the asked line style is available
 
@@ -268,9 +346,51 @@ class LineStyles:
 
                 available_contour_styles += "\n'"+str(contour)+"'"
 
-            raise NameError("'"+str(style_key_name)+"' is not a valid "+
-            "line style. The only '"+str(style_key_name)+"' available "+
-            "are:"+available_contour_styles)
+            error_message = ("'"+str(line_style)+"' is not a valid '"+
+            str(style_key_name)+"'. The only '"+str(style_key_name)+"'"+
+            " available are:"+available_contour_styles)
+
+            # If error is to be thrown
+
+            if throw_error:
+
+                raise NameError(error_message)
+            
+            # Otherwise, returns false
+
+            return False
+
+    def verify_line_name(self, line_style, throw_error=False):
+        
+        # Verifies if the asked line style is available
+
+        if line_style in self.available_line_styles:
+
+            # Returns the plain key
+
+            return line_style
+
+        else:
+
+            available_contour_styles = ""
+
+            for contour in self.available_line_styles:
+
+                available_contour_styles += "\n'"+str(contour)+"'"
+
+            error_message = ("'"+str(line_style)+"' is not a valid 'li"+
+            "ne style'. The only 'line style' availables are:"+
+            available_contour_styles)
+
+            # If error is to be thrown
+
+            if throw_error:
+
+                raise NameError(error_message)
+            
+            # Otherwise, returns false
+
+            return False
         
 # Defines a class to store arrow head styles
 
@@ -286,7 +406,7 @@ class ArrowHeadStyles:
         "gular arrow": ArrowHeadStyles.InkscapeAngularArrow, "inkscape"+
         " round back arrow": ArrowHeadStyles.InkscapeCurvedBackArrow}
 
-    def __call__(self, arrow_head_style):
+    def __call__(self, arrow_head_style, throw_error=True):
         
         # Verifies if the asked arrow_head style is available
 
@@ -316,8 +436,47 @@ class ArrowHeadStyles:
 
                 available_arrow_styles += "\n'"+str(arrow)+"'"
 
-            raise NameError("The only 'arrow style' available are:"+
+            error_message = ("The only 'arrow style' available are:"+
             available_arrow_styles)
+
+            # If error is to be thrown
+
+            if throw_error:
+
+                raise NameError(error_message)
+            
+            # Otherwise, returns False
+
+            return False
+
+    def verify_arrow_name(self, arrow_head_style, throw_error=False):
+        
+        # Verifies if the asked arrow_head style is available
+
+        if arrow_head_style in self.arrow_head_styles:
+
+            return arrow_head_style
+
+        else:
+
+            available_arrow_styles = ""
+
+            for arrow in self.arrow_head_styles:
+
+                available_arrow_styles += "\n'"+str(arrow)+"'"
+
+            error_message = ("The only 'arrow style' available are:"+
+            available_arrow_styles)
+
+            # If error is to be thrown
+
+            if throw_error:
+
+                raise NameError(error_message)
+            
+            # Otherwise, returns False
+
+            return False
     
     ####################################################################
     #                           Custom arrows                          #

{davout-0.1.1.dev101 → davout-0.1.1.dev103}/source/Davout/GraphUtilities/tool_box/curves_setter.py

@@ -11,7 +11,8 @@ from ..tool_box import collage_classes
 
 def set_curve(key, arrows_and_lines_list, arrows_and_lines_file, 
 input_path, depth_order, collage, points_list, general_axes, tolerance,
-vanishing_points):
+vanishing_points, line_styles_class, arrow_head_styles_class, 
+colors_class):
     
     # Initializes the dictionary with the curve information
 
@@ -94,22 +95,20 @@ vanishing_points):
 
     if key=="q":
 
-        # Allows for selection of parameters
+        # Gets the necessary information
 
-        thickness = input("\nType the thickness and press enter: ")
+        thickness = input_repeater("\nType the thickness and press ent"+
+        "er: ", reviewer_function=None, default_value=0.2, 
+        necessary_type=float)
 
-        line_style = input("\nType the line style and press enter: ")
+        line_style = input_repeater("\nType the line style and press e"+
+        "nter: ", reviewer_function=line_styles_class.verify_line_name, 
+        default_value="solid", necessary_type=str)
 
-        color = input("\nType the color of the contour line and press "+
-        "enter: ")
-
-        # Converts these strings 
-
-        thickness = convert_string(thickness, 0.2)
-
-        line_style = convert_string(line_style, "solid")
-
-        color = convert_string(color, "black")
+        color = input_repeater("\nType the color of the contour line a"+
+        "nd press enter: ", reviewer_function=
+        colors_class.verify_color_name, default_value="black", 
+        necessary_type=str)
 
         # Creates the dictionary to create this spline
 
@@ -123,27 +122,24 @@ vanishing_points):
 
     elif key=="w":
 
-        # Allows for selection of parameters
-
-        thickness =  input("\nType the thickness and press enter: ")
-
-        line_style =  input("\nType the line style and press enter: ")
-
-        color = input("\nType the color of the contour line and press "+
-        "enter: ")
+        # Gets the necessary information
 
-        fill_color = input("\nType the color of filling and press ente"+
-        "r: ")
+        thickness = input_repeater("\nType the thickness and press ent"+
+        "er: ", reviewer_function=None, default_value=0.2, 
+        necessary_type=float)
 
-        # Converts these strings 
+        line_style = input_repeater("\nType the line style and press e"+
+        "nter: ", reviewer_function=line_styles_class.verify_line_name, 
+        default_value="solid", necessary_type=str)
 
-        thickness = convert_string(thickness, 0.2)
+        color = input_repeater("\nType the color of the contour line a"+
+        "nd press enter: ", reviewer_function=
+        colors_class.verify_color_name, default_value="black", 
+        necessary_type=str)
 
-        line_style = convert_string(line_style, "solid")
-
-        color = convert_string(color, "black")
-
-        fill_color = convert_string(fill_color, "transparent")
+        fill_color = input_repeater("\nType the color of filling and p"+
+        "ress enter: ", reviewer_function=colors_class.verify_color_name, 
+        default_value="transparent", necessary_type=str)
 
         # Creates the dictionary to create this spline
 
@@ -158,27 +154,25 @@ vanishing_points):
 
     elif key=="e":
 
-        # Allows for selection of parameters
-
-        thickness =  input("\nType the thickness and press enter: ")
-
-        line_style =  input("\nType the line style and press enter: ")
-
-        color = input("\nType the color of the contour line and press "+
-        "enter: ")
-
-        arrow_style = input("\nType the style of the arrow head: ")
+        # Gets the necessary information
 
-        # Converts these strings 
+        thickness = input_repeater("\nType the thickness and press ent"+
+        "er: ", reviewer_function=None, default_value=0.2, 
+        necessary_type=float)
 
-        thickness = convert_string(thickness, 0.2)
+        line_style = input_repeater("\nType the line style and press e"+
+        "nter: ", reviewer_function=line_styles_class.verify_line_name, 
+        default_value="solid", necessary_type=str)
 
-        line_style = convert_string(line_style, "solid")
+        color = input_repeater("\nType the color of the contour line a"+
+        "nd press enter: ", reviewer_function=
+        colors_class.verify_color_name, default_value="black", 
+        necessary_type=str)
 
-        color = convert_string(color, "black")
-
-        arrow_style = convert_string(arrow_style, "inkscape round back "+
-        "arrow")
+        arrow_style = input_repeater("\nType the style of the arrow he"+
+        "ad: ", reviewer_function=
+        arrow_head_styles_class.verify_arrow_name, default_value="inks"+
+        "cape round back arrow", necessary_type=str)
 
         # Creates the dictionary to create this spline
 
@@ -192,22 +186,20 @@ vanishing_points):
 
     if key=="a":
 
-        # Allows for selection of parameters
-
-        thickness = input("\nType the thickness and press enter: ")
-
-        line_style = input("\nType the line style and press enter: ")
+        # Gets the necessary information
 
-        color = input("\nType the color of the contour line and press "+
-        "enter: ")
+        thickness = input_repeater("\nType the thickness and press ent"+
+        "er: ", reviewer_function=None, default_value=0.2, 
+        necessary_type=float)
 
-        # Converts these strings 
+        line_style = input_repeater("\nType the line style and press e"+
+        "nter: ", reviewer_function=line_styles_class.verify_line_name, 
+        default_value="solid", necessary_type=str)
 
-        thickness = convert_string(thickness, 0.2)
-
-        line_style = convert_string(line_style, "solid")
-
-        color = convert_string(color, "black")
+        color = input_repeater("\nType the color of the contour line a"+
+        "nd press enter: ", reviewer_function=
+        colors_class.verify_color_name, default_value="black", 
+        necessary_type=str)
 
         # Creates the dictionary to create this polygonal curve
 
@@ -221,27 +213,24 @@ vanishing_points):
 
     elif key=="s":
 
-        # Allows for selection of parameters
-
-        thickness =  input("\nType the thickness and press enter: ")
+        # Gets the necessary information
 
-        line_style =  input("\nType the line style and press enter: ")
+        thickness = input_repeater("\nType the thickness and press ent"+
+        "er: ", reviewer_function=None, default_value=0.2, 
+        necessary_type=float)
 
-        color = input("\nType the color of the contour line and press "+
-        "enter: ")
+        line_style = input_repeater("\nType the line style and press e"+
+        "nter: ", reviewer_function=line_styles_class.verify_line_name, 
+        default_value="solid", necessary_type=str)
 
-        fill_color = input("\nType the color of filling and press ente"+
-        "r: ")
+        color = input_repeater("\nType the color of the contour line a"+
+        "nd press enter: ", reviewer_function=
+        colors_class.verify_color_name, default_value="black", 
+        necessary_type=str)
 
-        # Converts these strings 
-
-        thickness = convert_string(thickness, 0.2)
-
-        line_style = convert_string(line_style, "solid")
-
-        color = convert_string(color, "black")
-
-        fill_color = convert_string(fill_color, "transparent")
+        fill_color = input_repeater("\nType the color of filling and p"+
+        "ress enter: ", reviewer_function=colors_class.verify_color_name, 
+        default_value="transparent", necessary_type=str)
 
         # Creates the dictionary to create this polygonal curve
 
@@ -256,27 +245,25 @@ vanishing_points):
 
     elif key=="d":
 
-        # Allows for selection of parameters
-
-        thickness =  input("\nType the thickness and press enter: ")
-
-        line_style =  input("\nType the line style and press enter: ")
+        # Gets the necessary information
 
-        color = input("\nType the color of the contour line and press "+
-        "enter: ")
+        thickness = input_repeater("\nType the thickness and press ent"+
+        "er: ", reviewer_function=None, default_value=0.2, 
+        necessary_type=float)
 
-        arrow_style = input("\nType the style of the arrow head: ")
+        line_style = input_repeater("\nType the line style and press e"+
+        "nter: ", reviewer_function=line_styles_class.verify_line_name, 
+        default_value="solid", necessary_type=str)
 
-        # Converts these strings 
+        color = input_repeater("\nType the color of the contour line a"+
+        "nd press enter: ", reviewer_function=
+        colors_class.verify_color_name, default_value="black", 
+        necessary_type=str)
 
-        thickness = convert_string(thickness, 0.2)
-
-        line_style = convert_string(line_style, "solid")
-
-        color = convert_string(color, "black")
-
-        arrow_style = convert_string(arrow_style, "inkscape round back "+
-        "arrow")
+        arrow_style = input_repeater("\nType the style of the arrow he"+
+        "ad: ", reviewer_function=
+        arrow_head_styles_class.verify_arrow_name, default_value="inks"+
+        "cape round back arrow", necessary_type=str)
 
         # Creates the dictionary to create this spline
 
@@ -306,6 +293,50 @@ vanishing_points):
 #                               Utilities                              #
 ########################################################################
 
+# Defines a function to repeat a call until the right answer is given
+
+def input_repeater(input_text, reviewer_function=None, default_value=
+None, necessary_type=None):
+
+    # Initializes a flag to keep repeating the question
+
+    flag_repeat = True 
+
+    # Repeats the question until a right answer is given
+
+    while flag_repeat:
+
+        # Asks the user for the input
+
+        input_string =  input(input_text)
+        
+        # Converts the input string to another format if possible
+
+        input_string = convert_string(input_string, default_value,
+        necessary_type=necessary_type)
+
+        # Verifies if a right answer has been given
+
+        if reviewer_function is not None:
+
+            processed_answer = reviewer_function(input_string)
+
+            # If it is not false, returns it
+
+            if processed_answer:
+
+                flag_repeat = False 
+
+                return processed_answer
+            
+        # If the reviewer function is None, returns the answer anyways
+
+        else:
+
+            flag_repeat = False 
+
+            return input_string
+
 # Defines a function to substitute the X markers by square markers when
 # points defined by the user are saved
 
@@ -337,7 +368,7 @@ def substitute_markers(points_list, general_axes, depth_order, collage):
 
 # Defines a function to convert strings to useful formats
 
-def convert_string(string, default_value):
+def convert_string(string, default_value, necessary_type=None):
 
     # If the string has no length, returns the default value
 
@@ -367,6 +398,14 @@ def convert_string(string, default_value):
 
                 string = string_toList(string)
 
+    # Verifies the type of the string if needed
+
+    if (necessary_type is not None) and (not isinstance(string, 
+    necessary_type)):
+        
+        raise TypeError("'"+str(string)+"' has type '"+str(type(string)
+        )+"', but the necessary type is "+str(necessary_type))
+
     # If the string is still a string and the default value is not None,
     # returns the default value
 

{davout-0.1.1.dev101 → davout-0.1.1.dev103}/source/Davout/GraphUtilities/tool_box/interactivity_tools.py

@@ -57,7 +57,8 @@ class InteractiveWindowInfo:
 def create_interactive_window(general_axes, collage, old_x_min, 
 old_x_max, old_y_min, old_y_max, new_x_min, new_x_max, new_y_min, 
 new_y_max, input_path, depth_order, arrows_and_lines_file,
-interactive_window_info, verbose=False):
+interactive_window_info, line_styles_class, arrow_head_styles_class, 
+colors_class, verbose=False):
 
     # Zoom axes to the bounding box
 
@@ -583,7 +584,8 @@ interactive_window_info, verbose=False):
             event.key, arrows_and_lines_list, arrows_and_lines_file, 
             input_path, depth_order, collage, points_list, general_axes,
             interactive_window_info.tolerance, 
-            interactive_window_info.vanishing_points_list)
+            interactive_window_info.vanishing_points_list, 
+            line_styles_class, arrow_head_styles_class, colors_class)
 
             # Disables the flag input again
 

{davout-0.1.1.dev101 → davout-0.1.1.dev103/source/Davout.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Davout
-Version: 0.1.1.dev101
+Version: 0.1.1.dev103
 Summary: Scientific computing utilities combining FEM, ANN and tooling
 Author: Matheus Janczkowski
 Author-email: Matheus Janczkowski <matheusj2009@hotmail.com>