Davout 0.1.1.dev178__tar.gz → 0.1.1.dev180__tar.gz

{davout-0.1.1.dev178/source/Davout.egg-info → davout-0.1.1.dev180}/PKG-INFO

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

{davout-0.1.1.dev178 → davout-0.1.1.dev180}/pyproject.toml

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

{davout-0.1.1.dev178 → davout-0.1.1.dev180}/source/Davout/GraphUtilities/aa_tests/tests_collage_tools.py

@@ -41,11 +41,14 @@ class TestCollage():
         "opacity": 0.5}], 
 
         input_text_list=[{"text": "Lateral", "position": [100.0, 195.0], "font size": 
-        4, "origin point": "bottom-right"}, 
-        {"text": "Upper", "position": [157.0, 195.0], "font size": 4,
-        "origin point": "bottom-right"},
-        {"text": "$\MaterialDivOf{\\boldsymbol{P}}=\\boldsymbol{0}$", 
-        "position": [50.0, 195.0], "font size": 4, "origin point": "bottom-left"}],
+        4, "origin point": "bottom-right", "rendering method": "matplotlib text",
+        "object name": "lateral sign"}, 
+        {"text": "\\textbf{Upper}", "position": [157.0, 195.0], "font size": 4,
+        "origin point": "bottom-right", "rendering method": "TextPath",
+        "object name": "upper sign"},
+        {"text": "$\\MaterialDivOf{\\boldsymbol{P}}=\\boldsymbol{0}$", 
+        "position": [50.0, 195.0], "font size": 4, "origin point": "bottom-left", 
+        "rendering method": "TextPath", "object name": "div sign"}],
 
         boxes_list=[{"contour color": "black", "fill color": "red 2", "contour"+
         " thickness": 0.2, "position": [46.5, 193.0], "width": 114.0, "height": 58.0,
@@ -78,10 +81,10 @@ class TestCollage():
 
         verbose=True, no_padding=True, add_overlaying_grid=True, dpi=500,
         grid_annotation_length=10, save_lists_to_txt=True, 
-        interactive_preview=True, size_template="A4", export_selection={
-        "origin point": "bottom-left", "position": [42.0, 191.0], "wid"+
-        "th": 123.0, "height": 63.0}, compress_level=1, 
-        ignore_read_repetitions=True)
+        interactive_preview=False, size_template="A4",
+        #export_selection={"origin point": "bottom-left", "position": [
+        #42.0, 191.0], "width": 123.0, "height": 63.0}, 
+        compress_level=1, ignore_read_repetitions=True)
 
 # Runs all tests
 

{davout-0.1.1.dev178 → davout-0.1.1.dev180}/source/Davout/GraphUtilities/tool_box/text_excerpt_tools.py

@@ -2,10 +2,18 @@
 
 from copy import deepcopy
 
+from math import cos, sin, radians
+
 from .collage_classes import milimeters_to_points
 
+from matplotlib.textpath import TextPath
+
+from matplotlib.patches import PathPatch
+
 from matplotlib.transforms import Affine2D
 
+from matplotlib.font_manager import FontProperties
+
 # Defines a function to plot excerpts of text from a list
 
 def plot_text_excerpts(general_axes, input_text_list, alignments_class, 
@@ -169,6 +177,14 @@ color_class, verbose, depth_order):
 
             aspect_ratio = input_dictionary["aspect ratio"]
 
+        # Checks if the rendering method was provided
+
+        rendering_method = "matplotlib text"
+
+        if "rendering method" in input_dictionary:
+
+            rendering_method = input_dictionary["rendering method"]
+
         # Adds the text input
 
         if verbose:
@@ -176,23 +192,109 @@ color_class, verbose, depth_order):
             print("Adds text at point "+str(position)+" with 'origin p"+
             "oint' as '"+str(origin_point)+"'\n")
 
