prefig 0.4.1.dev20250803054516__py3-none-any.whl → 0.4.3.dev20250823053253__py3-none-any.whl

prefig/core/axes.py

@@ -571,7 +571,7 @@ class Axes():
                 xlabel.set('scale', '0.8')
             else:
                 #math_element.text = r'\text{'+'{0:g}'.format(x)+'}'
-                math_element.text = label_text(x, commas)
+                math_element.text = label_text(x, commas, diagram)
             if self.h_pi_format:
                 math_element.text = get_pi_text(x)
 
@@ -680,7 +680,7 @@ class Axes():
                 ylabel.set('scale', '0.8')
             else:
                 #math_element.text = r'\text{'+'{0:g}'.format(y)+'}'
-                math_element.text = label_text(y, commas)
+                math_element.text = label_text(y, commas, diagram)
             if self.v_pi_format:
                 math_element.text = get_pi_text(y)
             # process as a math number
@@ -712,7 +712,7 @@ class Axes():
                                    user_coords=False)
             self.v_tick_group.append(line_el)
 
-def label_text(x, commas):
+def label_text(x, commas, diagram):
     # we'll construct a text representation of x
     # maybe it's simple
     if x < 0:
@@ -741,13 +741,16 @@ def label_text(x, commas):
         return r'\text{' + prefix + text + r'}'
 
     period = text.find('.')
+    comma_include = '{,}'
+    if diagram.get_environment() == 'pyodide':
+        comma_include = ','
     if period < 0:
         suffix = ''
     else:
         suffix = text[period:]
         text = text[:period]
     while len(text) > 3:
-        suffix = '{,}' + text[-3:] + suffix
+        suffix = comma_include + text[-3:] + suffix
         text = text[:-3]
     text = text + suffix
     return r'\text{' + prefix + text + r'}'

prefig/core/parametric_curve.py

@@ -24,8 +24,9 @@ def parametric_curve(element, diagram, parent, outline_status):
         log.error(f"Error in <parametric-curve> defining domain={element.get('domain')}")
         return
 
-    N = int(element.get('N', '100'))
+    arrows = int(element.get('arrows', '0'))
 
+    N = int(element.get('N', '100'))
     t = domain[0]
     dt = (domain[1]-domain[0])/N
     p = diagram.transform(f(t))
@@ -34,8 +35,21 @@ def parametric_curve(element, diagram, parent, outline_status):
         t += dt
         p = diagram.transform(f(t))
         points.append('L ' + util.pt2str(p))
+
     if element.get('closed', 'no') == 'yes':
         points.append('Z')
+
+    if arrows > 0 and element.get('arrow-location', None) is not None:
+        arrow_location = un.valid_eval(element.get('arrow-location'))
+        num_pts = 5
+        t = arrow_location - num_pts*dt
+        p = diagram.transform(f(t))
+        points.append('M ' + util.pt2str(p))
+        for _ in range(num_pts):
+            t += dt
+            p = diagram.transform(f(t))
+            points.append('L ' + util.pt2str(p))
+
     d = ' '.join(points)
 
     if diagram.output_format() == 'tactile':
@@ -51,12 +65,10 @@ def parametric_curve(element, diagram, parent, outline_status):
     diagram.add_id(path, element.get('id'))
     path.set('d', d)
     util.add_attr(path, util.get_2d_attr(element))
-#    path.set('type', 'parametric curve')
 
     element.set('cliptobbox', element.get('cliptobbox', 'yes'))
     util.cliptobbox(path, element, diagram)
 
-    arrows = int(element.get('arrows', '0'))
     forward = 'marker-end'
     backward = 'marker-start'
     if element.get('reverse', 'no') == 'yes':

prefig/core/point.py

@@ -1,5 +1,7 @@
 import lxml.etree as ET
 import logging
+import numpy as np
+import math
 from . import user_namespace as un
 from . import math_utilities as math_util
 from . import utilities as util
@@ -18,7 +20,15 @@ def point(element, diagram, parent, outline_status = None):
 
     # determine the location and size of the point from the XML element
     try:
-        p = diagram.transform(un.valid_eval(element.get('p')))
+        p = un.valid_eval(element.get('p'))
+        if element.get('coordinates', 'cartesian') == 'polar':
+            radial = p[0]
+            angle = p[1]
+            if element.get('degrees', 'no') == 'yes':
+                angle = math.radians(angle)
+            p = radial * np.array([math.cos(angle), math.sin(angle)])
+            element.set('p', util.pt2long_str(p, spacer=','))
+        p = diagram.transform(p)
     except:
         log.error(f"Error in <point> defining p={element.get('p')}")
         return

prefig/core/utilities.py

@@ -2,6 +2,9 @@ import numpy as np
 from . import user_namespace as un
 from . import label
 
+import logging
+logger = logging.getLogger('prefigure')
+
 import warnings
 with warnings.catch_warnings():
     warnings.filterwarnings('ignore', 'legacy print')
@@ -25,7 +28,7 @@ def get_attr(element, attr, default):
     try:
         attribute = un.valid_eval(element.get(attr, default))
         if isinstance(attribute, np.ndarray):
-            return np.array2string(attribute, separator=',')
+            return ','.join([float2longstr(a) for a in attribute])
         return str(attribute)
     except (TypeError, SyntaxError):  # this is a string that's not in the namespace
         return element.get(attr, default)

prefig/resources/schema/pf_schema.rnc

@@ -641,6 +641,7 @@ Parametric-Curve = element parametric-curve {
     attribute N {text}?,
     attribute closed {"yes"|"no"}?,
     attribute arrows {text}?,
+    attribute arrow-location {text}?,
     attribute arrow-width {text}?,
     attribute arrow-angles {text}?,
     attribute reverse {"yes"|"no"}?,
@@ -685,6 +686,8 @@ Point = element point {
     attribute at {text}?,
     attribute style {text}?,
     attribute size {text}?,
+    attribute coordinates {"cartesian"|"polar"}?,
+    attribute degrees {"yes"|"no"}?,
     LabelAttributes,
     FillAttributes,
     CommonAttributes,