tikzplot42 0.3.8__tar.gz → 0.4.3__tar.gz

{tikzplot42-0.3.8 → tikzplot42-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tikzplot42
-Version: 0.3.8
+Version: 0.4.3
 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
@@ -765,6 +765,8 @@ If axes and plot have different name for command with same effect, both are impl
 - `ax.twinx()`,
 - `ax.set()`.
 
+There is a limited support for built-in styles (e.g. `plt.style.use("default")`), you may also define your own style using `plt.style.set_profile()`. Currently supported features are: color cycle (hex colors sequence), line width (in pt), grid (with matplotlib kwargs), background (latex style key=value), additional settings (raw latex code for optional arguments to axis: key=value).
+
 #### Supported common **kwargs
 - `color/c` (all matplotlib formats, except color schemes which are not yet implemented),
 - `linestyle/ls`,
@@ -788,6 +790,6 @@ For plot configurations (default sizes, paddings, etc.), use `from tikzplot impo
 Currently supported parameters are listed with their default values in `src/tikzplot/config.py`.
 
 ## More features coming soon...
-- basic color schemes,
+- more developed styles,
 - improved 3D plots (currently only basic support: plot, errorbar, fill_between, scatter, plot_wireframe, plot_surface),
 - ... 

{tikzplot42-0.3.8 → tikzplot42-0.4.3}/README.md

@@ -63,6 +63,8 @@ If axes and plot have different name for command with same effect, both are impl
 - `ax.twinx()`,
 - `ax.set()`.
 
+There is a limited support for built-in styles (e.g. `plt.style.use("default")`), you may also define your own style using `plt.style.set_profile()`. Currently supported features are: color cycle (hex colors sequence), line width (in pt), grid (with matplotlib kwargs), background (latex style key=value), additional settings (raw latex code for optional arguments to axis: key=value).
+
 #### Supported common **kwargs
 - `color/c` (all matplotlib formats, except color schemes which are not yet implemented),
 - `linestyle/ls`,
@@ -86,6 +88,6 @@ For plot configurations (default sizes, paddings, etc.), use `from tikzplot impo
 Currently supported parameters are listed with their default values in `src/tikzplot/config.py`.
 
 ## More features coming soon...
-- basic color schemes,
+- more developed styles,
 - improved 3D plots (currently only basic support: plot, errorbar, fill_between, scatter, plot_wireframe, plot_surface),
 - ... 

{tikzplot42-0.3.8 → tikzplot42-0.4.3}/pyproject.toml

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

{tikzplot42-0.3.8 → tikzplot42-0.4.3}/src/tikzplot/axes.py

@@ -21,15 +21,15 @@ class BaseAxes:
         else:
             self._axis_args.add(f"/pgf/number format/.cd, 1000 sep={{{TikzConfig.THOUSANDS_SEP}}}")
 
-        self._add_legend = ""
+        self._add_legend = []
         self._coordinates = {}
         self._cmap_bar = None
 
         self._ext_ymin = False
         self._ext_ymax = False
 
-    def _plot(self, x, y, settings=None, xerr=None, yerr=None, **style):
-        if not isinstance(self, Secondary) and self._polar:
+    def _plot(self, x, y, settings=[], xerr=None, yerr=None, **style):
+        if isinstance(self, Axes) and self._polar:
             x = _np.rad2deg(x)
         e = Graph(self, (x, y), settings, xerr=xerr, yerr=yerr, **style)
         if TikzConfig.USE_GROUPPLOTS and ("axvspan" == settings or "axhspan" == settings):
@@ -71,6 +71,7 @@ class BaseAxes:
 
         try:
             c = kwargs.get("c", kwargs.get("color", None))
+            if c is None: raise ValueError("No color specified")
             if len(c) == len(x):
                 if isinstance(c[0], (int, float)):
                     if "cmap" not in kwargs:
@@ -118,9 +119,8 @@ class BaseAxes:
             x = range(len(y))
         elif len(args) == 2:
             x,y=args
-        elif len(args) == 3:
-            x,y,fmt=args
-            kwargs["fmt"]=fmt
+        else:
+            raise Warning("Invalid number of args for stem.")
         if "orientation" in kwargs:
             o = kwargs.pop("orientation")
             if o == "horizontal":
@@ -139,6 +139,7 @@ class BaseAxes:
                     return el._try_set_pname(pname)
                 else:
                     return None
+        assert self._fig is not None
         name1 = self._fig._get_free_path_name()
         name2 = self._fig._get_free_path_name()
         if isinstance(y1, (int, float)):
@@ -165,7 +166,7 @@ class BaseAxes:
                 self._plot(xs,ys,path_name=name2, alpha=0)
             else:
                 name2 = inst
-        e = Graph(self, f"fill between [of={name1} and {name2}]",settings=None, xerr=None, yerr=None, **kwargs)
+        e = Graph(self, f"fill between [of={name1} and {name2}]",settings=[], xerr=None, yerr=None, **kwargs)
         self._elements.append(e)
         return e
         
@@ -224,9 +225,6 @@ class BaseAxes:
             datasets = [x]
         all_data = _np.concatenate(datasets)
         edges = _np.histogram_bin_edges(all_data, bins=bins)
-        for data in datasets:
-            counts, _ = _np.histogram(data, edges, density=density)
-            centers = (edges[:-1] + edges[1:]) / 2
         widths = edges[1:] - edges[:-1]
         settings = []
         if "orientation" in kwargs and kwargs["orientation"] == "horizontal":
@@ -241,12 +239,18 @@ class BaseAxes:
         if "range" in kwargs:
             if settings[0] == "xbar":
                 self.set_ylim(kwargs["range"])
-            else:
+            elif isinstance(self, Axes):
                 self.set_xlim(kwargs["range"])
-        if "cumulative" in kwargs and kwargs["cumulative"]:
-            counts = _np.cumsum(counts)
-
-        return self._plot(centers, counts, settings=settings, **kwargs)
+            elif  isinstance(self, Secondary):
+                self._primary.set_xlim(kwargs["range"])
+        outputs = []
+        for data in datasets:
+            counts, _ = _np.histogram(data, edges, density=density)
+            centers = (edges[:-1] + edges[1:]) / 2
+            if "cumulative" in kwargs and kwargs["cumulative"]:
+                counts = _np.cumsum(counts)
+            outputs.append(self._plot(centers, counts, settings=settings, **kwargs))
+        return outputs
     
     def step(self, x, y, *args, **kwargs):
         kws = {"fmt", "alpha", "color", "c", "linestyle", "ls", "linewidth", "lw", "marker", "markersize", "ms", "label", "where"}
@@ -358,7 +362,8 @@ class BaseAxes:
                 try:
                     lx,ly=float(loc[0]), float(loc[1])
                     posit = "south west"
-                except: print(f"Error parsing legend location: {loc}")
+                except: 
+                    print(f"Error parsing legend location: {loc}")
             else:
                 if isinstance(loc, int):
                     loc = self._LEGEND_LOC_MAP[loc]
@@ -379,9 +384,12 @@ class BaseAxes:
             legend_string = []
             if lx is not None and ly is not None:
                 legend_string.append(r"at={(" + f"{lx},{ly}" + r")}")
-            if len(posit):
+            if posit is not None and len(posit):
                 legend_string.append(r"anchor=" + posit)
-            self._axis_options["legend style"] = f"{{{','.join(legend_string)}}}"
+            if "legend style" in self._axis_options:
+                self._axis_options["legend style"] = self._axis_options["legend style"].rstrip("}") + f" ,{','.join(legend_string)}}}"
+            else:
+                self._axis_options["legend style"] = f"{{{','.join(legend_string)}}}"
         self._legend_on = True
         if "ncols" in kwargs:
             self._axis_options["legend columns"] = kwargs["ncols"]
@@ -395,10 +403,12 @@ class BaseAxes:
                 for i in range(len(labs)):
                     self._elements[i]._set_label(tex_text(labs[i]))
 
-    def text(self, x, y, s, on_top=True, **kwargs):
-        kws = {"alpha", "color", "c", "fontsize", "size", "backgroundcolor", "horizontalalignment", "ha", "verticalalignment", "va", "rotation", "label"}
+    def text(self, x, y, s, **kwargs):
+        kws = {"alpha", "color", "c", "fontsize", "on_top", "size", "backgroundcolor", "horizontalalignment", "ha", "verticalalignment", "va", "rotation", "label"}
         kwargs = self._check_kwargs("text", kws, **kwargs)
+        on_top = kwargs.pop("on_top", True)
         if on_top:
+            assert self._fig is not None
             coord = self._fig._next_coordinate_name()
             txt = Text(self, x, y, coord, s, **kwargs)
             self._fig._add_text(txt)
@@ -409,12 +419,13 @@ class BaseAxes:
     def magnify(self, x_p, y_p, x_m, y_m, zoom, size, **kwargs):
         kws = {"shape", "connect"}
         kwargs = self._check_kwargs("magnify", kws, **kwargs)
+        assert self._fig is not None
         n = self._fig._add_spy(zoom, size, **kwargs)
         self._coordinates.update({f"spypoint{n}": (x_p,y_p)})
         self._coordinates.update({f"spyviewr{n}": (x_m,y_m)})
 
     def _add_legend_entries(self):
-        if self._add_legend == "": return ""
+        if self._add_legend == []: return ""
         axs, labs = self._add_legend
         output = ""
         if len(axs) != len(labs):
@@ -499,6 +510,7 @@ class BaseAxes:
             e._reduce_points(limit)
 
     def _add_col(self, r,g,b):
+        assert self._fig is not None
         self._fig._add_col(r,g,b)
 
     def set(self, **kwargs):
@@ -521,6 +533,7 @@ class Axes(BaseAxes):
         self._col = self._index - self._row * self._ncols
 
         self._fig = fig
+        self._style = self._fig._style
         self._imshow = None
 
         self._defcol_counter = 0
@@ -559,6 +572,18 @@ class Axes(BaseAxes):
 
         self._xticks = True
 
+        self._style_defaults()
+
+    def _style_defaults(self):
+        _gs = self._style._get_grid_cycle()
+        if _gs is not None:
+            self.grid(**_gs)
+        _bcgnd = self._style._get_background_cycle()
+        if _bcgnd is not None:
+            self._axis_options["axis background/.style"] = f"{{{_bcgnd}}}"
+        _add_settgs = self._style._get_additional_settings()
+        if _add_settgs is not None:
+            self._axis_options = _add_settgs | self._axis_options
 
     def _update_size(self):
         if self._fig._get_width():
@@ -589,7 +614,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]
@@ -630,7 +654,7 @@ class Axes(BaseAxes):
         if kwargs:
             accepted_kwargs = {"color", "c", "linestyle", "ls", "linewidth", "lw", "alpha"}
             kwargs = self._check_kwargs("grid", accepted_kwargs, **kwargs)
