tikzplot42 0.5.13__tar.gz → 0.6.0__tar.gz

{tikzplot42-0.5.13 → tikzplot42-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tikzplot42
-Version: 0.5.13
+Version: 0.6.0
 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
@@ -735,6 +735,7 @@ All required packages are automatically detected and can be printed at save usin
 - `\usepgfplotslibrary{groupplots}` (recommended for best results, enabled by default, may be avoided by setting TikzConfig USE_GROUPPLOTS=False),
 - `\usepackage{xcolor}` (recommended for best colors, works without but needs change of TikzConfig USE_XCOLOR=False),
 - `\usepgfplotslibrary{polar}` required for polar axis,
+- `\usepgfplotslibrary{smithchart}` required for Smith chart axis,
 - `\usetikzlibrary{patterns.meta}` for hatch patterns (available for fill_between, hist and axvspan/axhspan).
 
 Export using `plt.savefig("example_graph.tex")` (recommended) or `plt.show()`.

{tikzplot42-0.5.13 → tikzplot42-0.6.0}/README.md

@@ -35,6 +35,7 @@ All required packages are automatically detected and can be printed at save usin
 - `\usepgfplotslibrary{groupplots}` (recommended for best results, enabled by default, may be avoided by setting TikzConfig USE_GROUPPLOTS=False),
 - `\usepackage{xcolor}` (recommended for best colors, works without but needs change of TikzConfig USE_XCOLOR=False),
 - `\usepgfplotslibrary{polar}` required for polar axis,
+- `\usepgfplotslibrary{smithchart}` required for Smith chart axis,
 - `\usetikzlibrary{patterns.meta}` for hatch patterns (available for fill_between, hist and axvspan/axhspan).
 
 Export using `plt.savefig("example_graph.tex")` (recommended) or `plt.show()`.

{tikzplot42-0.5.13 → tikzplot42-0.6.0}/pyproject.toml

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

{tikzplot42-0.5.13 → tikzplot42-0.6.0}/src/tikzplot/axes.py

@@ -174,7 +174,7 @@ class BaseAxes:
         if cb is not None:
             if self._cmap_bar.get(self._get_overlay(), None) is not None and self._cmap_bar[self._get_overlay()] != cb:
                 self._get_free_overlay(cb=cb)
-        if isinstance(self, Axes) and self._polar:
+        if isinstance(self, Axes) and self._projection == "polar":
             x = _np.rad2deg(x)
         e = Graph(self, (x, y), settings, xerr=xerr, yerr=yerr, **style)
         if overlay is None:
@@ -819,12 +819,14 @@ class BaseAxes:
         for k in kws - {"label"}:
             if k in kwargs:
                 st[k] = kwargs.pop(k)
+        output = []
         for i in range(len(ys)):
             if i == 0 and "label" in kwargs:
-                return self._plot([xmins[i], xmaxs[i]], [ys[i]]*2, None, None, None, c=colorss[i], ls=lss[i], label=kwargs["label"], **st)
+                output.append(self._plot([xmins[i], xmaxs[i]], [ys[i]]*2, None, None, None, c=colorss[i], ls=lss[i], label=kwargs["label"], **st))
             else:
-                return self._plot([xmins[i], xmaxs[i]], [ys[i]]*2, None, None, None, c=colorss[i], ls=lss[i], **st)
-            
+                output.append(self._plot([xmins[i], xmaxs[i]], [ys[i]]*2, None, None, None, c=colorss[i], ls=lss[i], **st))
+        return output
+
     def vlines(self, x, ymin, ymax, colors="k", linestyles="solid", **kwargs):
         kws = {"label", "color", "c", "linewidth", "lw", "linestyle", "ls", "alpha"}
         kwargs = self._check_kwargs("vlines", kws, **kwargs)
@@ -847,11 +849,13 @@ class BaseAxes:
         for k in kws - {"label"}:
             if k in kwargs:
                 st[k] = kwargs.pop(k)
+        output = []
         for i in range(len(xs)):
             if i == 0 and "label" in kwargs:
-                self._plot([xs[i]]*2, [ymins[i], ymaxs[i]], None, None, None, c=colorss[i], ls=lss[i], label=kwargs["label"], **st)
+                output.append(self._plot([xs[i]]*2, [ymins[i], ymaxs[i]], None, None, None, c=colorss[i], ls=lss[i], label=kwargs["label"], **st))
             else:
-                self._plot([xs[i]]*2, [ymins[i], ymaxs[i]], None, None, None, c=colorss[i], ls=lss[i], **st)
+                output.append(self._plot([xs[i]]*2, [ymins[i], ymaxs[i]], None, None, None, c=colorss[i], ls=lss[i], **st))
+        return output
 
     def hist(self, x, bins=10, density=False,**kwargs):
         kws = {"alpha", "color", "c", "label", "facecolor", "fc", "edgecolor", "ec", "orientation", "rwidth", "cumulative", "range", "histtype", "weights", "cumulative", "align", "stacked", "fill", "hatch", "hatch_color", "hatch_linewidth", "hatch_distance"}
@@ -2447,7 +2451,7 @@ class BaseAxes:
                     self._axis_options["ymin"], self._axis_options["ymax"] = ymax, ymin
 
 class Axes(BaseAxes):
-    def __init__(self, nrows, ncols, index, fig, polar):
+    def __init__(self, nrows, ncols, index, fig, projection):
         super().__init__()
         self._left = False
         self._neigh = None
@@ -2470,7 +2474,7 @@ class Axes(BaseAxes):
         self._colorbar: dict[int, None|str] = {0: None}
         self._cbar_v = False
         self._cbar_h = False
-        self._polar = polar
+        self._projection = projection
 
         self._ext_xmin = False
         self._ext_xmax = False
@@ -2865,8 +2869,8 @@ class Axes(BaseAxes):
             self._xticks = False
 
     def twinx(self):
-        if self._polar:
-            raise Exception("Cannot create twinx() on polar plot.")
+        if self._projection in ["polar", "smith"]:
+            raise Exception("Cannot create twinx() on non-normal projection.")
         self._secondary_y = Secondary(self)
         self._ext_xmin = self._ext_xmax = True
         self.tick_params(axis="y", right=False)
@@ -3123,16 +3127,20 @@ class Axes(BaseAxes):
                     self._overlay_special[k].update({key: val}) """
         lines = []
         lines2 = []
-        if self._polar:
+        if self._projection == "polar":
             self._fig._add_required_package("\\usepgfplotslibrary{polar}")
+        elif self._projection == "smith":
+            self._fig._add_required_package("\\usepgfplotslibrary{smithchart}")
         main_ax, aux_ax, alias, adds = self._axis_option_string()
         contents = self._content_tex(filename)
         if self._extend is not None:
             lines.append(f"\\nextgroupplot[alias={alias}, width={self._extend[0]}cm, height={self._extend[1]}cm, hide axis]")
             for i in self._elements.keys():
                 spec = ",\n".join([self._parse_entry(k, v) for k, v in self._overlay_special.get(i, {}).items()]) + ",\n" if i in self._overlay_special else ""
-                if self._polar:
+                if self._projection == "polar":
                     lines2.append("\\begin{polaraxis}["+ f"\n at={{({alias}.south west)}},")
+                elif self._projection == "smith":
+                    lines2.append("\\begin{smithchart}["+ f"\n at={{({alias}.south west)}},")
                 else:
                     lines2.append("\\begin{axis}[" + f"\n at={{({alias}.south west)}},")
                 if TikzConfig.SCALE_ONLY_AXIS:
@@ -3142,8 +3150,10 @@ class Axes(BaseAxes):
                 else:
                     lines2.append(f"{aux_ax}{spec}\n]")
                 lines2.append(contents[i])
-                if self._polar:
+                if self._projection == "polar":
                     lines2.append("\\end{polaraxis}")
+                elif self._projection == "smith":
+                    lines2.append("\\end{smithchart}")
                 else:
                     lines2.append("\\end{axis}")
                     if self._secondary_y is not None:
@@ -3167,32 +3177,42 @@ class Axes(BaseAxes):
                                 if add_l:
                                     lines2.append(add_l)
                             lines2.append("\\end{axis}")
-        elif self._polar and TikzConfig.USE_GROUPPLOTS and not single:
-            lines.append(f"\\nextgroupplot[alias={self._axis_options['alias']}, width={self._width}, height={self._height}, hide axis]")
+        elif self._projection in ["polar", "smith"] and TikzConfig.USE_GROUPPLOTS and not single:
+            lines.append(f"\\nextgroupplot[alias={alias}, width={self._width}, height={self._height}, hide axis]")
             for i in self._elements.keys():
                 spec = ",\n".join([self._parse_entry(k, v) for k, v in self._overlay_special.get(i, {}).items()]) + ",\n" if i in self._overlay_special else ""
                 if i in adds:
                     spec += adds[i]
-                lines2.append("\\begin{polaraxis}[")
+                if self._projection == "polar":
+                    lines2.append("\\begin{polaraxis}["+ f"\n at={{({alias}.south west)}},")
+                elif self._projection == "smith":
+                    lines2.append("\\begin{smithchart}["+ f"\n at={{({alias}.south west)}},")
                 if TikzConfig.SCALE_ONLY_AXIS:
-                    lines2.append("scale only axis")
+                    lines2.append("scale only axis,")
                 if i == self._get_overlay():
                     lines2.append(f"{main_ax}{spec}\n]")
                 else:
                     lines2.append(f"{aux_ax}{spec}\n]")
                 lines2.append(contents[i])
-                lines2.append("\\end{polaraxis}")
+                if self._projection == "polar":
+                    lines2.append("\\end{polaraxis}")
+                elif self._projection == "smith":
+                    lines2.append("\\end{smithchart}")
         else:
-            if TikzConfig.USE_GROUPPLOTS and not single:
-                lines.append("\\nextgroupplot[")
-            if self._polar:
+            if self._projection == "polar":
                 lines.append("\\begin{polaraxis}[")
                 if TikzConfig.SCALE_ONLY_AXIS:
-                    lines.append("scale only axis")
+                    lines.append("scale only axis,")
+            elif self._projection == "smith":
+                lines.append("\\begin{smithchart}[")
+                if TikzConfig.SCALE_ONLY_AXIS:
+                    lines.append("scale only axis,")
+            elif TikzConfig.USE_GROUPPLOTS and not single:
+                lines.append("\\nextgroupplot[")
             elif not TikzConfig.USE_GROUPPLOTS or (TikzConfig.USE_GROUPPLOTS and single):
                 lines.append("\\begin{axis}[")
                 if TikzConfig.SCALE_ONLY_AXIS:
-                    lines.append("scale only axis")
+                    lines.append("scale only axis,")
             if self._get_overlay() == 0:
                 spec = ",\n".join([self._parse_entry(k, v) for k, v in self._overlay_special.get(0, {}).items()]) + ",\n" if 0 in self._overlay_special else ""
                 if 0 in adds:
@@ -3227,8 +3247,10 @@ class Axes(BaseAxes):
                         lines2.append(f"{aux_ax}{spec}at={{({alias}.south west)}}\n]")
                         lines2.append(contents[i])
                     lines2.append("\\end{axis}")
-            if self._polar:
+            if self._projection == "polar":
                 lines.append("\\end{polaraxis}")
+            elif self._projection == "smith":
+                lines.append("\\end{smithchart}")
             elif not TikzConfig.USE_GROUPPLOTS or (TikzConfig.USE_GROUPPLOTS and single):            
                 lines.append("\\end{axis}")
             if self._secondary_y is not None:

{tikzplot42-0.5.13 → tikzplot42-0.6.0}/src/tikzplot/axes.pyi

@@ -404,7 +404,7 @@ class BaseAxes:
         colors: Union[str, Sequence[str]] = "k",
         linestyles: Union[str, Sequence[str]] = "solid",
         label: Optional[str] = None, color: Optional[ColorLike] = ..., c: Optional[ColorLike] = ..., linewidth: Optional[float] = ..., lw: Optional[float] = ..., linestyle: Optional[LineStyle] = ..., ls: Optional[LineStyle] = ..., alpha: float = 1.0
-    ) -> None: 
+    ) -> list[Graph]: 
         """
         Draw horizontal lines to the selected axis.
         """
@@ -417,7 +417,7 @@ class BaseAxes:
         colors: Union[str, Sequence[str]] = "k",
         linestyles: Union[str, Sequence[str]] = "solid",
         label: Optional[str] = None, color: Optional[ColorLike] = ..., c: Optional[ColorLike] = ..., linewidth: Optional[float] = ..., lw: Optional[float] = ..., linestyle: Optional[LineStyle] = ..., ls: Optional[LineStyle] = ..., alpha: float = 1.0
-    ) -> None: 
+    ) -> list[Graph]: 
         """
         Draw vertical lines to the selected axis.
         """
@@ -1949,7 +1949,7 @@ class BaseAxes:
     def _not_hidable(self) -> None: ...
     
 class Axes(BaseAxes):
-    def __init__(self, nrows: int, ncols: int, index: int, fig: Any, pol: bool) -> None: ...
+    def __init__(self, nrows: int, ncols: int, index: int, fig: Any, projection: Literal["normal", "polar", "smith"] = "normal") -> None: ...
 
     def contourf(self, *args: Any, levels: Optional[Sequence[float]] = None, cmap: Optional[str] = None, colors: Optional[Sequence[ColorLike]] = None, vmin: Optional[float] = None, vmax: Optional[float] = None, alpha: float = 1.0) -> Graph:
         """

{tikzplot42-0.5.13 → tikzplot42-0.6.0}/src/tikzplot/elements.py

@@ -648,6 +648,10 @@ class Graph(BaseGraph):
         elif isinstance(coordinates, tuple):
             self._classic = True
             x,y=coordinates
+            if isinstance(x, (list, tuple)):
+                x = [x]
+            if isinstance(y, (list, tuple)):
+                y = [y]
             self._x = np.asarray(x)
             self._y = np.asarray(y)
             self._meta = self._settings.pop("meta", None)
@@ -756,6 +760,8 @@ class Graph(BaseGraph):
         style = self._style_string().removesuffix(",\n")
 
         def rel_coor(which, m, M, v):
+            if isinstance(m, str) or isinstance(M, str):
+                return m, M
             if self._axes._axis_options.get(f"{which}mode") == "log":
                 r = M/m
                 lower = m * r**v[0]

{tikzplot42-0.5.13 → tikzplot42-0.6.0}/src/tikzplot/figure.py

@@ -62,9 +62,11 @@ class Figure:
 
         if projection=="3d":
             ax = Axes3(nrows, ncols, index, self)
+        elif projection is None or projection in ["normal", "polar", "smith"]:
+            proj: str = "polar" if polar else projection if projection is not None else "normal"
+            ax = Axes(nrows, ncols, index, self, proj)
         else:
-            pol: bool = projection=="polar" or polar
-            ax = Axes(nrows, ncols, index, self, pol)
+            raise ValueError(f"Invalid projection type: {projection}. If specified, must be 'normal', 'polar', 'smith', or '3d'.")
         if self._nrows != 0 and self._ncols != 0 and (self._nrows != nrows or self._ncols != ncols):
             raise ValueError("Cannot add subplot with different nrows/ncols than existing subplots")
         self._nrows = nrows
@@ -214,25 +216,25 @@ class Figure:
         new_name = get_free_name()
         if position == "left":
             insert_col(target_c)
-            new_axes = Axes(self._nrows, self._ncols, 0, self, False)
+            new_axes = Axes(self._nrows, self._ncols, 0, self, "normal")
             self._mosaic[new_name] = dict(r=target_r, c=target_c, nr=target_nr, nc=1, ax=new_axes)
             if self._wratios is not None:
                 self._wratios.insert(target_c, sum_w * relsize)
         elif position == "right":
             insert_col(target_c + target_nc)
-            new_axes = Axes(self._nrows, self._ncols, 0, self, False)
+            new_axes = Axes(self._nrows, self._ncols, 0, self, "normal")
             self._mosaic[new_name] = dict(r=target_r, c=target_c + target_nc, nr=target_nr, nc=1, ax=new_axes)
             if self._wratios is not None:
                 self._wratios.insert(target_c + target_nc, sum_w * relsize)
         elif position == "above":
             insert_row(target_r_top)
-            new_axes = Axes(self._nrows, self._ncols, 0, self, False)
+            new_axes = Axes(self._nrows, self._ncols, 0, self, "normal")
             self._mosaic[new_name] = dict(r=target_r_top, c=target_c, nr=1, nc=target_nc, ax=new_axes)
             if self._hratios is not None:
                 self._hratios.insert(target_r_top, sum_h * relsize)
         else: # below
             insert_row(target_r + 1)
-            new_axes = Axes(self._nrows, self._ncols, 0, self, False)
+            new_axes = Axes(self._nrows, self._ncols, 0, self, "normal")
             self._mosaic[new_name] = dict(r=target_r + 1, c=target_c, nr=1, nc=target_nc, ax=new_axes)
             if self._hratios is not None:
                 self._hratios.insert(target_r + 1, sum_h * relsize)
@@ -578,7 +580,7 @@ class Figure:
         ncols = self._ncols
         for i in range(1, 1 + nrows * ncols):
             if i not in self._axes:
-                self._axes[i] = Axes(nrows, ncols, -i, self, False)
+                self._axes[i] = Axes(nrows, ncols, -i, self, "normal")
         if TikzConfig.USE_GROUPPLOTS and not single:
             if TikzConfig.SIMULATE_SIZES:
                 if _can_compile_tex():

{tikzplot42-0.5.13 → tikzplot42-0.6.0}/src/tikzplot/figure.pyi

@@ -30,7 +30,7 @@ class Figure:
         *args,
         sharex: Optional[ShareOptions] = None,
         sharey: Optional[ShareOptions] = None,
-        projection: Optional[Literal["polar"]] = None,
+        projection: Optional[Literal["normal", "polar", "smith"]] = None,
         polar: Optional[bool] = False,
     ) -> Axes:  
         ...
