tikzplot42 0.5.2__tar.gz → 0.5.4__tar.gz

{tikzplot42-0.5.2/src/tikzplot42.egg-info → tikzplot42-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tikzplot42
-Version: 0.5.2
+Version: 0.5.4
 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
@@ -761,6 +761,16 @@ Some basic plot commands are already implemented with commonly used arguments:
 - `axvline()/axhline()`,
 - `axvspan()/axhspan()` (background span).
 
+#### 3D plotting
+- `plot()`,
+- `scatter()`,
+- `errorbar()`,
+- `fill_between()`,
+- `plot_wireframe()`,
+- `plot_surface()`,
+- `bar3d()`,
+- `text()`.
+
 #### Figures
 - `plt.figure()` (currently only to give you figure object or to set `figsize`),
 - `plt.subplot()`, `plt.subplots()` (with `sharex/sharey` fully implemented, projection `polar` and `3d` with basic support),
@@ -806,5 +816,5 @@ Currently supported parameters are listed with their default values in `src/tikz
 
 ## More features coming soon...
 - additional arguments support for implemented commands,
-- improved 3D plots (currently only basic support: plot, errorbar, fill_between, scatter, plot_wireframe, plot_surface),
+- improved 3D and polar plots,
 - ... 

{tikzplot42-0.5.2 → tikzplot42-0.5.4}/README.md

@@ -62,6 +62,16 @@ Some basic plot commands are already implemented with commonly used arguments:
 - `axvline()/axhline()`,
 - `axvspan()/axhspan()` (background span).
 
+#### 3D plotting
+- `plot()`,
+- `scatter()`,
+- `errorbar()`,
+- `fill_between()`,
+- `plot_wireframe()`,
+- `plot_surface()`,
+- `bar3d()`,
+- `text()`.
+
 #### Figures
 - `plt.figure()` (currently only to give you figure object or to set `figsize`),
 - `plt.subplot()`, `plt.subplots()` (with `sharex/sharey` fully implemented, projection `polar` and `3d` with basic support),
@@ -107,5 +117,5 @@ Currently supported parameters are listed with their default values in `src/tikz
 
 ## More features coming soon...
 - additional arguments support for implemented commands,
-- improved 3D plots (currently only basic support: plot, errorbar, fill_between, scatter, plot_wireframe, plot_surface),
+- improved 3D and polar plots,
 - ... 

{tikzplot42-0.5.2 → tikzplot42-0.5.4}/pyproject.toml

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

{tikzplot42-0.5.2 → tikzplot42-0.5.4}/src/tikzplot/axes.py

@@ -1,10 +1,8 @@
-from multiprocessing import parent_process
 from typing import Any, Iterable
 import copy
 
 import numpy as _np
 import matplotlib.pyplot as _plt
-from scipy import datasets
 
 from .elements import Graph
 from .texts import Text
@@ -412,7 +410,7 @@ class BaseAxes:
             except (ValueError, TypeError):
                 x_arr = _np.asarray(x)
                 if x_arr.ndim == 2:
-                    datasets = [x_arr[:, i] for i in range(x_arr.shape[1])]
+                    datasets = [col for col in x_arr.T]
                 else:
                     raise ValueError("Invalid dataset structure.")
         else:
@@ -420,7 +418,7 @@ class BaseAxes:
             if x_arr.ndim == 1:
                 datasets = [x_arr]
             elif x_arr.ndim == 2:
-                datasets = [x_arr[:, i] for i in range(x_arr.shape[1])]
+                datasets = [col for col in x_arr.T]
             else:
                 raise ValueError(f"Input must be 1D or 2D, got {x_arr.ndim}D.")
 
@@ -582,7 +580,7 @@ class BaseAxes:
             except (ValueError, TypeError):
                 h_arr = _np.asarray(heights)
                 if h_arr.ndim == 2:
-                    datasets = [h_arr[:, i] for i in range(h_arr.shape[1])]
+                    datasets = [col for col in h_arr.T]
                 else:
                     raise ValueError("Invalid dataset structure.")
         else:
@@ -590,12 +588,12 @@ class BaseAxes:
             if h_arr.ndim == 1:
                 datasets = [h_arr]
             elif h_arr.ndim == 2:
-                datasets = [h_arr[:, i] for i in range(h_arr.shape[1])]
+                datasets = [col for col in h_arr.T]
             else:
                 raise ValueError(f"Input must be 1D or 2D, got {h_arr.ndim}D.")
 
-        xs = kwargs.pop("positions", range(len(datasets[0])))
-        if len(xs) != len(datasets[0]):
+        xs = kwargs.pop("positions", range(len(datasets)))
+        if len(xs) != len(datasets):
             raise Warning("Length of positions does not match length of datasets.")
         if _np.diff(xs).min() != _np.diff(xs).max():
             raise Warning("Positions must be equidistant.")
@@ -1083,10 +1081,6 @@ class BaseAxes:
         Y_INV = {v: k for k, v in Y_POS_MAP.items()}
         self._axis_options["xtick pos"] = X_INV[(xt_t, xt_b)]
         self._axis_options["ytick pos"] = Y_INV[(yt_l, yt_r)]
-        if self._axis_options["xtick pos"] == "both":
-            self._axis_options.pop("xtick pos")
-        if self._axis_options["ytick pos"] == "both":
-            self._axis_options.pop("ytick pos")
         if "colors" in kwargs:
             c = self._match_color(kwargs.pop("colors"))
             self._update_axis_options(prefix + " tick style", {"draw": c})
@@ -1106,6 +1100,14 @@ class BaseAxes:
                 raise Warning(f"Invalid direction: {direction}. Must be one of 'in', 'out', or 'inout'.")
             TICK_DIR_MAP = {"in": "inside", "out": "outside", "inout": "center"}
             self._update_axis_options(prefix + "tick align", TICK_DIR_MAP[direction])
+        if self._axis_options["xtick pos"] == "both":
+            self._axis_options.pop("xtick pos")
+        elif self._axis_options["xtick pos"] == "none":
+            self._update_axis_options("xtick style", {"draw": self._axis_options.pop("xtick pos")})
+        if self._axis_options["ytick pos"] == "both":
+            self._axis_options.pop("ytick pos")
+        elif self._axis_options["ytick pos"] == "none":
+            self._update_axis_options("ytick style", {"draw": self._axis_options.pop("ytick pos")})
 
     _LEGEND_LOC_MAP = ["best", "upper right", "upper left", "lower_left", "lower right", "right", "center left", "center right", "lower center", "upper center", "center"]
     _ANCHOR_MAP = {"top": "north", "bottom": "south", "upper": "north", "lower": "south", "left": "west", "right": "east", "center": "center"}

{tikzplot42-0.5.2 → tikzplot42-0.5.4}/src/tikzplot/axes.pyi

@@ -12,7 +12,7 @@ HatchStyle = Literal["/", "\\", "|", "-", "+", "x", ".", "*"]
 
 
 class BaseAxes:   
-    def plot(self, x: ArrayLike = ..., y: ArrayLike = ..., fmt: Optional[str] = ...,*, alpha: Optional[float] = ..., color: Optional[ColorLike] = ..., c: Optional[ColorLike] = ...,
+    def plot(self, x: ArrayLike = ..., y: ArrayLike = ..., fmt: Optional[str] = ...,*, alpha: float = 1.0, 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] = ...,  label:Optional[str]=...) -> Graph:
         """
@@ -49,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] = ...,
+    def scatter(self, x: ArrayLike = ..., y: ArrayLike = ..., fmt: Optional[str] = ..., *,alpha: float = 1.0, color: Optional[Union[Sequence[ColorLike], ColorLike]] = ..., c: Optional[ColorLike] = ...,
              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] = ...) -> Graph:
         """
         Draw a scatter plot to the selected axis.
@@ -68,7 +68,6 @@ class BaseAxes:
         color or c: array like or single: all matplotlib color formats (without X11/xkcd) or float for colormap, optional
             color of line and markers: RGB/RGBA (tuple), HEX (str), grayscale (float), single-char (str), name (str), default cycle ("CX", X int), none for invisible. Note that if the sequence if of the same length as x, it will be interpreted as color sequence for each point, otherwise it will be interpreted as a single color for all points.
 
-
         label: str, optional
             Legned entry
         
@@ -85,7 +84,7 @@ class BaseAxes:
             Colorbar limits for scatter points, if color is given sequence of floats and cmap is given as string, otherwise ignored. If cmap is given as str and no vmin or vmax is provided, they will be set to the min and max of color sequence.
         """
         ...
-    def semilogy(self, x: ArrayLike = ..., y: ArrayLike = ..., base: Optional[float] = 10,  fmt: Optional[str] = ...,*, alpha: Optional[float] = ..., color: Optional[ColorLike] = ..., c: Optional[ColorLike] = ...,
+    def semilogy(self, x: ArrayLike = ..., y: ArrayLike = ..., base: Optional[float] = 10,  fmt: Optional[str] = ...,*, alpha: float = 1.0, 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] = ...,  label:Optional[str]=...) -> Graph:
         """
@@ -124,7 +123,7 @@ class BaseAxes:
             Mark size in pt
         """
         ...
-    def errorbar(self, x: ArrayLike = ..., y: ArrayLike = ..., yerr: Optional[ArrayLike | float] = ..., xerr: Optional[ArrayLike | float] = ..., fmt: Optional[str] = ..., *, alpha: Optional[float] = ..., color: Optional[ColorLike] = ..., c: Optional[ColorLike] = ...,
+    def errorbar(self, x: ArrayLike = ..., y: ArrayLike = ..., yerr: Optional[ArrayLike | float] = ..., xerr: Optional[ArrayLike | float] = ..., fmt: Optional[str] = ..., *, alpha: float = 1.0, 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] = ...,  label: Optional[str]= ..., ecolor: Optional[ColorLike] = ..., elinewidth: Optional[float] = ..., capsize: Optional[float] = ..., elinestyle: Optional[LineStyle] = ...) -> Graph:
         """
@@ -202,7 +201,7 @@ class BaseAxes:
         x: ArrayLike,
         y1: ArrayLike,
         y2: Optional[ArrayLike] = ...,
-        alpha: Optional[float] = ...,
+        alpha: float = 1.0,
         color: Optional[ColorLike] = ...,
         c: Optional[ColorLike] = ...,
         label: Optional[str] = ...,
@@ -242,7 +241,7 @@ class BaseAxes:
         """
         ...
 
-    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:
+    def text(self, x: float, y: float, s: str, alpha: float = 1, color: Optional[ColorLike] = ..., c: Optional[ColorLike] = ..., fontsize: Optional[FontSize] = ..., size: Optional[FontSize] = ..., backgroundcolor: Optional[ColorLike] = ..., horizontalalignment: Literal["left", "center", "right"] = "center", ha: Literal["left", "center", "right"] = "center", verticalalignment: Literal["bottom", "center", "top"] = "center", va: Literal["bottom", "center", "top"] = "center", rotation: float = 0, label: Optional[str] = ...) -> None:
         """
         Add text to the selected axis.
 
@@ -306,7 +305,7 @@ class BaseAxes:
     def hist(
         self,
         x: Union[ArrayLike, Sequence[ArrayLike]],
-        bins: int | Sequence[float] = 10,
+        bins: int | ArrayLike = 10,
         *,
         weight: ArrayLike | None = None,
         density: bool = False,
@@ -315,11 +314,12 @@ class BaseAxes:
         orientation: Literal["horizontal","vertical"] = "vertical",
         rwidth: float | None = None,
         range: Tuple[float,float] | None = None,
-        color: ColorLike = ...,
-        facecolor: ColorLike = ...,
-        fc: ColorLike = ...,
-        edgecolor: ColorLike = ...,
-        ec: ColorLike = ...,
+        alpha: float = 1.0,
+        color: ColorLike | Sequence[ColorLike] = ...,
+        facecolor: ColorLike | Sequence[ColorLike] = ...,
+        fc: ColorLike | Sequence[ColorLike] = ...,
+        edgecolor: ColorLike | Sequence[ColorLike] = ...,
+        ec: ColorLike | Sequence[ColorLike] = ...,
         align: Literal["left", "mid", "right"] = ...,
         stacked: bool = False,
         fill: bool = True,
@@ -358,6 +358,9 @@ class BaseAxes:
         range: tuple of float, optional
             The lower and upper range of the bins. If not provided, the range is automatically determined from the data.
 
+        alpha: float, optional
+            Opacity between 0 and 1.
+
         color, facecolor, fc, edgecolor, ec: ColorLike, optional
             The color of the bars. Can be a single color or a sequence of colors for multiple datasets. If not provided, the default color cycle is used.
 
@@ -928,7 +931,7 @@ class BaseAxes:
             Whether to draw ticks on the respective side of the axis, default True for all sides
         """
         ...
-    def legend(self, *args: Any, loc: Optional[Union[int,str,Tuple[float,float]]] = ..., facecolor: Optional[ColorLike] = ..., edgecolor: Optional[ColorLike] = ..., labelcolor: Optional[ColorLike] = ..., frameon: Optional[bool] = ..., anchor: Optional[Literal["north", "south", "east", "west", "center", "north west", "north east", "south west", "south east"]] = ..., fontsize: Optional[Literal["xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large"] | int] = ...) -> None:
+    def legend(self, *args: Any, loc: Optional[Union[int,str,Tuple[float,float]]] = ..., facecolor: Optional[ColorLike] = ..., edgecolor: Optional[ColorLike] = ..., labelcolor: Optional[ColorLike] = ..., frameon: Optional[bool] = ..., anchor: Optional[Literal["north", "south", "east", "west", "center", "north west", "north east", "south west", "south east"]] = ..., fontsize: Optional[Literal["xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large"] | int] = ..., ncols: Optional[int] = 1) -> None:
         """
         Show legend for the selected axis. Despite arguments requires at least one plotted element on the axis (not necesarily with label) to show up (LaTeX does not allow legend on empty axis).
 
@@ -971,7 +974,7 @@ class BaseAxes:
     
 class Axes(BaseAxes):
     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] = ...,
+    def loglog(self, x: ArrayLike = ..., y: ArrayLike = ..., base: Optional[float] = 10,  fmt: Optional[str] = ...,*, alpha: float = 1.0, 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] = ...) -> Graph:
         """
@@ -1010,7 +1013,7 @@ class Axes(BaseAxes):
             Mark size in pt
         """
         ...