-            g = Graph(self, None, None, None, None, **kwargs)._style_string()
+            g = Graph(self, None, [], None, None, **kwargs)._style_string()
             self._axis_options[f"{selector}grid style"] = f"{{{g}}}"
             
     def set_minorticks_num(self, num):
@@ -730,7 +754,7 @@ class Axes(BaseAxes):
             if "extent" in self._imshow[1]:
                 bounds = self._imshow[1]["extent"]
             xm, xM, ym, yM = bounds
-            self._elements.insert(0, Graph(self, f"graphics [xmin={xm}, xmax={xM}, ymin={ym}, ymax={yM}] {{{im_name}}}",settings=None, xerr=None, yerr=None, onlayer="axis background"))
+            self._elements.insert(0, Graph(self, f"graphics [xmin={xm}, xmax={xM}, ymin={ym}, ymax={yM}] {{{im_name}}}",settings=[], xerr=None, yerr=None, onlayer="axis background"))
         axis_opt_str = ""
         if self._axis_args:
             axis_opt_str += ",\n".join(self._axis_args)
@@ -744,7 +768,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")
@@ -848,6 +872,13 @@ class Secondary(BaseAxes):
         self._axis_options["y label style"] = r"{at={(" + str(TikzConfig.SEC_YLABEL_LOC[0]) + "," + str(TikzConfig.SEC_YLABEL_LOC[1]) + ")}, rotate=180}"
 
         self._fig = primary._fig
