Davout 0.1.1.dev110__tar.gz → 0.1.1.dev111__tar.gz

{davout-0.1.1.dev110/source/Davout.egg-info → davout-0.1.1.dev111}/PKG-INFO

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

{davout-0.1.1.dev110 → davout-0.1.1.dev111}/pyproject.toml

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

{davout-0.1.1.dev110 → davout-0.1.1.dev111}/source/Davout/GraphUtilities/aa_tests/continuum_mechanics_potato_collage.py

@@ -4,11 +4,11 @@ from ...GraphUtilities.collage_tools import create_box_collage
 
 from ...PythonicUtilities.path_tools import get_parent_path_of_file
 
-create_box_collage("continuum_mechanics_kinematics.png", input_path=
+create_box_collage("continuum_mechanics_kinematics.pdf", input_path=
 get_parent_path_of_file(),
 
 boxes_list=[{"contour color": "black", "fill color": "grey 2", "contour"+
-" thickness": 0.2, "position": [52.0, 99.0], "width": 105.0, "height": 52.0,
+" thickness": 0.2, "position": [53.0, 99.0], "width": 104.0, "height": 52.0,
 "contour style": "solid", "origin point": "bottom-left"},
 {"contour color": "black", "fill color": "grey 1", "contour"+
 " thickness": 0.2, "position": [54, 100.0], "width": 50.0, "height": 50.0,
@@ -19,19 +19,19 @@ boxes_list=[{"contour color": "black", "fill color": "grey 2", "contour"+
 
 arrows_and_lines_list=[],
 
-vanishing_points_list=[
-{"coordinates": [105.0, -50.0], "rays central direction": [0.0, 1.0],
-"angle amplitude": 10.0, "number of rays": 15, "color": "black", 
-"thickness": 0.4}, 
-{"coordinates": [320.0, 250.0], "rays central direction": [-1.0, -0.1],
-"angle amplitude": 10.0, "number of rays": 15, "color": "black", 
-"thickness": 0.4}, 
-{"coordinates": [-110.0, 250.0], "rays central direction": [1.0, -0.1],
-"angle amplitude": 10.0, "number of rays": 15, "color": "black", 
-"thickness": 0.4}],
+#vanishing_points_list=[
+#{"coordinates": [105.0, -50.0], "rays central direction": [0.0, 1.0],
+#"angle amplitude": 10.0, "number of rays": 15, "color": "black", 
+#"thickness": 0.4}, 
+#{"coordinates": [320.0, 140.0], "rays central direction": [-1.0, -0.1],
+#"angle amplitude": 10.0, "number of rays": 15, "color": "black", 
+#"thickness": 0.4}, 
+#{"coordinates": [-110.0, 140.0], "rays central direction": [1.0, -0.1],
+#"angle amplitude": 10.0, "number of rays": 15, "color": "black", 
+#"thickness": 0.4}],"""
 
-verbose=True, no_padding=True, add_overlaying_grid=True, dpi=300,
+verbose=True, no_padding=True, add_overlaying_grid=False, dpi=600,
 grid_annotation_length=10, save_lists_to_txt=True, 
 interactive_preview=True, size_template="A4", export_selection={
-"origin point": "bottom-left", "position": [48.0, 94.0], "wid"+
-"th": 115.0, "height": 60.0})
+"origin point": "bottom-left", "position": [53.0, 99.0], "width": 104.0, 
+"height": 52.0})

{davout-0.1.1.dev110 → davout-0.1.1.dev111}/source/Davout/GraphUtilities/collage_tools.py

@@ -74,10 +74,27 @@ aspect_ratio='auto', adjustable=None, layout_width_milimeters=210.0,
 layout_height_milimeters=297.0, add_overlaying_grid=False, tolerance=
 1E-1, grid_annotation_length=10, rule_fontsize=6, rule_number_offset=0.5,
 vanishing_points_list=None, save_lists_to_txt=True, interactive_preview=
-False, arrows_and_lines_file="arrows_and_lines_list", boxes_list_file=
-"boxes_list", text_list_file="text_excerpts_list", size_template=None, 
-export_selection=None, image_interpolation=None, backend=None, 
-compress_level=None, concatenate_read_lists_with_argument_lists=True):
+False, arrows_and_lines_file=None, boxes_list_file=None, text_list_file=
+None, size_template=None, export_selection=None, image_interpolation=
+None, backend=None, compress_level=None, 
+concatenate_read_lists_with_argument_lists=True):
+    
+    # Verifies if the files to save the lists are None
+
+    if arrows_and_lines_file is None:
+
+        arrows_and_lines_file = "arrows_and_lines_list_"+str(
+        path_tools.take_outFileNameTermination(output_file))
+
+    if boxes_list_file is None:
+
+        boxes_list_file = "boxes_list_"+str(
+        path_tools.take_outFileNameTermination(output_file))
+
+    if text_list_file is None:
+
+        text_list_file = "text_excerpts_list_"+str(
+        path_tools.take_outFileNameTermination(output_file))
     
     # Initializes the class of colors, the class of alignments, and the 
     # class of line styles
@@ -230,9 +247,13 @@ compress_level=None, concatenate_read_lists_with_argument_lists=True):
 
                         read_boxes_list = []
 
