py2ls 0.1.8.0__py3-none-any.whl → 0.1.8.2__py3-none-any.whl

py2ls/plot.py

@@ -17,7 +17,7 @@ def catplot(data, *args, **kwargs):
         data (array): data matrix
     """
 
-    def plot_bars(data_m, opt_b, xloc, ax):
+    def plot_bars(data, data_m, opt_b, xloc, ax):
         bar_positions = get_positions(
             xloc, opt_b["loc"], opt_b["x_width"], data.shape[0]
         )
@@ -344,8 +344,6 @@ def catplot(data, *args, **kwargs):
             np.linspace(0, 1, data.shape[1] - len(opt["c"]))
         )
         opt["c"] = np.vstack([opt["c"], additional_colors[:, :3]])
-    if isinstance(opt["c"], dict):
-        opt["c"] = opt["c"]["c"]
 
     opt.setdefault("loc", {})
     opt["loc"].setdefault("go", 0)
@@ -476,7 +474,7 @@ def catplot(data, *args, **kwargs):
     layers = sort_catplot_layers(opt["layer"])
     for layer in layers:
         if layer == "b" and opt["b"]["go"]:
-            plot_bars(data_m, opt["b"], xloc, ax)
+            plot_bars(data, data_m, opt["b"], xloc, ax)
         elif layer == "e" and opt["e"]["go"]:
             plot_errors(data, data_m, opt["e"], xloc, ax)
         elif layer == "s" and opt["s"]["go"]:
@@ -642,7 +640,7 @@ def figsets(*args, **kwargs):
             box=['right','bottom'],
             xrot=-45,
             yangle=20,
-            font_sz = 2,
+            font_sz = 12,
             legend=dict(labels=['group_a','group_b'],
                         loc='upper left',
                         edgecolor='k',
@@ -685,7 +683,8 @@ def figsets(*args, **kwargs):
     def set_step_1(ax, key, value):
         if ("fo" in key) and (("size" in key) or ("sz" in key)):
             fontsize = value
-            plt.rcParams.update({"font.size": value})
+            print(fontsize)
+            plt.rcParams.update({"font.size": fontsize})
         # style
         if "st" in key.lower() or "th" in key.lower():
             if isinstance(value, str):
@@ -786,15 +785,18 @@ def figsets(*args, **kwargs):
         # rotation
         if "angle" in key.lower() or ("rot" in key.lower()):
             if "x" in key.lower():
-                ax.tick_params(axis="x", rotation=value)
-                for tick in ax.get_xticklabels():
-                    if value in [0, 90, 180, 270]:
+                if value in [0, 90, 180, 270]:
+                    ax.tick_params(axis="x", rotation=value)
+                    for tick in ax.get_xticklabels():
                         tick.set_horizontalalignment("center")
-                    else:
-                        if value > 0:
-                            tick.set_horizontalalignment("right")
-                        elif value < 0:
-                            tick.set_horizontalalignment("left")
+                elif value > 0:
+                    ax.tick_params(axis="x", rotation=value)
+                    for tick in ax.get_xticklabels():
+                        tick.set_horizontalalignment("right")
+                elif value < 0:
+                    ax.tick_params(axis="x", rotation=value)
+                    for tick in ax.get_xticklabels():
+                        tick.set_horizontalalignment("left")
             if "y" in key.lower():
                 ax.tick_params(axis="y", rotation=value)
                 for tick in ax.get_yticklabels():
@@ -976,8 +978,13 @@ def figsets(*args, **kwargs):
 from cycler import cycler
 
 
-# set up the colorlist, give the number, or the colormap's name
-def get_color(n=1, cmap="auto", by="start"):
+def get_color(
+    n: int = 1,
+    cmap: str = "auto",
+    by: str = "start",
+    alpha: float = 1.0,
+    output: str = "rgb",
+):
     # Extract the colormap as a list
     def cmap2hex(cmap_name):
         cmap_ = matplotlib.pyplot.get_cmap(cmap_name)
@@ -985,7 +992,7 @@ def get_color(n=1, cmap="auto", by="start"):
         return [matplotlib.colors.rgb2hex(color) for color in colors]
         # usage: clist = cmap2hex("viridis")
 
-    # cycle times, total number is n (defaultn=10)
+    # Cycle times, total number is n (default n=10)
     def cycle2list(colorlist, n=10):
         cycler_ = cycler(tmp=colorlist)
         clist = []
@@ -995,20 +1002,23 @@ def get_color(n=1, cmap="auto", by="start"):
                 break
         return clist
 
-    def hue2rgb(hex_colors):
-        def hex_to_rgb(hex_color):
-            """Converts a hexadecimal color code to RGB values."""
-            if hex_colors.startswith("#"):
+    # Converts hexadecimal color codes to RGBA values
+    def hue2rgb(hex_colors, alpha=1.0):
+        def hex_to_rgba(hex_color, alpha=1.0):
+            """Converts a hexadecimal color code to RGBA values."""
+            if hex_color.startswith("#"):
                 hex_color = hex_color.lstrip("#")
-            return tuple(int(hex_color[i : i + 2], 16) / 255.0 for i in (0, 2, 4))
+            rgb = tuple(int(hex_color[i : i + 2], 16) / 255.0 for i in (0, 2, 4))
+            return rgb + (alpha,)
 
         if isinstance(hex_colors, str):
-            return hex_to_rgb(hex_colors)
-        elif isinstance(hex_colors, (list)):
-            """Converts a list of hexadecimal color codes to a list of RGB values."""
-            rgb_values = [hex_to_rgb(hex_color) for hex_color in hex_colors]
-            return rgb_values
+            return hex_to_rgba(hex_colors, alpha)
+        elif isinstance(hex_colors, list):
+            """Converts a list of hexadecimal color codes to a list of RGBA values."""
+            rgba_values = [hex_to_rgba(hex_color, alpha) for hex_color in hex_colors]
+            return rgba_values
 
+    # Determine color list based on cmap parameter
     if "aut" in cmap:
         colorlist = [
             "#474747",
@@ -1021,8 +1031,9 @@ def get_color(n=1, cmap="auto", by="start"):
         ]
     else:
         colorlist = cmap2hex(cmap)
+
+    # Determine method for generating color list
     if "st" in by.lower() or "be" in by.lower():
-        # cycle it
         clist = cycle2list(colorlist, n=n)
     if "l" in by.lower() or "p" in by.lower():
         clist = []
@@ -1031,8 +1042,16 @@ def get_color(n=1, cmap="auto", by="start"):
             for i in [int(i) for i in np.linspace(0, len(colorlist) - 1, n)]
         ]
 
-    return clist  # a color list
-    # example usage: clist = get_color(4,cmap="auto", by="start") # get_color(4, cmap="hot", by="linspace")
+    if output == "rgb":
+        return hue2rgb(clist, alpha)
+    elif output == "hue":
+        return clist
+    else:
+        raise ValueError("Invalid output type. Choose 'rgb' or 'hue'.")
+
+    # # Example usage
+    # colors = get_color(n=5, cmap="viridis", by="linear", alpha=0.5)
+    # print(colors)
 
 
 """ 