+        self._style = self._fig._style
+        self._style_defaults()
+
+    def _style_defaults(self):
+        _add_settgs = self._style._get_additional_settings()
+        if _add_settgs is not None:
+            self._axis_options = _add_settgs | self._axis_options
 
     def _axis_option_string(self):
         if self._primary._width:

{tikzplot42-0.3.8 → tikzplot42-0.4.3}/src/tikzplot/axes.pyi

@@ -1,9 +1,10 @@
 from typing import Any, Optional, Sequence, Tuple, Union, Literal
 import numpy as np
+from pyrsistent import T
 from .colorbar import Colorbar
 
 ArrayLike = Union[Sequence[float], np.ndarray]
-ColorLike = Union[str, Sequence[float]]
+ColorLike = Union[str, Sequence[float], Sequence[Sequence[float] | ArrayLike], np.ndarray, None]
 LineStyle = Literal["-", "--", "-.", ":", "solid", "dashed", "dashdot", "none", ""]
 MarkerStyle = Literal["o", "s", "^", "v", "x", "+", ".", "*", "None", ""]
 FontSize = Literal["xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large"]
@@ -48,7 +49,7 @@ class BaseAxes:
         ...
 
     def scatter(self, x: ArrayLike = ..., y: ArrayLike = ..., fmt: Optional[str] = ..., *,alpha: Optional[float] = ..., color: Optional[Union[Sequence[ColorLike], ColorLike]] = ..., c: Optional[ColorLike] = ...,
-             marker: Optional[MarkerStyle] = ..., markersize: Optional[Union[Sequence[float], float]] = ..., s: Optional[Union[Sequence[float], float]] = ...,  label:Optional[str]=..., cmap: Optional[Union[str, Colorbar]], vmin: Optional[float] = ..., vmax: Optional[float] = ...) -> None:
+             marker: Optional[MarkerStyle] = ..., markersize: Optional[Union[ArrayLike, float]] = ..., s: Optional[Union[ArrayLike, float]] = ...,  label:Optional[str]=..., cmap: Optional[Union[str, Colorbar]], vmin: Optional[float] = ..., vmax: Optional[float] = ...) -> None:
         """
         Draw a scatter plot to the selected axis.
         
@@ -212,7 +213,7 @@ class BaseAxes:
         """
         ...
 
