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

{adopt_plot-0.0.1/src/adopt_plot.egg-info → adopt_plot-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: adopt-plot
-Version: 0.0.1
+Version: 0.0.3
 Summary: A universal plotter for implicit functions using adaptive engine selection.
 Author: VartRusData
 License: BSD 3-Clause

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "adopt-plot"
-version = "0.0.1"
+version = "0.0.3"
 description = "A universal plotter for implicit functions using adaptive engine selection."
 readme = "README.md"
 requires-python = ">=3.9"

{adopt_plot-0.0.1 → adopt_plot-0.0.3}/src/adopt_plot/__init__.py

@@ -4,5 +4,7 @@
 class TooManyVariablesError(ValueError):
     """Исключение, возникающее при попытке построить график для более чем двух переменных."""
     pass
+class PltNotFoundError(ModuleNotFoundError):
+    pass
 from .plot import AdoptPlot
 __all__ = ["AdoptPlot", "TooManyVariablesError"]

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

@@ -9,7 +9,7 @@ import re
 import sympy
 
 
-from . import TooManyVariablesError
+from . import TooManyVariablesError, PltNotFoundError
 
 def get_all_sympy_function_names():
     """Собирает имена всех встроенных функций и констант SymPy."""
@@ -126,7 +126,7 @@ class AdoptPlot():
             self.points = points
             self.grid = grid
             self.interact = interact
-            self.show = show
+            self.is_show = show
             self.limit = limit
             self.text_legend = text_legend
             # Получаем уравнения из поля ввода
@@ -263,10 +263,10 @@ class AdoptPlot():
             if self.lib == 'implicit' or (has_odz and self.lib is None):
                 from sympy.plotting import plot_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)
+                    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):
                     if len(self.limit) == 4:
-                        self.p = plot_implicit(self.eq, (var1, *self.limit[:2]), (var2, *self.limit[2:]), show=False, n=self.n, depth=self.depth)
+                        self.p = plot_implicit(self.eq, (var1, *self.limit[:2]), (var2, *self.limit[2:]), show=False, n=self.n, depth=self.depth, line_color=self.color)
                     else:
                         raise ValueError(f"Length mismatch (expected 4), got {len(self.limit)}.")
                 else:
@@ -283,8 +283,7 @@ class AdoptPlot():
 
                 # Три пустые линии для легенды (они не видны на графике, но создают текст в легенде)
                 self.ax.plot([], [], ' ', label=f"${latex(self.eq)}$")  # Красивое уравнение через LaTeX
-                self.ax.plot([], [], ' ', label=f"Пересечения с X: {x_coords_str}")  # Текст про X
-                self.ax.plot([], [], ' ', label=f"Пересечения с Y: {y_coords_str}")  # Текст про Y
+
 
 
                 patches = self.ax.patches
@@ -313,18 +312,19 @@ class AdoptPlot():
 
 
                 # Дальше твой код с точками и оформлением...
-                try:
 
-                    try:
+                try:
+                    if self.points:
+                        try:
 
-                        for x in x_intercepts: self.ax.scatter(x, 0, s=60, color='red', marker='o', zorder=5)
-                    except:
-                        pass
-                    try:
+                            for x in x_intercepts: self.ax.scatter(x, 0, s=60, color='red', marker='o', zorder=5, label=f"Пересечения с X: {x_coords_str}")
+                        except:
+                            pass
+                        try:
 
-                        for y in y_intercepts: self.ax.scatter(0, y, s=60, color='blue', marker='o', zorder=5)
-                    except:
-                        pass
+                            for y in y_intercepts: self.ax.scatter(0, y, s=60, color='blue', marker='o', zorder=5, label=f"Пересечения с Y: {y_coords_str}")
+                        except:
+                            pass
 
                     self.ax.axhline(0, color='black', linewidth=1)
                     self.ax.axvline(0, color='black', linewidth=1)
@@ -341,8 +341,10 @@ class AdoptPlot():
                     logging.warning(f"Ошибка при добавлении оформления на p.ax: {e}")
 
                 self.p.fig.tight_layout()
-                if self.show:
+                self.plt = self.p.plt
+                if self.is_show:
                     self.p.plt.show()
+
                 return
             else:
                 if isinstance(self.limit, (float, int)):
@@ -366,7 +368,7 @@ class AdoptPlot():
                 self.fig, self.ax = plt.subplots()
                 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='blue', linewidths=self.linewidth)
+                self.ax.contour(X, Y, Z, levels=[0], colors=self.color, linewidths=self.linewidth)
 
                 self.ax.plot([], [], ' ', label=f"Уравнение: ${latex(self.eq)}$")
 
@@ -391,11 +393,20 @@ class AdoptPlot():
                     self.ax.plot([], [], ' ', label=f"{self.text_legend}")
                 if self.legend:
                     self.ax.legend()
-                plt.show()
+                self.plt = plt
+
+                if self.is_show:
+
+                    self.plt.show()
 
         except Exception as e1:
             logging.warning(f"Matplotlib contour не сработал: {e1}")
             # Если контур упал (сингулярности), используем sympy.plot_implicit
             from sympy.plotting import plot_implicit
             p = plot_implicit(self.eq, (var1, -10, 10), (var2, -10, 10), show=False)
-            p.show()
+            p.show()
+    def show(self):
+        try:
+            self.plt.show()
+        except:
+            raise PltNotFoundError("plt Not Found")

{adopt_plot-0.0.1 → adopt_plot-0.0.3/src/adopt_plot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: adopt-plot
-Version: 0.0.1
+Version: 0.0.3
 Summary: A universal plotter for implicit functions using adaptive engine selection.
 Author: VartRusData
 License: BSD 3-Clause