Set defaults in text

Author: ksunden

Diff for: data_prototype/text.py

@@ -1,19 +1,44 @@
 import numpy as np
 
+from matplotlib.font_manager import FontProperties
 
 from .artist import Artist
 from .description import Desc
-from .conversion_edge import Graph, CoordinateEdge
+from .conversion_edge import Graph, CoordinateEdge, DefaultEdge
 
 
 class Text(Artist):
     def __init__(self, container, edges=None, **kwargs):
         super().__init__(container, edges, **kwargs)
 
+        scalar = Desc((), "display")
+
         edges = [
             CoordinateEdge.from_coords(
                 "xycoords", {"x": Desc((), "auto"), "y": Desc((), "auto")}, "data"
             ),
+            CoordinateEdge.from_coords("text", {"text": Desc(())}, "display"),
+            CoordinateEdge.from_coords("color", {"color": Desc(())}, "display"),
+            CoordinateEdge.from_coords("alpha", {"alpha": Desc(())}, "display"),
+            CoordinateEdge.from_coords(
+                "fontproperties", {"fontproperties": Desc(())}, "display"
+            ),
+            CoordinateEdge.from_coords("usetex", {"usetex": Desc(())}, "display"),
+            CoordinateEdge.from_coords("rotation", {"rotation": Desc(())}, "display"),
+            CoordinateEdge.from_coords(
+                "antialiased", {"antialiased": Desc(())}, "display"
+            ),
+            DefaultEdge.from_default_value("text_def", "text", scalar, ""),
+            DefaultEdge.from_default_value("color_def", "color", scalar, "k"),
+            DefaultEdge.from_default_value("alpha_def", "alpha", scalar, 1),
+            DefaultEdge.from_default_value(
+                "fontproperties_def", "fontproperties", scalar, FontProperties()
+            ),
+            DefaultEdge.from_default_value("usetex_def", "usetex", scalar, False),
+            DefaultEdge.from_default_value("rotation_def", "rotation", scalar, 0),
+            DefaultEdge.from_default_value(
+                "antialiased_def", "antialiased", scalar, False
+            ),
         ]
 
         self._graph = self._graph + Graph(edges)
@@ -28,7 +53,7 @@ def draw(self, renderer, graph: Graph) -> None:
                 "x": Desc((), "display"),
                 "y": Desc((), "display"),
                 "text": Desc((), "display"),
-                "color": Desc((4,), "rgba"),
+                "color": Desc((), "display"),
                 "alpha": Desc((), "display"),
                 "fontproperties": Desc((), "display"),
                 "usetex": Desc((), "display"),
@@ -53,6 +78,10 @@ def draw(self, renderer, graph: Graph) -> None:
         x = evald["x"]
         y = evald["y"]
 
+        _, canvash = renderer.get_canvas_width_height()
+        if renderer.flipy():
+            y = canvash - y
+
         if not np.isfinite(x) or not np.isfinite(y):
             # TODO: log?
             return

Diff for: examples/animation.py

@@ -16,7 +16,6 @@
 
 import matplotlib.pyplot as plt
 from matplotlib.animation import FuncAnimation
-from matplotlib.font_manager import FontProperties
 
 from data_prototype.conversion_edge import Graph
 from data_prototype.description import Desc
@@ -39,12 +38,6 @@ def describe(self):
             "y": Desc((self.N,)),
             "phase": Desc(()),
             "time": Desc(()),
-            "rotation": Desc((), "display"),
-            "alpha": Desc((), "display"),
-            "color": Desc((4,), "rgba"),
-            "usetex": Desc((), "display"),
-            "antialiased": Desc((), "display"),
-            "fontproperties": Desc((), "display"),
         }
 
     def query(
@@ -62,12 +55,6 @@ def query(
             "y": np.sin(th + phase),
             "phase": phase,
             "time": cur_time,
-            "rotation": 0,
-            "alpha": 1,
-            "color": np.array([0, 0, 0, 1]),
-            "usetex": False,
-            "antialiased": True,
-            "fontproperties": FontProperties(),
         }, hash(cur_time)
 
 
@@ -88,7 +75,7 @@ def update(frame, art):
         ),
     ],
     x=2 * np.pi,
-    y=0,
+    y=1,
     ha="right",
 )
 fig, nax = plt.subplots()

Diff for: examples/mapped.py

@@ -11,7 +11,6 @@
 import numpy as np
 
 from matplotlib.colors import Normalize
-from matplotlib.font_manager import FontProperties
 
 from data_prototype.artist import CompatibilityAxes
 from data_prototype.line import Line
@@ -68,12 +67,6 @@
         {},
         {"x": Desc((), "data")},
     ),
-    FuncEdge.from_func(
-        "color",
-        lambda: (0, 0, 0, 1),
-        {},
-        {"color": Desc((4,), "rgba")},
-    ),
 ]
 
 
@@ -108,11 +101,6 @@
             x=2 * np.pi,
             # ha="right",
             # bbox={"facecolor": "gray", "alpha": 0.5},
-            antialiased=False,
-            fontproperties=FontProperties(),
-            rotation=0,
-            alpha=1,
-            usetex=False,
         )
     )
 ax.set_xlim(0, np.pi * 2)