-    def text(self, x: float, y: float, s: str, color: Optional[ColorLike] = ..., c: Optional[ColorLike] = ..., fontsize: Optional[FontSize] = ..., size: Optional[FontSize] = ..., backgroundcolor: Optional[ColorLike] = ..., horizontalalignment: Optional[str] = ..., ha: Optional[str] = ..., verticalalignment: Optional[str] = ..., va: Optional[str] = ..., rotation: Optional[Union[float, str]] = ..., label: Optional[str] = ...) -> None:
+    def text(self, x: float, y: float, s: str, color: Optional[ColorLike] = ..., c: Optional[ColorLike] = ..., fontsize: Optional[FontSize] = ..., on_top: bool = ..., size: Optional[FontSize] = ..., backgroundcolor: Optional[ColorLike] = ..., horizontalalignment: Optional[str] = ..., ha: Optional[str] = ..., verticalalignment: Optional[str] = ..., va: Optional[str] = ..., rotation: Optional[Union[float, str]] = ..., label: Optional[str] = ...) -> None:
         """
         Add text to the selected axis.
 
@@ -230,6 +231,9 @@ class BaseAxes:
         fontsize or size: FontSize, optional
             Font size
 
+        on_top: bool, optional
+            Draw text on top of other elements (True by default)
+
         backgroundcolor: all matplotlib color formats (without X11/xkcd), optional
             Background color of text box: RGB/RGBA (tuple), HEX (str), grayscale (float), single-char (str), name (str), default cycle ("CX", X int), none for invisible
 
@@ -248,9 +252,9 @@ class BaseAxes:
         ...
     def hlines(
         self,
-        y: Union[float, Sequence[float]],
-        xmin: Union[float, Sequence[float]],
-        xmax: Union[float, Sequence[float]],
+        y: Union[float, ArrayLike],
+        xmin: Union[float, ArrayLike],
+        xmax: Union[float, ArrayLike],
         colors: Union[str, Sequence[str]] = "k",
         linestyles: Union[str, Sequence[str]] = "solid",
     ) -> None: 
@@ -260,9 +264,9 @@ class BaseAxes:
         ...
     def vlines(
         self,
-        x: Union[float, Sequence[float]],
-        ymin: Union[float, Sequence[float]],
-        ymax: Union[float, Sequence[float]],
+        x: Union[float, ArrayLike],
+        ymin: Union[float, ArrayLike],
+        ymax: Union[float, ArrayLike],
         colors: Union[str, Sequence[str]] = "k",
         linestyles: Union[str, Sequence[str]] = "solid",
     ) -> None: 
@@ -468,7 +472,7 @@ class BaseAxes:
         Set y-axis scale (to log).
         """
         ...