-    def semilogx(self, x: ArrayLike = ..., y: ArrayLike = ..., base: Optional[float] = 10,  fmt: Optional[str] = ...,*, alpha: Optional[float] = ..., color: Optional[ColorLike] = ..., c: Optional[ColorLike] = ...,
+    def semilogx(self, x: ArrayLike = ..., y: ArrayLike = ..., base: Optional[float] = 10,  fmt: Optional[str] = ...,*, alpha: float = 1.0, 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] = ...) -> Graph:
         """
@@ -1092,8 +1095,7 @@ class Axes(BaseAxes):
             Title location, default "center"
         """
         ...
-    def grid(self, visible: bool = True, which: Literal["major","minor","both"] = "major", alpha: Optional[float] = ..., color: Optional[ColorLike] = ..., c: Optional[ColorLike] = ...,
-             linestyle: Optional[LineStyle] = ..., ls: Optional[LineStyle] = ..., linewidth: Optional[float]= ..., lw: Optional[float] = ...) -> None: 
+    def grid(self, visible: bool = True, which: Literal["major","minor","both"] = "major", alpha: float = 1.0, color: Optional[ColorLike] = ..., c: Optional[ColorLike] = ..., linestyle: Optional[LineStyle] = ..., ls: Optional[LineStyle] = ..., linewidth: Optional[float]= ..., lw: Optional[float] = ...) -> None: 
         """
         Set grid.
 
@@ -1112,8 +1114,8 @@ class Axes(BaseAxes):
         linewidth or lw: float, optional
             Grid line width in pt
         """
-    def set_minorticks_num(self, num: int) -> None:
         ...
+    def set_minorticks_num(self, num: int) -> None:
         """
         Set number of minor ticks between major ticks.
         
@@ -1122,6 +1124,7 @@ class Axes(BaseAxes):
         num: int
             Number of minor ticks between major ticks.
         """
+        ...
     def set_xlim(self, *args: Any, left: Optional[float] = ..., right: Optional[float] = ...) -> None: 
         """
         Set x-axis limit(-s). Set as tuple or as kwargs (left, right).