{py2ls-0.1.8.0.dist-info → py2ls-0.1.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2ls
-Version: 0.1.8.0
+Version: 0.1.8.2
 Summary: py(thon)2(too)ls
 Author: Jianfeng
 Author-email: Jianfeng.Liu0413@gmail.com

{py2ls-0.1.8.0.dist-info → py2ls-0.1.8.2.dist-info}/RECORD

@@ -134,14 +134,14 @@ py2ls/db2ls.py,sha256=MMfFX47aIPIyu7fU9aPvX9lbPRPYOpJ_VXwlnWk-8qo,13615
 py2ls/doc.py,sha256=xN3g1OWfoaGUhikbJ0NqbN5eKy1VZVvWwRlhHMgyVEc,4243
 py2ls/export_requirements.py,sha256=x2WgUF0jYKz9GfA1MVKN-MdsM-oQ8yUeC6Ua8oCymio,2325
 py2ls/freqanalysis.py,sha256=F4218VSPbgL5tnngh6xNCYuNnfR-F_QjECUUxrPYZss,32594
-py2ls/ips.py,sha256=KkrkGAF0VQ-N0rH4FQFLyP-C-skY6EPpeO8t_5RngWw,88519
+py2ls/ips.py,sha256=nGGA9Xqa5MzU5X7aE7Mfkk0qrnOkn3DGYulKuh-Ew48,100571
 py2ls/netfinder.py,sha256=MY_0TQY_zaRBZ6wfR4RxNCGrU93HFmDVDRRy1EXl75o,47566
-py2ls/plot.py,sha256=iCbLxxQNAswBI3jEYDwjVF_gl3npI4AVskgezs0bjvQ,49322
+py2ls/plot.py,sha256=2SVycCCPQG_N7Z6dYDCCMBXDyddogbpIu0SkjXJNI5M,49877
 py2ls/setuptools-70.1.0-py3-none-any.whl,sha256=2bi3cUVal8ip86s0SOvgspteEF8SKLukECi-EWmFomc,882588
 py2ls/sleep_events_detectors.py,sha256=bQA3HJqv5qnYKJJEIhCyhlDtkXQfIzqksnD0YRXso68,52145
 py2ls/stats.py,sha256=Wd9yCKQ_61QD29WMEgMuEcreFxF91NmlPW65iWT2B5w,39041
 py2ls/translator.py,sha256=bc5FB-wqC4TtQz9gyCP1mE38HqNRJ_pmuRIgKnAlMzM,30581
 py2ls/wb_detector.py,sha256=7y6TmBUj9exCZeIgBAJ_9hwuhkDh1x_-yg4dvNY1_GQ,6284
-py2ls-0.1.8.0.dist-info/METADATA,sha256=LHHeX9JGLb7F_vomtiA9FB9QAwcyan7L_pspKLUN7L8,20017
-py2ls-0.1.8.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-py2ls-0.1.8.0.dist-info/RECORD,,
+py2ls-0.1.8.2.dist-info/METADATA,sha256=ZnmByp2nveooGWTwA9izvfzp7U-KgLT7vsaEtU9LteY,20017
+py2ls-0.1.8.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+py2ls-0.1.8.2.dist-info/RECORD,,