prefig 0.3.7.dev20250722203657__tar.gz → 0.3.8.dev20250725054648__tar.gz

{prefig-0.3.7.dev20250722203657 → prefig-0.3.8.dev20250725054648}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefig
-Version: 0.3.7.dev20250722203657
+Version: 0.3.8.dev20250725054648
 Summary: An authoring system for mathematical diagrams
 Home-page: https://prefigure.org
 License: GPL-3.0-or-later

{prefig-0.3.7.dev20250722203657 → prefig-0.3.8.dev20250725054648}/prefig/core/slope_field.py

@@ -8,6 +8,7 @@ from . import utilities
 from . import grid_axes
 from . import group
 from . import math_utilities as math_util
+from . import calculus
 
 log = logging.getLogger('prefigure')
 
@@ -112,3 +113,110 @@ def slope_field(element, diagram, parent, outline_status):
 
     group.group(element, diagram, parent, outline_status)
 
+# Add a graphical element for slope fields
+def vector_field(element, diagram, parent, outline_status):
+    if outline_status == 'finish_outline':
+        finish_outline(element, diagram, parent)
+        return
+
+    try:
+        f = un.valid_eval(element.get('function'))
+    except:
+        log.error(f"Error retrieving slope-field function={element.get('function')}")
+        return
+    bbox = diagram.bbox()
+
+    # We're going to turn this element into a group and add lines to it
+    element.tag = "group"
+    if element.get('outline', 'no') == 'yes':
+        element.set('outline', 'always')
+
+    # Now we'll construct a line with all the graphical information
+    # and make copies of it
+    line_template = ET.Element('line')
+
+    if diagram.output_format() == 'tactile':
+        line_template.set('stroke', 'black')
+    else:
+        line_template.set('stroke', element.get('stroke', 'blue'))
+    line_template.set('thickness', element.get('thickness', '2'))
+    if element.get('arrows', 'yes') == 'yes':
+        line_template.set('arrows', '1')
+
+    if element.get('arrow-width', None) is not None:
+        line_template.set('arrow-width', element.get('arrow-width'))
+    if element.get('arrow-angles', None) is not None:
+        line_template.set('arrow-angles', element.get('arrow-angles'))
+
+    spacings = element.get('spacings', None)
+    if spacings is not None:
+        try:
+            spacings = un.valid_eval(spacings)
+            rx, ry = spacings
+        except:
+            log.error(f"Error parsing slope-field attribute @spacings={element.get('spacings')}")
+            return
+    else:
+        rx = grid_axes.find_gridspacing((bbox[0], bbox[2]))
+        ry = grid_axes.find_gridspacing((bbox[1], bbox[3]))
+
+    # we will go through and generate the vectors first
+    # since we'll need to scale them
+    field_data = []
+    max_scale = 0
+    x = rx[0]
+    while x <= rx[2]:
+        y = ry[0]
+        while y <= ry[2]:
+            f_value = f(x, y)
+            try:
+                if len(f_value) != 2:
+                    log.error("Only two-dimensional vector fields are supported")
+                    return;
+            except:
+                pass
+            max_scale = max(max_scale,
+                            abs((f_value[0])/rx[1]),
+                            abs((f_value[1])/ry[1]))
+            field_data.append([np.array([x,y]), f_value])
+            y += ry[1]
+        x += rx[1]
+
+    scale_factor = min(1, 0.75 / max_scale)
+    if element.get('scale') is not None:
+        scale = un.valid_eval(element.get('scale'))
+        scale_factor = scale
+
+    for datum in field_data:
+        p, v = datum
+        v = scale_factor * v
+        # is this long enough to add?
+        tail = p
+        tip  = p+v
+        p0 = diagram.transform(tail)
+        p1 = diagram.transform(tip)
+        if math_util.distance(p0, p1) < 2:
+            continue
+
+        line_el = copy.deepcopy(line_template)
+        line_el.set('p1', utilities.pt2long_str(tail, spacer=','))
+        line_el.set('p2', utilities.pt2long_str(tip, spacer=','))
+        element.append(line_el)
+
+    group.group(element, diagram, parent, outline_status)
+
+def gradient(element, diagram, parent, outline_status):
+    try:
+        f = un.valid_eval(element.get("function"))
+    except:
+        log.error("Error retrieving function in gradient element")
+        return
+
+    def grad(a, b):
+        f_x_trace = lambda x: f(x, b)
+        f_y_trace = lambda y: f(a, y)
+        return np.array([calculus.derivative(f_x_trace, a),
+                         calculus.derivative(f_y_trace, b)])
+    un.enter_namespace("__grad", grad)
+    element.set("function", "__grad")
+    vector_field(element, diagram, parent, outline_status)

{prefig-0.3.7.dev20250722203657 → prefig-0.3.8.dev20250725054648}/prefig/core/tags.py

@@ -45,6 +45,7 @@ tag_dict = {
     'definition': definition.definition,
     'derivative': definition.derivative,
     'ellipse': circle.ellipse,
+    'gradient': slope_field.gradient,
     'graph': graph.graph,
     'grid': grid_axes.grid,
     'grid-axes': grid_axes.grid_axes,
@@ -72,7 +73,8 @@ tag_dict = {
     'tangent-line': tangent_line.tangent,
     'translate': CTM.transform_translate,
     'triangle': polygon.triangle,
-    'vector': vector.vector
+    'vector': vector.vector,
+    'vector-field': slope_field.vector_field
 }
 
 log = logging.getLogger('prefigure')

{prefig-0.3.7.dev20250722203657 → prefig-0.3.8.dev20250725054648}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prefig"
-version = "0.3.7.dev20250722203657"
+version = "0.3.8.dev20250725054648"
 description = "An authoring system for mathematical diagrams"
 readme = "README.md"
 homepage = "https://prefigure.org"