-                    # Concatenate both
+                    # Concatenates both
 
-                    boxes_list.extend(read_boxes_list)
+                    for new_box in read_boxes_list:
+
+                        if new_box not in boxes_list:
+
+                            boxes_list.append(new_box)
 
                     # Then, saves it
 
@@ -362,9 +383,13 @@ compress_level=None, concatenate_read_lists_with_argument_lists=True):
 
                         input_text_list = []
 
-                    # Concatenate both
+                    # Concatenates both
+
+                    for new_text in read_input_text_list:
 
-                    input_text_list.extend(read_input_text_list)
+                        if new_text not in input_text_list:
+
+                            input_text_list.append(new_text)
 
                     # Then, saves it
 
@@ -451,10 +476,13 @@ compress_level=None, concatenate_read_lists_with_argument_lists=True):
 
                         read_arrows_and_lines_list = []
 
-                    # Concatenate both
+                    # Concatenates both
+
+                    for new_arrow in read_arrows_and_lines_list:
+
+                        if new_arrow not in arrows_and_lines_list:
 
-                    arrows_and_lines_list.extend(
-                    read_arrows_and_lines_list)
+                            arrows_and_lines_list.append(new_arrow)
 
                     # Then, saves it
 
@@ -687,7 +715,7 @@ compress_level=None, concatenate_read_lists_with_argument_lists=True):
 
                 if interactive_preview:
 
-                    interactive_window_info = create_interactive_window(
+                    interactive_window_info, depth_order = create_interactive_window(
                     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, 
@@ -807,7 +835,7 @@ compress_level=None, concatenate_read_lists_with_argument_lists=True):
 
                 if interactive_preview:
 
-                    interactive_window_info = create_interactive_window(
+                    interactive_window_info, depth_order = create_interactive_window(
                     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, 
@@ -921,7 +949,7 @@ compress_level=None, concatenate_read_lists_with_argument_lists=True):
 
             if interactive_preview:
 
-                interactive_window_info = create_interactive_window(general_axes, 
+                interactive_window_info, depth_order = create_interactive_window(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, 

{davout-0.1.1.dev110 → davout-0.1.1.dev111}/source/Davout/GraphUtilities/tool_box/box_and_markers_classes.py

@@ -158,37 +158,33 @@ class MarkerBoxStyles:
 
         y_center = position[1]*1.0
 
-        # Translates it according to position
+        # If circle is asked for, ignores height
 
-        if origin_point=="bottom-left":
+        if self.shape=="circle":
 
-            x_center += 0.5*width
+            height = width*1.0
 
-            y_center += 0.5*height 
+        # Translates it according to position
 
-        elif origin_point=="bottom-right":
+        if origin_point=="bottom-left":
 
-            x_center -= 0.5*width 
+            x_center += width
 
-            y_center += 0.5*height
+            y_center += height 
 
-        elif origin_point=="top-right":
-
-            x_center -= 0.5*width 
+        elif origin_point=="bottom-right":
 
-            y_center -= 0.5*height
+            y_center += height
 
         elif origin_point=="top-left":
 
-            x_center += 0.5*width 
-
-            y_center -= 0.5*height
+            x_center += width 
 
-        # If circle is asked for, ignores height
+        elif origin_point=="centroid":
 
-        if self.shape=="circle":
+            x_center += 0.5*width
 
-            height = width*1.0
+            y_center += 0.5*height
 
         new_box = Ellipse((x_center, y_center), width, height, 
         linewidth=contour_thickness, edgecolor=contour_color, 

{davout-0.1.1.dev110 → davout-0.1.1.dev111}/source/Davout/GraphUtilities/tool_box/curves_setter.py

@@ -347,7 +347,7 @@ colors_class, marker_box_class, alignment_class):
         # point of the points list as position
 
         marker_dictionary = {"shape": marker_style, "contour thickness": 
-        thickness, "line style": line_style, "contour color": color, 
+        thickness, "contour style": line_style, "contour color": color, 
         "fill color": fill_color, "width": width, "height": height, "p"+
         "osition": points_list[-1], "origin point": origin_point, "num"+
         "ber of sides": number_of_sides}
@@ -366,7 +366,7 @@ colors_class, marker_box_class, alignment_class):
 
         origin_point = input_repeater("\nType the alignment option rel"+
         "ative to the pressed point and press enter: ", reviewer_function=
-        alignment_class.verify_alignment_name, default_value="centroid", 
+        alignment_class.verify_alignment_name, default_value="bottom-left", 
         necessary_type=str)
 
         font_size = input_repeater("\nType the height of the letters i"+
@@ -401,6 +401,12 @@ colors_class, marker_box_class, alignment_class):
 
     if curve_dictionary:
 
+        # Updates the depth
+
+        depth_order += 1
+
+        curve_dictionary["depth order"] = depth_order
+
         arrows_and_lines_list.append(curve_dictionary)
 
         list_toTxt(arrows_and_lines_list, arrows_and_lines_file, 
@@ -419,6 +425,12 @@ colors_class, marker_box_class, alignment_class):
 
     if marker_dictionary:
 
+        # Updates the depth
+
+        depth_order += 1
+
+        marker_dictionary["depth order"] = depth_order
+
         boxes_list.append(marker_dictionary)
 
         list_toTxt(boxes_list, boxes_list_file, parent_path=input_path)
@@ -438,6 +450,12 @@ colors_class, marker_box_class, alignment_class):
 
     if text_dictionary:
 
+        # Updates the depth
+
+        depth_order += 1
+
+        text_dictionary["depth order"] = depth_order
+
         text_list.append(text_dictionary)
 
         list_toTxt(text_list, text_list_file, parent_path=input_path)
@@ -453,7 +471,7 @@ colors_class, marker_box_class, alignment_class):
             flag_marker_substitution = True
 
     return (points_list, general_axes, arrows_and_lines_list, boxes_list,
-    text_list)
+    text_list, depth_order)
 
 ########################################################################
 #                               Utilities                              #

