tikzplot42 0.3.7__tar.gz → 0.3.9__tar.gz

{tikzplot42-0.3.7 → tikzplot42-0.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tikzplot42
-Version: 0.3.7
+Version: 0.3.9
 Summary: TikzPlot to make TikZ/PGFPlots plots with matplotlib.pyplot-like syntax.
 Author-email: Zan Ambrozic <zan.ambrozic7@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{tikzplot42-0.3.7 → tikzplot42-0.3.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tikzplot42"
-version = "0.3.7"
+version = "0.3.9"
 description = "TikzPlot to make TikZ/PGFPlots plots with matplotlib.pyplot-like syntax."
 authors = [
     { name = "Zan Ambrozic", email = "zan.ambrozic7@gmail.com" }

{tikzplot42-0.3.7 → tikzplot42-0.3.9}/src/tikzplot/axes.py

@@ -258,13 +258,13 @@ class BaseAxes:
             kwargs["fmt"] = args[0]
         return self._plot(x,y,settings=settings, **kwargs)
     
-    def axvline(self, x, ymin=0, ymax=0, **kwargs):
+    def axvline(self, x, ymin=0, ymax=1, **kwargs):
         kws = {"fmt", "base", "alpha", "color", "c", "linestyle", "ls", "linewidth", "lw", "label"}
         kwargs = self._check_kwargs("axvline", kws, **kwargs)
         self._ext_ymin = self._ext_ymax = True
         self._plot(x, (ymin, ymax), settings="axvline", **kwargs)
 
-    def axhline(self, y, xmin=0, xmax=0, **kwargs):
+    def axhline(self, y, xmin=0, xmax=1, **kwargs):
         kws = {"fmt", "base", "alpha", "color", "c", "linestyle", "ls", "linewidth", "lw", "label"}
         kwargs = self._check_kwargs("axhline", kws, **kwargs)
         if isinstance(self, Secondary):
@@ -395,10 +395,15 @@ class BaseAxes:
                 for i in range(len(labs)):
                     self._elements[i]._set_label(tex_text(labs[i]))
 
-    def text(self, x, y, s, **kwargs):
+    def text(self, x, y, s, on_top=True, **kwargs):
         kws = {"alpha", "color", "c", "fontsize", "size", "backgroundcolor", "horizontalalignment", "ha", "verticalalignment", "va", "rotation", "label"}
         kwargs = self._check_kwargs("text", kws, **kwargs)
-        txt = Text(self, x, y, s, **kwargs)
+        if on_top:
+            coord = self._fig._next_coordinate_name()
+            txt = Text(self, x, y, coord, s, **kwargs)
+            self._fig._add_text(txt)
+        else:
+            txt = Text(self, x, y, None, s, **kwargs)
         self._elements.append(txt)
 
     def magnify(self, x_p, y_p, x_m, y_m, zoom, size, **kwargs):
@@ -584,7 +589,6 @@ class Axes(BaseAxes):
         #kws = {"fmt", "alpha", "color", "c", "linestyle", "ls", "linewidth", "lw", "marker", "markersize", "ms", "label"}
         #kwargs = self._check_kwargs("imshow", kws, **kwargs)
         self._imshow = (args, kwargs)
-        #self._axis_args.add("axis on top")
         self._axis_options["enlargelimits"] = "false"
         #self._fig._add_global("\\pgfplotsset{set layers}")
         data = args[0]
@@ -739,7 +743,7 @@ class Axes(BaseAxes):
             if TikzConfig.SCHOOL_AXIS:
                 axis_opt_str += f",\n set layers,\n axis line style={{on layer=axis foreground}}"
             else:
-                axis_opt_str += f",\n axis on top"
+                axis_opt_str += f",\n set layers=standard, cell picture=true, grid style={{on layer=axis grid}}"
         if self._ext_xmin or self._ext_xmax:
             lower = self._get_range("xmin")
             upper = self._get_range("xmax")

{tikzplot42-0.3.7 → tikzplot42-0.3.9}/src/tikzplot/config.py

@@ -29,7 +29,7 @@ class _TikzConfig:
 
         self.SHARED_AXIS_REL_MARGIN: float = 0.08
 
-        self.SAVE_DATAPOINTS: bool = True
+        self.SAVE_DATAPOINTS: bool = False
         self.DATAPOINTS_DIR: str = "datapoints"  # ignored if SAVE_DATAPOINTS == False
         self.UPDATE_DATA_ONLY: bool = False       # ignored if SAVE_DATAPOINTS == False
         self.UPDATE_STYLE_ONLY: bool = False      # ignored if SAVE_DATAPOINTS == False

{tikzplot42-0.3.7 → tikzplot42-0.3.9}/src/tikzplot/elements.py

@@ -138,8 +138,8 @@ class BaseGraph:
         if "alpha" in self._style:
             self._opacity = self._style["alpha"]
 
-        #if "onlayer" in self._style:
-        #    opts.append(f"on layer={self._style["onlayer"]}")
+        if "onlayer" in self._style:
+            opts.append(f"on layer={self._style['onlayer']}")
 
         if self._opacity < 1:
             opts.append(f"opacity={self._opacity}")

{tikzplot42-0.3.7 → tikzplot42-0.3.9}/src/tikzplot/figure.py

@@ -30,6 +30,10 @@ class Figure:
         self._globals = set()
         self._spies = []
 
+        self._num_coordinates = 0
+
+        self.texts = []
+
         self._lims = {"xmin": {}, "xmax": {}, "ymin": {}, "ymax": {}}
 
     def add_subplot(self, nrows=1, ncols=1, index=1, sharex=None, sharey=None, projection=None, polar=False):
@@ -301,6 +305,8 @@ class Figure:
         lines += lines2
         for spy in self._spies:
             lines.append(spy)
+        for text in self.texts:
+            lines.append(text._to_tex_fin())
         lines.append("\\end{tikzpicture}")
         for c in self._col_dict:
             r,g,b=self._col_dict[c]
@@ -340,3 +346,10 @@ class Figure:
 
     def _add_global(self, setting):
         self._globals.add(setting)
+
+    def _next_coordinate_name(self):
+        self._num_coordinates += 1
+        return f"(coordinate{self._num_coordinates})"
+    
+    def _add_text(self, text):
+        self.texts.append(text)

{tikzplot42-0.3.7 → tikzplot42-0.3.9}/src/tikzplot/texts.py

@@ -1,10 +1,11 @@
 from .colors import _tex_color
 
 class Text:
-    def __init__(self, ax, x, y, s, **kwargs):
+    def __init__(self, ax, x, y, coordinate, s, **kwargs):
         self._axes = ax
         self._x = x
         self._y = y
+        self._coordinate = coordinate
         self._s = s
         self._kwargs = kwargs
         self._color = False
@@ -78,10 +79,19 @@ class Text:
 
     def _to_tex(self, _):
         if self._visible:
-            return f"\\node[{self._style_string()}] at (axis cs:{self._x},{self._y}) {{{self._fsize or ''}{self._s}}};"
+            if self._coordinate is not None:
+                return f"\\coordinate {self._coordinate} at (axis cs:{self._x},{self._y});"
+            else:
+                return f"\\node[{self._style_string()}] at (axis cs:{self._x},{self._y}) {{{self._fsize or ''}{self._s}}};"
+
+        else:
+            return ""
+    def _to_tex_fin(self):
+        if self._visible:
+            if self._coordinate is not None:
+                return f"\\node[{self._style_string()}] at {self._coordinate} {{{self._fsize or ''}{self._s}}};"
         else:
             return ""
-    
     def _set_label(self, label):
         self._label = label
 

{tikzplot42-0.3.7 → tikzplot42-0.3.9}/src/tikzplot42.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tikzplot42
-Version: 0.3.7
+Version: 0.3.9
 Summary: TikzPlot to make TikZ/PGFPlots plots with matplotlib.pyplot-like syntax.
 Author-email: Zan Ambrozic <zan.ambrozic7@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{tikzplot42-0.3.7 → tikzplot42-0.3.9}/tests/test7.py

@@ -23,8 +23,10 @@ fig, axs = plt.subplots(3,2)
 # =========================
 ax = axs[0, 0]
 ax.plot(x, y, color="blue", lw=1.5, label="sin(x)")
+ax.text(1.5, 0.5, r"text $\alpha$", color="blue", ha="center", on_top=False, va="center", backgroundcolor="cyan", rotation=30)
 ax.plot(x, y2, ls="--", color="red", label="cos(x)")
-ax.text(1.5, 0.5, r"text $\alpha$", color="blue", ha="center", va="center", backgroundcolor="cyan", rotation=30)
+ax.text(1.5, -0.5, r"text $\beta$", color="teal", ha="center", va="center", rotation=-70)
+
 ax.grid()
 ax.legend(loc="upper right")
 # =========================