Update examples to use CompatibilityAxes

Author: ksunden

examples/first.py

@@ -38,4 +38,5 @@
 ax.add_artist(lw2, 2)
 ax.set_xlim(0, np.pi * 4)
 ax.set_ylim(-1.1, 1.1)
+
 plt.show()

examples/mandelbrot.py

@@ -13,7 +13,8 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-from data_prototype.wrappers import ImageWrapper
+from data_prototype.artist import CompatibilityAxes
+from data_prototype.image import Image
 from data_prototype.containers import FuncContainer
 
 from matplotlib.colors import Normalize
@@ -36,19 +37,22 @@ def mandelbrot_set(X, Y, maxiter, *, horizon=3, power=2):
 fc = FuncContainer(
     {},
     xyfuncs={
-        "xextent": ((2,), lambda x, y: [x[0], x[-1]]),
-        "yextent": ((2,), lambda x, y: [y[0], y[-1]]),
+        "x": ((2,), lambda x, y: [x[0], x[-1]]),
+        "y": ((2,), lambda x, y: [y[0], y[-1]]),
         "image": (("N", "M"), lambda x, y: mandelbrot_set(x, y, maxiter)[1]),
     },
 )
 cmap = plt.get_cmap()
 cmap.set_under("w")
-im = ImageWrapper(fc, norm=Normalize(0, maxiter), cmap=cmap)
+im = Image(fc, norm=Normalize(0, maxiter), cmap=cmap)
 
-fig, ax = plt.subplots()
+fig, nax = plt.subplots()
+ax = CompatibilityAxes(nax)
+nax.add_artist(ax)
 ax.add_artist(im)
 ax.set_xlim(-1, 1)
 ax.set_ylim(-1, 1)
-ax.set_aspect("equal")
-fig.colorbar(im)
+
+nax.set_aspect("equal")  # No equivalent yet
+
 plt.show()

examples/units.py

@@ -7,14 +7,16 @@
 """
 
 import numpy as np
+from collections import defaultdict
 
 import matplotlib.pyplot as plt
 import matplotlib.markers as mmarkers
 
+from data_prototype.artist import CompatibilityAxes
 from data_prototype.containers import ArrayContainer
-from data_prototype.conversion_node import DelayedConversionNode
+from data_prototype.conversion_edge import FuncEdge
 
-from data_prototype.wrappers import PathCollectionWrapper
+from data_prototype.line import Line
 
 import pint
 
@@ -23,7 +25,11 @@
 
 marker_obj = mmarkers.MarkerStyle("o")
 
+
+coords = defaultdict(lambda: "auto")
+coords["x"] = coords["y"] = "units"
 cont = ArrayContainer(
+    coords,
     x=np.array([0, 1, 2]) * ureg.m,
     y=np.array([1, 4, 2]) * ureg.m,
     paths=np.array([marker_obj.get_path()]),
@@ -32,17 +38,17 @@
     facecolors=np.array(["C3"]),
 )
 
-fig, ax = plt.subplots()
+fig, nax = plt.subplots()
+ax = CompatibilityAxes(nax)
+nax.add_artist(ax)
 ax.set_xlim(-0.5, 7)
 ax.set_ylim(0, 5)
 
-# DelayedConversionNode is used to identify the keys which undergo unit transformations
-# The actual method which does conversions in this example is added by the
-# `Axis`/`Axes`, but `PathCollectionWrapper` does not natively interact with the units.
-xconv = DelayedConversionNode.from_keys(("x",), converter_key="xunits")
-yconv = DelayedConversionNode.from_keys(("y",), converter_key="yunits")
-lw = PathCollectionWrapper(cont, [xconv, yconv], offset_transform=ax.transData)
+xconv = FuncEdge.from_func("xconv", lambda x, xunits: x.to(xunits), "units", "data")
+yconv = FuncEdge.from_func("yconv", lambda y, yunits: y.to(yunits), "units", "data")
+lw = Line(cont, [xconv, yconv])
 ax.add_artist(lw)
-ax.xaxis.set_units(ureg.feet)
-ax.yaxis.set_units(ureg.m)
+nax.xaxis.set_units(ureg.feet)
+nax.yaxis.set_units(ureg.m)
+
 plt.show()