-        text_artist = general_axes.text(position[0], position[1], 
-        input_text, fontsize=font_size, ha=ha, va=va, rotation=angle, 
-        rotation_mode="anchor", zorder=local_depth_order, transform=
-        general_axes.transData, color=color)
+        # If the rendering method is the conventional text of matplotlib
+
+        if rendering_method=="matplotlib text":
+
+            text_artist = general_axes.text(position[0], position[1], 
+            input_text, fontsize=font_size, ha=ha, va=va, rotation=angle, 
+            rotation_mode="anchor", zorder=local_depth_order, transform=
+            general_axes.transData, color=color)
+
+            # Gets the position in display coordinates
+
+            display_position = general_axes.transData.transform(position)
+
+            # Creates a transform centered at the text anchor
+
+            text_transform = (Affine2D().translate(-display_position[0], 
+            -display_position[1]).scale(aspect_ratio, 1.0).translate(
+            display_position[0], display_position[1]))
+
+            # Sets the transform to the text excerpt
+
+            text_artist.set_transform(general_axes.transData+
+            text_transform)
+
+        # Otherwise, if the rendering method is TextPath
+
+        elif rendering_method=="TextPath":
+
+            # Creates the text excerpt as a text path. Positions it at 
+            # the origin first; the patch will be scaled and translated 
+            # later
+
+            text_path = TextPath((0, 0), input_text, size=font_size, 
+            usetex=True)
+
+            # gets the bounding box of the text path in points
+
+            text_bounding_box = text_path.get_extents()
+
+            # Checks the alignment options to set the anchor
 
-        # Gets the position in display coordinates
+            if ha=="left":
 
-        display_position = general_axes.transData.transform(position)
+                anchor_x = text_bounding_box.xmin
 
-        # Creates a transform centered at the text anchor
+            elif ha=="center":
 
-        text_transform = (Affine2D().translate(-display_position[0], 
-        -display_position[1]).scale(aspect_ratio, 1.0).translate(
-        display_position[0], display_position[1])+general_axes.transData)
+                anchor_x = 0.5*(text_bounding_box.xmin+
+                text_bounding_box.xmax)
 
-        # Sets the transform to the text excerpt
+            elif ha=="right":
+
+                anchor_x = text_bounding_box.xmax
+
+            else:
+
+                anchor_x = text_bounding_box.xmin
+
+            if va=="bottom":
+
+                anchor_y = text_bounding_box.ymin
+
+            elif va=="center":
+
+                anchor_y = 0.5*(text_bounding_box.ymin+
+                text_bounding_box.ymax)
+
+            elif va=="top":
+
+                anchor_y = text_bounding_box.ymax
+
+            else:
+
+                anchor_y = text_bounding_box.ymin
+
+            # Gets the transformation of the text path 
+
+            points_to_millimeters = 25.4/72
+
+            path_transform = (Affine2D().translate(-anchor_x, -anchor_y)
+            .scale(aspect_ratio, 1.0).rotate_deg(angle).scale(
+            points_to_millimeters))
+
+            # Then translates the path to the final position
+
+            text_transform = (path_transform+Affine2D().translate(
+            position[0], position[1])+general_axes.transData)
+
+            # Creates the patch and add to the canvas
+
+            patch_instance = PathPatch(text_path, transform=
+            text_transform, facecolor=color, edgecolor="none", zorder=
+            local_depth_order,clip_on=False)
+
+            general_axes.add_patch(patch_instance)
+
+        # Otherwise, throws an error
+
+        else:
 
-        text_artist.set_transform(text_transform)
+            raise NameError("'rendering method' in the dictionary of t"+
+            "ext excerpts was selected as '"+str(rendering_method)+"'."+
+            " This value is invalid; you have to choose one of the fol"+
+            "lowing options:\n'matplotlib text'\n'TextPath'")
 
     return general_axes, depth_order

{davout-0.1.1.dev178 → davout-0.1.1.dev180/source/Davout.egg-info}/PKG-INFO

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