adopt-plot 0.0.3__tar.gz → 0.0.5__tar.gz

adopt_plot-0.0.5/PKG-INFO

@@ -0,0 +1,96 @@
+Metadata-Version: 2.4
+Name: adopt-plot
+Version: 0.0.5
+Summary: A universal plotter for implicit functions using adaptive engine selection.
+Author: VartRusData
+License: BSD 3-Clause
+Classifier: License :: OSI Approved :: BSD License
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: sympy
+Requires-Dist: matplotlib
+Requires-Dist: numpy
+Dynamic: license-file
+
+# adopt-plot
+
+A library for plotting implicit functions using two rendering engines:
+
+- `contour` from `matplotlib`.
+- `plot_implicit` which internally uses **Adaptive Marching Squares (AMR)** — an adaptive algorithm that correctly handles the domain of definition and discontinuities.
+
+**Automatic selection:** If the equation has domain restrictions (e.g., logarithm or square root), `plot_implicit` is used. If the function is smooth, the fast `contour` engine is chosen. Visually, they are indistinguishable, but the best algorithm is selected automatically.
+
+---
+
+## Installation
+
+```bash
+pip install adopt-plot
+```
+## Quick Start
+Plot a graph in one line:
+
+```python
+from adopt_plot import AdoptPlot
+
+# The plot will open immediately
+plot = AdoptPlot("y = 2*x + 2")
+```
+Or with deferred display (to add custom elements first):
+
+```python
+from adopt_plot import AdoptPlot
+
+plot = AdoptPlot("y = 1/x", show=False)
+# Add custom elements here:
+plot.ax.scatter(2, 2, color='red')
+plot.show()
+# Show the plot after modifications
+```
+All plot elements (`axes`, `fig`,  `plt`) are accessible via the plot object and its attributes:
+
+```python
+from adopt_plot import AdoptPlot
+plot = AdoptPlot("y = 1/x", show=False)
+plot.ax.set_xlim(-10, 10)  # Change X-axis limits
+plot.fig.savefig("my_plot.png", dpi=300)# Save to file
+```
+![my_plot](https://i.yapx.ru/eCFD2.png)
+```python
+from adopt_plot import AdoptPlot
+
+plot = AdoptPlot("sin(sqrt(x**2 + y**2)) / log(x**2 + y**2 + 1) = 0", show=False)
+
+# Подкручиваем стиль под публикацию
+plot.ax.set_title("Implicit function with radial oscillations")
+plot.ax.grid(True, linestyle=':', alpha=0.5)
+
+# Сохраняем с высоким DPI
+plot.fig.savefig("publication_ready.png", dpi=300, bbox_inches='tight')
+plot.show()
+```
+![Сложная функция](https://i.yapx.ru/eCFBo.png) Сложная функция построенная через AdoptPlot
+
+## Parameters
+
+When creating an `AdoptPlot` object, the following parameters are available:
+
+- **`expr`** (`str`): The equation string (e.g., `"y = 1/x"`).
+- **`lib`** (`Literal['contour', 'implicit', None]`): Forced rendering engine. Default is `None` (automatic selection).
+- **`xlims`, `ylims`** (`Tuple[float, float]`): Initial visible range for the plot. Default `(-20, 20)`.
+- **`n`** (`int`): Grid density for the `contour` engine. Default `10000`.
+- **`depth`** (`int`): Adaptive refinement depth for `plot_implicit`. Default `9`.
+- **`linewidth`** (`float`): Thickness of the plot line. Default `2.0`.
+- **`limit`** (`float | Tuple[float, float, float, float]`): Computational domain. Pass a single number (square) or a tuple of 4 numbers `(x_min, x_max, y_min, y_max)`. Default `100`.
+- **`color`** (`str`): Line color. Default `'blue'`.
+- **`legend`** (`bool`): Whether to display the legend. Default `True`.
+- **`points`** (`bool`): Whether to display axis intersection points. Default `True`.
+- **`grid`** (`bool`): Whether to display the grid. Default `True`.
+- **`interact`** (`bool`): Allow zooming and panning via keyboard (`Ctrl +` and `Ctrl -`). Default `True`.
+- **`show`** (`bool`): If `False`, the plot does not open immediately, allowing you to add elements. Default `True`.
+- **`text_legend`** (`str`): Additional text for the legend. Default `None`.
+## License
+
+Distributed under the **BSD 3-Clause** license.

adopt_plot-0.0.5/README.md

@@ -0,0 +1,81 @@
+# adopt-plot
+
+A library for plotting implicit functions using two rendering engines:
+
+- `contour` from `matplotlib`.
+- `plot_implicit` which internally uses **Adaptive Marching Squares (AMR)** — an adaptive algorithm that correctly handles the domain of definition and discontinuities.
+
+**Automatic selection:** If the equation has domain restrictions (e.g., logarithm or square root), `plot_implicit` is used. If the function is smooth, the fast `contour` engine is chosen. Visually, they are indistinguishable, but the best algorithm is selected automatically.
+
+---
+
+## Installation
+
+```bash
+pip install adopt-plot
+```
+## Quick Start
+Plot a graph in one line:
+
+```python
+from adopt_plot import AdoptPlot
+
+# The plot will open immediately
+plot = AdoptPlot("y = 2*x + 2")
+```
+Or with deferred display (to add custom elements first):
+
+```python
+from adopt_plot import AdoptPlot
+
+plot = AdoptPlot("y = 1/x", show=False)
+# Add custom elements here:
+plot.ax.scatter(2, 2, color='red')
+plot.show()
+# Show the plot after modifications
+```
+All plot elements (`axes`, `fig`,  `plt`) are accessible via the plot object and its attributes:
+
+```python
+from adopt_plot import AdoptPlot
+plot = AdoptPlot("y = 1/x", show=False)
+plot.ax.set_xlim(-10, 10)  # Change X-axis limits
+plot.fig.savefig("my_plot.png", dpi=300)# Save to file
+```
+![my_plot](https://i.yapx.ru/eCFD2.png)
+```python
+from adopt_plot import AdoptPlot
+
+plot = AdoptPlot("sin(sqrt(x**2 + y**2)) / log(x**2 + y**2 + 1) = 0", show=False)
+
+# Подкручиваем стиль под публикацию
+plot.ax.set_title("Implicit function with radial oscillations")
+plot.ax.grid(True, linestyle=':', alpha=0.5)
+
+# Сохраняем с высоким DPI
+plot.fig.savefig("publication_ready.png", dpi=300, bbox_inches='tight')
+plot.show()
+```
+![Сложная функция](https://i.yapx.ru/eCFBo.png) Сложная функция построенная через AdoptPlot
+
+## Parameters
+
+When creating an `AdoptPlot` object, the following parameters are available:
+
+- **`expr`** (`str`): The equation string (e.g., `"y = 1/x"`).
+- **`lib`** (`Literal['contour', 'implicit', None]`): Forced rendering engine. Default is `None` (automatic selection).
+- **`xlims`, `ylims`** (`Tuple[float, float]`): Initial visible range for the plot. Default `(-20, 20)`.
+- **`n`** (`int`): Grid density for the `contour` engine. Default `10000`.
+- **`depth`** (`int`): Adaptive refinement depth for `plot_implicit`. Default `9`.
+- **`linewidth`** (`float`): Thickness of the plot line. Default `2.0`.
+- **`limit`** (`float | Tuple[float, float, float, float]`): Computational domain. Pass a single number (square) or a tuple of 4 numbers `(x_min, x_max, y_min, y_max)`. Default `100`.
+- **`color`** (`str`): Line color. Default `'blue'`.
+- **`legend`** (`bool`): Whether to display the legend. Default `True`.
+- **`points`** (`bool`): Whether to display axis intersection points. Default `True`.
+- **`grid`** (`bool`): Whether to display the grid. Default `True`.
+- **`interact`** (`bool`): Allow zooming and panning via keyboard (`Ctrl +` and `Ctrl -`). Default `True`.
+- **`show`** (`bool`): If `False`, the plot does not open immediately, allowing you to add elements. Default `True`.
+- **`text_legend`** (`str`): Additional text for the legend. Default `None`.
+## License
+
+Distributed under the **BSD 3-Clause** license.

{adopt_plot-0.0.3 → adopt_plot-0.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "adopt-plot"
-version = "0.0.3"
+version = "0.0.5"
 description = "A universal plotter for implicit functions using adaptive engine selection."
 readme = "README.md"
 requires-python = ">=3.9"
@@ -20,4 +20,8 @@ classifiers = [
 ]
 [tool.setuptools]
 packages = ["adopt_plot"]
-package-dir = {"" = "src"}
+package-dir = {"" = "src"}
+
+[tool.pytest.ini_options]
+testpaths = ["tests", "."]  # <-- точка "." означает "ищи также в корне"
+python_files = ["test_*.py", "*_test.py", "test.py"]

{adopt_plot-0.0.3 → adopt_plot-0.0.5}/src/adopt_plot/plot.py

@@ -75,7 +75,7 @@ def insert_multiplication_signs(expr: str, extra_functions=None) -> str:
 
 from typing import Literal, Optional, Tuple
 
-class AdoptPlot():
+class AdoptPlot:
     def __init__(self,
                expr: str,
                lib: Literal['contour', 'implicit', None] = None,
@@ -260,8 +260,9 @@ class AdoptPlot():
                 # Принудительно перерисовываем график
                 event.canvas.draw_idle()
             # === 2. Увеличиваем разрешение для гладкости (было 500, стало 1000) ===
-            if self.lib == 'implicit' or (has_odz and self.lib is None):
+            if self.lib == 'implicit' or (has_odz(expr, var1) and self.lib is None):
                 from sympy.plotting import plot_implicit
+                self.current_engine = 'implicit'
                 if isinstance(self.limit, (int, float)):
                     self.p = plot_implicit(self.eq, (var1, -self.limit, self.limit), (var2, -self.limit, self.limit), show=False, n=self.n, depth=self.depth, line_color=self.color)
                 elif isinstance(self.limit, tuple):
@@ -347,6 +348,7 @@ class AdoptPlot():
 
                 return
             else:
+                self.current_engine = 'contour'
                 if isinstance(self.limit, (float, int)):
 
                     x_vals = np.linspace(-self.limit, self.limit, self.n)
@@ -366,6 +368,8 @@ class AdoptPlot():
                 Z = f(X, Y)
                 # print(Z)
                 self.fig, self.ax = plt.subplots()
+                if self.interact:
+                    self.fig.canvas.mpl_connect('key_press_event', zoom_key_handler)
                 x_coords_str = ", ".join([f"({x:.2f}, 0)" for x in x_intercepts]) if x_intercepts else "Нет"
                 y_coords_str = ", ".join([f"(0, {y:.2f})" for y in y_intercepts]) if y_intercepts else "Нет"
                 self.ax.contour(X, Y, Z, levels=[0], colors=self.color, linewidths=self.linewidth)

adopt_plot-0.0.5/src/adopt_plot.egg-info/PKG-INFO

@@ -0,0 +1,96 @@
+Metadata-Version: 2.4
+Name: adopt-plot
+Version: 0.0.5
+Summary: A universal plotter for implicit functions using adaptive engine selection.
+Author: VartRusData
+License: BSD 3-Clause
+Classifier: License :: OSI Approved :: BSD License
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: sympy
+Requires-Dist: matplotlib
+Requires-Dist: numpy
+Dynamic: license-file
+
+# adopt-plot
+
+A library for plotting implicit functions using two rendering engines:
+
+- `contour` from `matplotlib`.
+- `plot_implicit` which internally uses **Adaptive Marching Squares (AMR)** — an adaptive algorithm that correctly handles the domain of definition and discontinuities.
+
+**Automatic selection:** If the equation has domain restrictions (e.g., logarithm or square root), `plot_implicit` is used. If the function is smooth, the fast `contour` engine is chosen. Visually, they are indistinguishable, but the best algorithm is selected automatically.
+
+---
+
+## Installation
+
+```bash
+pip install adopt-plot
+```
+## Quick Start
+Plot a graph in one line:
+
+```python
+from adopt_plot import AdoptPlot
+
+# The plot will open immediately
+plot = AdoptPlot("y = 2*x + 2")
+```
+Or with deferred display (to add custom elements first):
+
+```python
+from adopt_plot import AdoptPlot
+
+plot = AdoptPlot("y = 1/x", show=False)
+# Add custom elements here:
+plot.ax.scatter(2, 2, color='red')
+plot.show()
+# Show the plot after modifications
+```
+All plot elements (`axes`, `fig`,  `plt`) are accessible via the plot object and its attributes:
+
+```python
+from adopt_plot import AdoptPlot
+plot = AdoptPlot("y = 1/x", show=False)
+plot.ax.set_xlim(-10, 10)  # Change X-axis limits
+plot.fig.savefig("my_plot.png", dpi=300)# Save to file
+```
+![my_plot](https://i.yapx.ru/eCFD2.png)
+```python
+from adopt_plot import AdoptPlot
+
+plot = AdoptPlot("sin(sqrt(x**2 + y**2)) / log(x**2 + y**2 + 1) = 0", show=False)
+
+# Подкручиваем стиль под публикацию
+plot.ax.set_title("Implicit function with radial oscillations")
+plot.ax.grid(True, linestyle=':', alpha=0.5)
+
+# Сохраняем с высоким DPI
+plot.fig.savefig("publication_ready.png", dpi=300, bbox_inches='tight')
+plot.show()
+```
+![Сложная функция](https://i.yapx.ru/eCFBo.png) Сложная функция построенная через AdoptPlot
+
+## Parameters
+
+When creating an `AdoptPlot` object, the following parameters are available:
+
+- **`expr`** (`str`): The equation string (e.g., `"y = 1/x"`).
+- **`lib`** (`Literal['contour', 'implicit', None]`): Forced rendering engine. Default is `None` (automatic selection).
+- **`xlims`, `ylims`** (`Tuple[float, float]`): Initial visible range for the plot. Default `(-20, 20)`.
+- **`n`** (`int`): Grid density for the `contour` engine. Default `10000`.
+- **`depth`** (`int`): Adaptive refinement depth for `plot_implicit`. Default `9`.
+- **`linewidth`** (`float`): Thickness of the plot line. Default `2.0`.
+- **`limit`** (`float | Tuple[float, float, float, float]`): Computational domain. Pass a single number (square) or a tuple of 4 numbers `(x_min, x_max, y_min, y_max)`. Default `100`.
+- **`color`** (`str`): Line color. Default `'blue'`.
+- **`legend`** (`bool`): Whether to display the legend. Default `True`.
+- **`points`** (`bool`): Whether to display axis intersection points. Default `True`.
+- **`grid`** (`bool`): Whether to display the grid. Default `True`.
+- **`interact`** (`bool`): Allow zooming and panning via keyboard (`Ctrl +` and `Ctrl -`). Default `True`.
+- **`show`** (`bool`): If `False`, the plot does not open immediately, allowing you to add elements. Default `True`.
+- **`text_legend`** (`str`): Additional text for the legend. Default `None`.
+## License
+
+Distributed under the **BSD 3-Clause** license.

adopt_plot-0.0.3/PKG-INFO

@@ -1,19 +0,0 @@
-Metadata-Version: 2.4
-Name: adopt-plot
-Version: 0.0.3
-Summary: A universal plotter for implicit functions using adaptive engine selection.
-Author: VartRusData
-License: BSD 3-Clause
-Classifier: License :: OSI Approved :: BSD License
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: sympy
-Requires-Dist: matplotlib
-Requires-Dist: numpy
-Dynamic: license-file
-
-# adopt-plot
-
-A simple Python library for plotting implicit functions with adaptive engine selection. 
-Just pass an equation and get a beautiful, mathematically correct plot.

adopt_plot-0.0.3/README.md

@@ -1,4 +0,0 @@
-# adopt-plot
-
-A simple Python library for plotting implicit functions with adaptive engine selection. 
-Just pass an equation and get a beautiful, mathematically correct plot.

adopt_plot-0.0.3/src/adopt_plot.egg-info/PKG-INFO

@@ -1,19 +0,0 @@
-Metadata-Version: 2.4
-Name: adopt-plot
-Version: 0.0.3
-Summary: A universal plotter for implicit functions using adaptive engine selection.
-Author: VartRusData
-License: BSD 3-Clause
-Classifier: License :: OSI Approved :: BSD License
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: sympy
-Requires-Dist: matplotlib
-Requires-Dist: numpy
-Dynamic: license-file
-
-# adopt-plot
-
-A simple Python library for plotting implicit functions with adaptive engine selection. 
-Just pass an equation and get a beautiful, mathematically correct plot.