-    def set_yticks(self, ticks: Sequence[float], labels: Optional[Sequence[str]] = ...) -> None: 
+    def set_yticks(self, ticks: ArrayLike, labels: Optional[Sequence[str]] = ...) -> None: 
         """
         Set y-axis ticks and their labels.
         """
@@ -499,9 +503,17 @@ class BaseAxes:
         Set parameter (lims, labels, ticks, ticklabels, title)
         """
         ...
+    def _add_legend_entries(self) -> str: ...
+    def _content_tex(self, filename: str) -> str: ...
+    def _get_hard_range(self, which: Literal["xmin","xmax","ymin","ymax"]) -> Tuple[float,str]: ...
+    def _get_range(self, which: Literal["xmin","xmax","ymin","ymax"]) -> Tuple[float, bool,str]: ...
+    def _get_limit(self, which: Literal["xmin","xmax","ymin","ymax"]) -> Tuple[float,bool,str]: ...
+    def _set_range(self, which: Literal["xmin","xmax","ymin","ymax"], value: Union[float, int]): ...
+    def _num_points(self) -> list[int]: ...
+    # def _add_color(self, ?) -> None: ...
     
 class Axes(BaseAxes):
-    def __init__(self, nrows: int, ncols: int, index: int, fig: Any) -> None: ...
+    def __init__(self, nrows: int, ncols: int, index: int, fig: Any, pol: bool) -> None: ...
     def loglog(self, x: ArrayLike = ..., y: ArrayLike = ..., base: Optional[float] = 10,  fmt: Optional[str] = ...,*, alpha: Optional[float] = ..., color: Optional[ColorLike] = ..., c: Optional[ColorLike] = ...,
              linestyle: Optional[LineStyle] = ..., ls: Optional[LineStyle] = ..., linewidth: Optional[float]= ..., lw: Optional[float] = ...,
              marker: Optional[MarkerStyle] = ..., markersize: Optional[float] = ..., ms: Optional[float] = ...) -> None:
@@ -580,7 +592,7 @@ class Axes(BaseAxes):
             Mark size in pt
         """
         ...
-    def imshow(self, *args: Any, cmap: Optional[str] = ...) -> Tuple[Any, str, float, float]: 
+    def imshow(self, *args: Any, cmap: Optional[str] = ..., **kwargs: Any) -> Tuple[Any, str, float, float]: 
         """
         Draw image to the selected axis from array. Uses matplotlib imshow() to export to PDF, then inputs the image to the axis. Return may be used to initialize Colorbar().
         """
@@ -636,14 +648,14 @@ class Axes(BaseAxes):
         Set x-axis scale (to log).
         """
         ...
-    def set_xticks(self, ticks: Sequence[float], labels: Optional[Sequence[str]] = ...) -> None: 
+    def set_xticks(self, ticks: ArrayLike, labels: Optional[Sequence[str]] = ...) -> None: 
         """
         Set x-axis ticks and their labels.
         """
         ...
     def set_xticklabels(self, labels: Sequence[str]) -> None: 
         """
-        Set y-axis tick labels.
+        Set x-axis tick labels.
         """
         ...
     def twinx(self) -> "Secondary": 
@@ -651,6 +663,22 @@ class Axes(BaseAxes):
         Initialize secondary y-axis.
         """
         ...
+    def _export_imshow(self, *args: Any, **kwargs: Any) -> str: ...
+    def _axis_options_string(self) -> str: ...
+    def _margins(self) -> tuple[float, float, float, float]: ...
+    def _get_row(self) -> int: ...
+    def _get_col(self) -> int: ...
+    def _get_nrows(self) -> int: ...
+    def _get_ncols(self) -> int: ...
+    def _get_defcol(self) -> int: ...
+    def _show_colorbar(self, cbar: str, horizontal: bool = ...) -> None: ...
+    def _get_index(self) -> int: ...
+    def _to_tex(self, filename: str, single: bool) -> tuple[list[str], list[str]]: ...
+
     
 class Secondary(BaseAxes):