@@ -45,8 +45,8 @@ class Figure:
         sharex, sharey: bool or "row" or "col" or "all" or "none", optional
             Share x or y axes with other subplots.
 
-        projection: None, "polar", "3d", optional
-            None results in normal 2D.
+        projection: None or "normal", "polar", "smith", "3d", optional
+            None results in normal 2D. For Smith projection, complex input should be provided as cartesian (x = z.real, y = z.imag).
         
         polar: bool, optional
             Use polar projection for axis.

{tikzplot42-0.5.13 → tikzplot42-0.6.0}/src/tikzplot42.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tikzplot42
-Version: 0.5.13
+Version: 0.6.0
 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
@@ -735,6 +735,7 @@ All required packages are automatically detected and can be printed at save usin
 - `\usepgfplotslibrary{groupplots}` (recommended for best results, enabled by default, may be avoided by setting TikzConfig USE_GROUPPLOTS=False),
 - `\usepackage{xcolor}` (recommended for best colors, works without but needs change of TikzConfig USE_XCOLOR=False),
 - `\usepgfplotslibrary{polar}` required for polar axis,
+- `\usepgfplotslibrary{smithchart}` required for Smith chart axis,
 - `\usetikzlibrary{patterns.meta}` for hatch patterns (available for fill_between, hist and axvspan/axhspan).
 
 Export using `plt.savefig("example_graph.tex")` (recommended) or `plt.show()`.

