pypsbuilder 2.4.1__tar.gz → 2.4.2__tar.gz

{pypsbuilder-2.4.1 → pypsbuilder-2.4.2}/CHANGELOG.md

@@ -1,8 +1,9 @@
 # Changelog
 All notable pypsbuilder changes.
 
-## master
-
+## [2.4.2] - 2024-04-23
+### Fixed
+ - another fix of and-ky-sill triple point linking
 ## [2.4.1] - 2024-03-07
 ### Fixed
  - fixed and-ky-sill triple point uniline suggestions

{pypsbuilder-2.4.1 → pypsbuilder-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypsbuilder
-Version: 2.4.1
+Version: 2.4.2
 Summary: THERMOCALC front-end for constructing and analyzing PT pseudosections
 Home-page: https://github.com/ondrolexa/pypsbuilder
 Author: Ondrej Lexa
@@ -88,8 +88,9 @@ pypsbuilder is free software: you can redistribute it and/or modify it under the
 # Changelog
 All notable pypsbuilder changes.
 
-## master
-
+## [2.4.2] - 2024-04-23
+### Fixed
+ - another fix of and-ky-sill triple point linking
 ## [2.4.1] - 2024-03-07
 ### Fixed
  - fixed and-ky-sill triple point uniline suggestions

{pypsbuilder-2.4.1 → pypsbuilder-2.4.2}/docs/conf.py

@@ -77,7 +77,7 @@ author = "Ondrej Lexa"
 # The short X.Y version.
 version = "2.4"
 # The full version, including alpha/beta/rc tags.
-release = "2.4.1"
+release = "2.4.2"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

{pypsbuilder-2.4.1 → pypsbuilder-2.4.2}/pypsbuilder/__init__.py

@@ -22,7 +22,7 @@ __all__ = (
     "get_tcapi",
 )
 
-__version__ = "2.4.1"
+__version__ = "2.4.2"
 __author__ = "Ondrej Lexa"
 __copyright__ = "© Ondrej Lexa 2024"
 __email__ = "lexa.ondrej@gmail.com"

{pypsbuilder-2.4.1 → pypsbuilder-2.4.2}/pypsbuilder/psclasses.py

@@ -282,8 +282,8 @@ class UniLine(PseudoBase):
             return candidate
 
         # Check for polymorphs
-        fixi, fixu = False, False
         for poly in polymorphs:
+            fixi, fixu = False, False
             if (
                 poly.issubset(ip.phases)
                 and (poly != ip.out)
@@ -292,20 +292,21 @@ class UniLine(PseudoBase):
                 fixi = True
                 if poly.issubset(self.phases) and not self.out.isdisjoint(poly):
                     fixu = True
+            # check invs
+            candidate = checkme(self.phases, self.out, ip.phases, ip.out)
+            if fixi and not candidate:
+                candidate = checkme(
+                    self.phases,
+                    self.out,
+                    ip.phases,
+                    ip.out.difference(poly).union(poly.difference(ip.out)),
+                )
+            if fixu and not candidate:
+                candidate = checkme(
+                    self.phases, poly.difference(self.out), ip.phases, ip.out
+                )
+            if candidate:
                 break
-        # check invs
-        candidate = checkme(self.phases, self.out, ip.phases, ip.out)
-        if fixi and not candidate:
-            candidate = checkme(
-                self.phases,
-                self.out,
-                ip.phases,
-                ip.out.difference(poly).union(poly.difference(ip.out)),
-            )
-        if fixu and not candidate:
-            candidate = checkme(
-                self.phases, poly.difference(self.out), ip.phases, ip.out
-            )
         return candidate
 
     def get_label_point(self):

{pypsbuilder-2.4.1 → pypsbuilder-2.4.2}/pypsbuilder/psexplorer.py

@@ -999,6 +999,8 @@ class PS:
         isopleths=False,
         which=7,
         smooth=0,
+        alpha=0.5,
+        lw=2,
     ):
         """Function to plot root squared error of calculated and estimated values.
 
@@ -1020,7 +1022,7 @@ class PS:
             fig (Figure): If not None, axes are added to fig and returned.
                 Default None
             fig_kw: dict passed to subplots method.
-            isopleths (bool): When True, searched isoplots are shown.Default False
+            isopleths (bool): When True, searched isopleths are shown. Default False
             which (int): Bitopt defining from where data are collected. 0 bit -
                 invariant points, 1 bit - uniariant lines and 2 bit - GridData
                 points
@@ -1036,6 +1038,7 @@ class PS:
         if len(args) % 3 == 0:
             if self.gridded:
                 err = []
+                prop_cycle = plt.rcParams["axes.prop_cycle"]
                 for phase, expr, val in zip(args[::3], args[1::3], args[2::3]):
                     if self.check_phase_expr(phase, expr):
                         err.append(
@@ -1068,13 +1071,19 @@ class PS:
                         interpolation=interpolation,
                         aspect="auto",
                         origin="lower",
+                        alpha=alpha,
                     )
                     ax.contour(self.xspace, self.yspace, err, colors="w")
                     if isopleths:
-                        for phase, expr, val in zip(args[::3], args[1::3], args[2::3]):
+                        for phase, expr, val, cc in zip(
+                            args[::3],
+                            args[1::3],
+                            args[2::3],
+                            prop_cycle.by_key()["color"],
+                        ):
                             if self.check_phase_expr(phase, expr):
                                 ax = self.isopleths_vector(
-                                    phase, expr, levels=[val], ax=ax
+                                    phase, expr, levels=[val], ax=ax, lw=lw, color=cc
                                 )
                     ax.plot(T, p, "r*", ms=20)
                     self.add_overlay(
@@ -1714,10 +1723,10 @@ class PS:
                     table(ax=ax, cellText=[val1, val2], colLabels=ox, loc="top")
             else:
                 if only is None:
-                    if show is None or show is True:
-                        ax.set_xlim(self.xrange)
-                        ax.set_ylim(self.yrange)
-                        ax.set_title("{}({})".format(phase, expr))
+                    # if show is None or show is True:
+                    ax.set_xlim(self.xrange)
+                    ax.set_ylim(self.yrange)
+                    ax.set_title("{}({})".format(phase, expr))
                 else:
                     ax.set_title("{} - {}({})".format(" ".join(only), phase, expr))
             # coords
@@ -1746,6 +1755,10 @@ class PS:
             fig (Figure): If not None, axes are added to fig and returned.
                 Default None
             fig_kw: dict passed to subplots method.
+            filename: If not None, figure is saved to file
+            save_kw: dict passed to savefig method.
+            show (bool): When False, Axes are returned, otherwise plot is shown.
+                Default True
 
         Example:
             >>> pt.overlap_isopleths(
@@ -1858,16 +1871,17 @@ class PS:
             overlay (bool): Whether to show assemblage fields. Default True
             high (frozenset or list): Highlight divariant fields identified
                 by key(s).
-            cmap (str): matplotlib colormap used to divariant fields coloring.
-                Colors are based on variance. Default 'viridis'.
+            cmap (str): matplotlib colormap used isopleths coloring. Default 'viridis'.
             bulk (bool): Whether to show bulk composition on top of diagram.
                 Default False.
             fig (Figure): If not None, axes are added to fig and returned.
                 Default None
             fig_kw: dict passed to subplots method.
+            lw (float): Linewidth of isopleths. Default 1.0
             ax (Axes): Axes to be used. Default None
             filename: If not None, figure is saved to file
             save_kw: dict passed to savefig method.
+            color: matplotlib color for isopleths. If None cmap is used. Default None.
             show (bool): When False, Axes are returned, otherwise plot is shown.
                 Default True
         """
@@ -1893,9 +1907,11 @@ class PS:
             method = kwargs.get("method", "rbf")
             rbf_func = kwargs.get("rbf_func", "thin_plate")
             cmap = kwargs.get("cmap", "viridis")
+            color = kwargs.get("color", None)
             colorbar = kwargs.get("colorbar", True)
             fig = kwargs.get("fig", None)
             fig_kw = kwargs.get("fig_kw", {})
+            lw = kwargs.get("lw", 1.0)
             ax = kwargs.get("ax", None)
             filename = kwargs.get("filename", None)
             save_kw = kwargs.get("save_kw", {})
@@ -2085,11 +2101,19 @@ class PS:
                                     for lnp in ln.geoms:
                                         lnp = lnp.simplify(tolerance=0.01)
                                         x, y = np.array(lnp.coords).T
-                                        ax.plot(x, y, color=mapper.to_rgba(v))
+                                        if color is None:
+                                            ax.plot(
+                                                x, y, color=mapper.to_rgba(v), lw=lw
+                                            )
+                                        else:
+                                            ax.plot(x, y, color=color, lw=lw)
                                 else:
                                     ln = ln.simplify(tolerance=0.01)
                                     x, y = np.array(ln.coords).T
-                                    ax.plot(x, y, color=mapper.to_rgba(v))
+                                    if color is None:
+                                        ax.plot(x, y, color=mapper.to_rgba(v), lw=lw)
+                                    else:
+                                        ax.plot(x, y, color=color, lw=lw)
             if only is None:
                 if overlay:
                     self.add_overlay(ax)

{pypsbuilder-2.4.1 → pypsbuilder-2.4.2}/pypsbuilder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypsbuilder
-Version: 2.4.1
+Version: 2.4.2
 Summary: THERMOCALC front-end for constructing and analyzing PT pseudosections
 Home-page: https://github.com/ondrolexa/pypsbuilder
 Author: Ondrej Lexa
@@ -88,8 +88,9 @@ pypsbuilder is free software: you can redistribute it and/or modify it under the
 # Changelog
 All notable pypsbuilder changes.
 
-## master
-
+## [2.4.2] - 2024-04-23
+### Fixed
+ - another fix of and-ky-sill triple point linking
 ## [2.4.1] - 2024-03-07
 ### Fixed
  - fixed and-ky-sill triple point uniline suggestions

{pypsbuilder-2.4.1 → pypsbuilder-2.4.2}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.4.1
+current_version = 2.4.2
 commit = True
 tag = True
 tag_name = {new_version}

{pypsbuilder-2.4.1 → pypsbuilder-2.4.2}/setup.py

@@ -15,7 +15,7 @@ requirements = ["numpy", "matplotlib>=3", "scipy", "networkx", "shapely>=2", "tq
 
 setup(
     name="pypsbuilder",
-    version="2.4.1",
+    version="2.4.2",
     description="THERMOCALC front-end for constructing and analyzing PT pseudosections",
     long_description=readme + "\n\n" + changelog,
     long_description_content_type="text/markdown",