-    def __init__(self, primary: Axes) -> None: ...
+    def __init__(self, primary: Axes) -> None: ...
+    def _axis_options_string(self) -> str: ...
+    def _padding(self) -> float: ...
+    def _get_defcol(self) -> int: ...
+    def _get_index(self) -> int: ...

{tikzplot42-0.3.8 → tikzplot42-0.4.3}/src/tikzplot/axes3d.py

@@ -19,7 +19,7 @@ class Axes3:
         if TikzConfig.USE_DECIMAL_COMMA:
             self._axis_args.add("/pgf/number format/use comma")
 
-        self._add_legend = ""
+        self._add_legend = []
 
         self._left = False
         self._neigh = None
@@ -31,7 +31,8 @@ class Axes3:
         self._col = self._index - self._row * self._ncols
 
         self._fig = fig
-
+        self._style = self._fig._style
+        
         self._defcol_counter = 0
         self._colorbar = ""
         self._cbar_h = False
@@ -60,7 +61,20 @@ class Axes3:
         if self._fig._get_height():
             self._height = f"{self._fig._get_height() / nrows}cm"
 
-    def _plot(self, xs, ys, zs, zdir="z", settings=None, xerr=None, yerr=None, zerr=None, **style):
+        self._style_defaults()
+
+    def _style_defaults(self):
+        _gs = self._style._get_grid_cycle()
+        if _gs is not None:
+            self.grid(**_gs)
+        _bcgnd = self._style._get_background_cycle()
+        if _bcgnd is not None:
+            self._axis_options["axis background/.style"] = f"{{{_bcgnd}}}"
+        _add_settgs = self._style._get_additional_settings()
+        if _add_settgs is not None:
+            self._axis_options = _add_settgs | self._axis_options
+
+    def _plot(self, xs, ys, zs, zdir="z", settings=[], xerr=None, yerr=None, zerr=None, **style):
         if isinstance(zs, (float,int)):
             zs = [zs] * len(xs)
         if zdir == "y":
@@ -126,6 +140,7 @@ class Axes3:
                 if el._check_equal(xs,ys,zs):
                     return el._try_set_pname(pname)
             return None
+        assert self._fig is not None
         name1 = self._fig._get_free_path_name()
         name2 = self._fig._get_free_path_name()
         if isinstance(y1, (int, float)):