{tikzplot42-0.5.13 → tikzplot42-0.6.0}/src/tikzplot42.egg-info/SOURCES.txt

@@ -51,6 +51,7 @@ tests/test24.py
 tests/test25.py
 tests/test26.py
 tests/test27.py
+tests/test28.py
 tests/test3.py
 tests/test4.py
 tests/test5.py

tikzplot42-0.6.0/tests/test28.py

@@ -0,0 +1,34 @@
+import tikzplot.plots as plt
+import numpy as np
+
+# Sample data
+x = np.linspace(0, 2 * np.pi, 100)
+y = np.sin(x)
+
+fig = plt.figure(figsize=(8, 8))
+
+# 1. Normal (Rectilinear) Projection
+ax1 = fig.add_subplot(2, 2, 1)
+ax1.plot(x, y, color="tab:blue")
+ax1.set_title("Normal Projection")
+ax1.grid(True)
+
+# 2. 3D Projection
+ax2 = fig.add_subplot(2, 2, 2, projection="3d")
+z = np.cos(x)
+ax2.plot(x, y, z, color="tab:orange")
+ax2.set_title("3D Projection")
+
+# 3. Polar Projection
+ax3 = fig.add_subplot(2, 2, 3, projection="polar")
+ax3.plot(x, y, color="tab:green")
+ax3.set_title("Polar Projection")
+
+# 4. Smith Chart Projection (requires your custom package imported beforehand)
+ax4 = fig.add_subplot(2, 2, 4, projection="smith")
+# Dummy impedance data (S-parameters / reflection coefficient)
+z_smith = 0.5 + 0.5j + 0.4 * np.exp(1j * x)
+ax4.plot(z_smith.real, z_smith.imag, color="tab:red")
+ax4.set_title("Smith Projection")
+
+plt.savefig("figure.tex")