{davout-0.1.1.dev110 → davout-0.1.1.dev111}/source/Davout/GraphUtilities/tool_box/interactivity_tools.py

@@ -292,7 +292,7 @@ marker_box_class, alignment_class, verbose=False):
 
     def on_key(event):
 
-        nonlocal points_list, general_axes, manual_close, arrows_and_lines_list, flag_input, interactive_window_info, boxes_list, text_list
+        nonlocal points_list, general_axes, manual_close, arrows_and_lines_list, flag_input, interactive_window_info, boxes_list, text_list, depth_order
 
         # If enter is pressed, saves the image and do not resume redraw-
         # ing
@@ -666,6 +666,59 @@ marker_box_class, alignment_class, verbose=False):
 
                 print("", flush=True)
 
+        # Detects Ctrl+F to erase the box
+         
+        elif event.key=="ctrl+f":
+
+            if boxes_list:
+
+                removed = boxes_list[-1]
+
+                # Takes input
+
+                flag_input = True 
+
+                response = input("\nAre you sure you want to remove th"+
+                "e last box or marker? Type 'y' if so: ")
+
+                # If it is different than y, moves forward
+
+                if response!="y":
+
+                    print("\nCancels removing the following element:\n"+
+                    str(removed))
+
+                    flag_input = False 
+
+                    return None
+                
+                # Removes the last line and disables the input flag
+
+                boxes_list = boxes_list[0:-1]
+                
+                flag_input = False 
+                
+                print(f"[UNDO] removed {removed}", flush= True)
+
+                # Rewrites the arrows list
+
+                list_toTxt(boxes_list, boxes_list_file, parent_path=
+                input_path)
+
+                # Triggers redrawing
+                
+                interactive_window_info.flag_redraw = True
+
+                manual_close = False
+
+                plt.close()
+
+            else:
+
+                print("[UNDO] no curves left", flush=True)
+
+                print("", flush=True)
+
         # Verifies if one of the pre-fabricated curves were asked
 
         else:
@@ -675,7 +728,7 @@ marker_box_class, alignment_class, verbose=False):
             flag_input = True
 
             (points_list, general_axes, arrows_and_lines_list, 
-            boxes_list, text_list) = curves_setter.set_curve(
+            boxes_list, text_list, depth_order) = curves_setter.set_curve(
             event.key, arrows_and_lines_list, boxes_list, text_list,
             arrows_and_lines_file, boxes_list_file, text_list_file, 
             input_path, depth_order, collage, points_list, general_axes,
@@ -849,4 +902,4 @@ marker_box_class, alignment_class, verbose=False):
 
     general_axes.set_ylim(old_y_min, old_y_max)
 
-    return interactive_window_info
+    return interactive_window_info, depth_order

{davout-0.1.1.dev110 → davout-0.1.1.dev111}/source/Davout/GraphUtilities/tool_box/text_excerpt_tools.py

@@ -128,6 +128,11 @@ color_class, verbose, depth_order):
                 "s_list' has at key 'rotation in degrees' a value that"+
                 " is not a float. Currently, 'rotation in degrees' is:"+
                 " "+str(angle))
+            
+            if verbose:
+
+                print("\nRotates the text except by "+str(angle)+" deg"+
+                "rees")
 
         # Verifies if a depth number has been given
 

{davout-0.1.1.dev110 → davout-0.1.1.dev111/source/Davout.egg-info}/PKG-INFO

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