@@ -156,7 +171,7 @@ class Axes3:
                 self._plot(xs,ys,path_name=name2, alpha=0)
             else:
                 name2 = inst"""
-        e = Graph3(self, f"fill between [of={name1} and {name2}]",settings=None, xerr=None, yerr=None, zerr=None, **kwargs)
+        e = Graph3(self, f"fill between [of={name1} and {name2}]",settings=[], xerr=None, yerr=None, zerr=None, **kwargs)
         self._elements.append(e)
         return e
 
@@ -395,7 +410,7 @@ class Axes3:
             legend_string = []
             if lx is not None and ly is not None:
                 legend_string.append(r"at={(" + f"{lx},{ly}" + r")}")
-            if len(posit):
+            if posit is not None and len(posit):
                 legend_string.append(r"anchor=" + posit)
             else: print(posit)
             self._axis_options["legend style"] = f"{{{','.join(legend_string)}}}"
@@ -423,7 +438,7 @@ class Axes3:
         self._axis_options["rotate around z"] = f"{{{roll}}}" 
 
     def _add_legend_entries(self):
-        if self._add_legend == "": return ""
+        if self._add_legend == []: return ""
         axs, labs = self._add_legend
         output = ""
         if len(axs) != len(labs):
@@ -481,9 +496,11 @@ class Axes3:
             e._reduce_points(limit, logx, logy)
 
     def _add_col(self, r,g,b):
+        assert self._fig is not None
         self._fig._add_col(r,g,b)
 
     def _update_size(self):
+        assert self._fig is not None
         if self._fig._get_width():
             self._width= f"{self._fig._get_width() / self._ncols}cm"
         if self._fig._get_height():
@@ -512,6 +529,7 @@ class Axes3:
         if self._height:
             self._axis_options["height"] = self._height
         if not TikzConfig.USE_GROUPPLOTS:
+            assert self._fig is not None
             if self._left:
                 self._axis_options["yshift"] = f"-{self._fig._get_spacing(self._row, self._col)}cm"
             else:

tikzplot42-0.4.3/src/tikzplot/axes3d.pyi

@@ -0,0 +1,43 @@
+from __future__ import annotations
+
+from typing import Any, Optional, Union, Sequence
+
+import numpy as np
+
+from .colorbar import Colorbar
+
+ArrayLike = np.ndarray | list[float] | tuple[float, ...]
+ColorLike = Union[str, Sequence[float], Sequence[Sequence[float] | ArrayLike], np.ndarray, None]
+LineStyle = str
+MarkerStyle = str
+
+
+class Axes3:
+    def __init__(self, nrows: int, ncols: int, index: int, fig: Any) -> None: ...
+    def plot(self, xs: Union[ArrayLike, float, int], ys: Union[ArrayLike, float, int], zs: Union[ArrayLike, float, int], zdir: str = ..., **kwargs: Any) -> Any: ...
+    def scatter(self, xs: Union[ArrayLike, float, int], ys: Union[ArrayLike, float, int], zs: Union[ArrayLike, float, int] = ..., zdir: str = ..., *args: Any, **kwargs: Any) -> Any: ...
+    def plot_surface(self, X: np.ndarray, Y: np.ndarray, Z: np.ndarray, **kwargs: Any) -> Any: ...
+    def plot_wireframe(self, X: np.ndarray, Y: np.ndarray, Z: np.ndarray, **kwargs: Any) -> Any: ...
+    def errorbar(self, x: Union[ArrayLike, float, int], y: Union[ArrayLike, float, int], z: Union[ArrayLike, float, int], zerr: Optional[Union[ArrayLike, float, int] | float] = ..., yerr: Optional[Union[ArrayLike, float, int] | float] = ..., xerr: Optional[Union[ArrayLike, float, int] | float] = ..., **kwargs: Any) -> Any: ...
+    def fill_between(self, x1: Union[ArrayLike, float, int], y1: Union[ArrayLike, float, int], z1: Union[ArrayLike, float, int], x2: Union[ArrayLike, float, int], y2: Union[ArrayLike, float, int], z2: Union[ArrayLike, float, int], *, alpha: Optional[float] = ..., color: Optional[ColorLike] = ..., c: Optional[ColorLike] = ..., label: Optional[str] = ...) -> Any: ...
+    def text(self, x: float, y: float, z: float, s: str, **kwargs: Any) -> None: ...
+    def set_title(self, title: str) -> None: ...
+    def set_xlabel(self, label: str) -> None: ...
+    def set_ylabel(self, label: str) -> None: ...
+    def set_zlabel(self, label: str) -> None: ...
+    def set_xlim(self, *args: Any, **kwargs: Any) -> None: ...
+    def set_ylim(self, *args: Any, **kwargs: Any) -> None: ...
+    def set_zlim(self, *args: Any, **kwargs: Any) -> None: ...
+    def set_xscale(self, *args: Any, **kwargs: Any) -> None: ...
+    def set_yscale(self, *args: Any, **kwargs: Any) -> None: ...
+    def set_zscale(self, *args: Any, **kwargs: Any) -> None: ...
+    def set_xticks(self, ticks: Any, labels: Any = ...) -> None: ...
+    def set_yticks(self, ticks: Any, labels: Any = ...) -> None: ...
+    def set_zticks(self, ticks: Any, labels: Any = ...) -> None: ...
+    def set_xticklabels(self, labels: Any) -> None: ...
+    def set_yticklabels(self, labels: Any) -> None: ...
+    def set_zticklabels(self, labels: Any) -> None: ...
+    def legend(self, *args: Any, **kwargs: Any) -> None: ...
+    def view_init(self, elev: Optional[float] = ..., azim: Optional[float] = ..., roll: Optional[float] = ...) -> None: ...
+    def grid(self, visible: bool = ..., which: str = ...) -> None: ...
+    def set(self, **kwargs: Any) -> None: ...

{tikzplot42-0.3.8 → tikzplot42-0.4.3}/src/tikzplot/colorbar.py

@@ -1,4 +1,6 @@
 import numpy as _np
+
+from tikzplot.styles import Styles
 from .elements import Graph
 from .axes3d import Axes3
 from .config import TikzConfig
@@ -44,6 +46,9 @@ class _Colorbar:
             self._divs = kwargs["divisions"]
         if self._axis:
             self._axis._show_colorbar(str(self))
+        
+        if self._cmap is None:
+            self._cmap = "viridis"
 
     _discrete = {'Pastel1':9, 'Pastel2':8, 'Paired':12, 'Accent':8, 'Dark2':8, 'Set1': 9, 'Set2':8, 'Set3':12, 'tab10':10, 'tab20':20, 'tab20b':20, 'tab20c':20}
     _dictionary = {
@@ -186,11 +191,15 @@ class _Colorbar:
         return "\n".join(output)
     
     def __str__(self):
+        assert self._axis is not None
         tridim = isinstance(self._axis, Axes3)
         lines = []
         lines.append(f"colormap={self._generate_tex_colormap(self._cmap)},")
         lines.append(f"colorbar{' horizontal' if self._horizontal else ''},")
         lines.append(r"colorbar style={")
+        if hasattr(self._axis._fig, "_style"):
+            _st_settings = self._axis._fig._style._get_colorbar_settings()
+        else: _st_settings = {}
         if TikzConfig.USE_DECIMAL_COMMA:
             lines.append("/pgf/number format/use comma,")
         if self._horizontal:
@@ -208,10 +217,13 @@ class _Colorbar:
         if self._label:
             lines.append(f"title={{{self._label}}},")
             offset = 4 - 2 * (self._ticks == [] or self._tick_labels == [])
+            _add_color = ""
+            if _st_settings and "text" in _st_settings:
+                _add_color = f", text={_st_settings['text']}"
             if self._horizontal:
-                lines.append(f"title style={{at={{(0.5, -{offset})}}, anchor=base}},")
+                lines.append(f"title style={{at={{(0.5, -{offset})}}, anchor=base{_add_color}}}, ")
             else:
-                lines.append(f"title style={{at={{({offset},0.5)}}, anchor=base, yshift=-7pt, rotate=-90}},")
+                lines.append(f"title style={{at={{({offset},0.5)}}, anchor=base, yshift=-7pt, rotate=-90{_add_color}}},")
         if self._ticks is not None:
             lines.append(f"{'x' if self._horizontal else 'y'}tick={{{','.join(str(a) for a in self._ticks)}}},")
             if self._tick_labels and len(self._tick_labels) == len(self._ticks):

{tikzplot42-0.3.8 → tikzplot42-0.4.3}/src/tikzplot/colorbar.pyi

@@ -20,22 +20,22 @@ class Colorbar:
     where `im` is a tuple describing an image:
         (axis, cmap, lower, upper)
     """
-
+    _cmap: Any
     def __init__(
         self,
-        im: Optional[Tuple[Axes, str, float, float]] = ...,
+        im: Optional[Tuple[Axes, str, float, float]] = None,
         *,
-        axis: Optional[Axes | Axes3] = ...,
-        cmap: Optional[str] = ...,
-        lower: Optional[float] = ...,
-        upper: Optional[float] = ...,
-        ticks: Optional[Sequence[ float]] = ...,
-        tick_labels: Optional[Sequence[str | float]] = ...,
-        label: Optional[str] = ...,
-        width: Optional[float] = ...,
-        horizontal: Optional[bool] = ...,
-        rel_len: Optional[float] = ...,
-        divisions: Optional[int] = ...
+        axis: Optional[Axes | Axes3] = None,
+        cmap: Optional[str] = "viridis",
+        lower: Optional[float] = 0,
+        upper: Optional[float] = 1,
+        ticks: Optional[Sequence[ float]] = None,
+        tick_labels: Optional[Sequence[str | float]] = None,
+        label: Optional[str] = None,
+        width: Optional[float] = 0.3,
+        horizontal: Optional[bool] = None,
+        rel_len: Optional[float] = 1,
+        divisions: Optional[int] = 0
     ) -> None:
         """
         Parameters