py2ls 0.1.6.0__py3-none-any.whl → 0.1.6.1__py3-none-any.whl

py2ls/.git/logs/refs/remotes/origin/HEAD

@@ -123,3 +123,15 @@ a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be1
 a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be12 Jianfeng Liu <macjianfeng@JFLMBP.cin.medizin.uni-tuebingen.de> 1721298434 +0200	remote set-head
 a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be12 Jianfeng Liu <macjianfeng@JFLMBP.cin.medizin.uni-tuebingen.de> 1721300398 +0200	remote set-head
 a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be12 Jianfeng Liu <macjianfeng@JFLMBP.cin.medizin.uni-tuebingen.de> 1721302501 +0200	remote set-head
+a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be12 Jianfeng Liu <macjianfeng@JFLMBP.cin.medizin.uni-tuebingen.de> 1721304466 +0200	remote set-head
+a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be12 Jianfeng Liu <macjianfeng@JFLMBP.cin.medizin.uni-tuebingen.de> 1721306430 +0200	remote set-head
+a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be12 Jianfeng Liu <macjianfeng@JFLMBP.cin.medizin.uni-tuebingen.de> 1721308395 +0200	remote set-head
+a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be12 Jianfeng Liu <macjianfeng@JFLMBP.cin.medizin.uni-tuebingen.de> 1721310359 +0200	remote set-head
+a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be12 Jianfeng Liu <macjianfeng@JFLMBP.cin.medizin.uni-tuebingen.de> 1721312323 +0200	remote set-head
+a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be12 Jianfeng Liu <macjianfeng@JFLMBP.cin.medizin.uni-tuebingen.de> 1721314287 +0200	remote set-head
+a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be12 Jianfeng Liu <macjianfeng@JFLMBP.cin.medizin.uni-tuebingen.de> 1721316252 +0200	remote set-head
+a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be12 Jianfeng Liu <macjianfeng@JFLMBP.cin.medizin.uni-tuebingen.de> 1721318216 +0200	remote set-head
+a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be12 Jianfeng Liu <macjianfeng@JFLMBP.cin.medizin.uni-tuebingen.de> 1721320179 +0200	remote set-head
+a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be12 Jianfeng Liu <macjianfeng@JFLMBP.cin.medizin.uni-tuebingen.de> 1721322143 +0200	remote set-head
+a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be12 Jianfeng Liu <macjianfeng@JFLMBP.cin.medizin.uni-tuebingen.de> 1721324108 +0200	remote set-head
+a15389729850729fc7bd78a54f26fce77f30be12 a15389729850729fc7bd78a54f26fce77f30be12 Jianfeng Liu <macjianfeng@JFLMBP.cin.medizin.uni-tuebingen.de> 1721326072 +0200	remote set-head

py2ls/ips.py

@@ -2043,7 +2043,17 @@ def figsets(*args,**kwargs):
             box=['right','bottom'],
             xrot=-45,
             yangle=20,
-            font_sz = 2
+            font_sz = 2,
+            legend=dict(labels=['group_a','group_b'],
+                        loc='upper left',
+                        edgecolor='k',
+                        facecolor='r',
+                        title='title',
+                        fancybox=1,
+                        shadow=1,
+                        ncols=4,
+                        bbox_to_anchor=[-0.5,0.7],
+                        alignment='left')
         )
     """
     fig = plt.gcf()
@@ -2107,6 +2117,10 @@ def figsets(*args,**kwargs):
                 "tic" not in key.lower() and "tk" not in key.lower()
             ):
                 ax.set_zlabel(value, fontname=fontname)
+        if key=='xlabel' and isinstance(value,dict):
+            ax.set_xlabel(**value)
+        if key=='ylabel' and isinstance(value,dict):
+            ax.set_ylabel(**value)
         # tick location
         if "tic" in key.lower() or "tk" in key.lower():
             if ("loc" in key.lower()) or ("po" in key.lower()):
@@ -2278,7 +2292,12 @@ def figsets(*args,**kwargs):
         if "c" in key.lower() and ("sp" in key.lower() or "ax" in key.lower()):# spine color
             for loc, spi in ax.spines.items():
                 spi.set_color(value)
-            
+        if 'leg' in key.lower(): # legend
+            legend_kws = kwargs.get('legend', None)
+            if legend_kws:
+                # https://matplotlib.org/stable/api/_as_gen/matplotlib.pyplot.legend.html
+                ax.legend(**legend_kws) 
+    
     for arg in args:
         if isinstance(arg,matplotlib.axes._axes.Axes):
             ax=arg

py2ls/plot.py

@@ -333,8 +333,43 @@ def adjust_spines(ax=None, spines=['left', 'bottom'],distance=2):
     else:
         # no xaxis ticks
         ax.xaxis.set_ticks([])
-# And then plot the data:
-def figsets(*args):
+
+
+def figsets(*args,**kwargs):
+    """
+    usage:
+        figsets(ax=axs[1],
+            ylim=[0, 10],
+            spine=2,
+            xticklabel=['wake','sleep'],
+            yticksdddd=np.arange(0,316,60),
+            labels_loc=['right','top'],
+            ticks=dict(
+            ax='x',
+            which='minor',
+            direction='out',
+            width=2,
+            length=2,
+            c_tick='m',
+            pad=5,
+            label_size=11),
+            grid=dict(which='minor',
+                    ax='x',
+                    alpha=.4,
+                    c='b',
+                    ls='-.',
+                    lw=0.75,
+                    ),
+            supertitleddddd=f'sleep druations\n(min)',
+            c_spine='r',
+            minor_ticks='xy',
+            style='paper',
+            box=['right','bottom'],
+            xrot=-45,
+            yangle=20,
+            font_sz = 2
+        )
+    """
     fig = plt.gcf()
     fontsize = 11
     fontname = "Arial"
@@ -344,7 +379,7 @@ def figsets(*args):
         "scatter","ieee","no-latex","std-colors","high-vis","bright","dark_background","science",
         "high-vis","vibrant","muted","retro","grid","high-contrast","light","cjk-tc-font","cjk-kr-font",
     ]
-    def sets_priority(ax,key, value):
+    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})
@@ -376,13 +411,13 @@ def figsets(*args):
         if "la" in key.lower():
             if "loc" in key.lower() or "po" in key.lower():
                 for i in value:
-                    if "l" in i.lower():
-                        ax.yaxis.set_label_position("left")
-                    if "r" in i.lower():
+                    if "l" in i.lower() and not 'g' in i.lower():
+                        ax.yaxis.set_label_position("left") 
+                    if "r" in i.lower() and not 'o' in i.lower():
                         ax.yaxis.set_label_position("right")
-                    if "t" in i.lower():
+                    if "t" in i.lower() and not 'l' in i.lower():
                         ax.xaxis.set_label_position("top")
-                    if "b" in i.lower():
+                    if "b" in i.lower()and not 'o' in i.lower():
                         ax.xaxis.set_label_position("bottom")
             if ("x" in key.lower()) and (
                 "tic" not in key.lower() and "tk" not in key.lower()
@@ -448,18 +483,17 @@ def figsets(*args):
             if "y" in key.lower():
                 ax.tick_params(axis="y", rotation=value)
 
-        if "bo" in key in key:  # and ("p" in key or "l" in key):
-                # print("'ticks' style is recommended")
+        if "bo" in key in key:  # box setting, and ("p" in key or "l" in key):
             if isinstance(value, (str, list)):
                 locations = []
                 for i in value:
-                    if "l" in i.lower():
+                    if "l" in i.lower() and not 't' in i.lower():
                         locations.append("left")
-                    if "r" in i.lower():
+                    if "r" in i.lower()and not 'o' in i.lower(): # right
                         locations.append("right")
-                    if "t" in i.lower():
+                    if "t" in i.lower() and not 'r' in i.lower(): #top
                         locations.append("top")
-                    if "b" in i.lower():
+                    if "b" in i.lower() and not 't' in i.lower():
                         locations.append("bottom")
                     if i.lower() in ["a", "both", "all", "al", ":"]:
                         [
@@ -475,7 +509,7 @@ def figsets(*args):
                         spi.set_position(("outward", 0))
                     else:
                         spi.set_color("none")  # no spine
-        if key == "tick" or key == "ticks" or key == "ticks_para":
+        if 'tick' in key.lower(): # tick ticks tick_para ={}
             if isinstance(value, dict):
                 for k, val in value.items():
                     if "wh" in k.lower():
@@ -484,28 +518,28 @@ def figsets(*args):
                         )  # {'major', 'minor', 'both'}, default: 'major'
                     elif "dir" in k.lower():
                         ax.tick_params(direction=val)  # {'in', 'out', 'inout'}
-                    elif "len" in k.lower():
+                    elif "len" in k.lower():# length
                         ax.tick_params(length=val)
-                    elif ("wid" in k.lower()) or ("wd" in k.lower()):
+                    elif ("wid" in k.lower()) or ("wd" in k.lower()): # width
                         ax.tick_params(width=val)
-                    elif "ax" in k.lower():
+                    elif "ax" in k.lower(): # ax
                         ax.tick_params(axis=val)  # {'x', 'y', 'both'}, default: 'both'
                     elif ("c" in k.lower()) and ("ect" not in k.lower()):
                         ax.tick_params(colors=val)  # Tick color.
-                    elif "pad" in k.lower():
+                    elif "pad" in k.lower() or 'space' in k.lower():
                         ax.tick_params(
                             pad=val
                         )  # float, distance in points between tick and label
                     elif (
-                        ("lab" in k.lower())
+                        ("lab" in k.lower() or 'text' in k.lower())
                         and ("s" in k.lower())
                         and ("z" in k.lower())
-                    ):
+                    ): # label_size
                         ax.tick_params(
                             labelsize=val
                         )  # float, distance in points between tick and label
 
-        if "mi" in key.lower() and "tic" in key.lower():
+        if "mi" in key.lower() and "tic" in key.lower():# minor_ticks
             if "x" in value.lower() or "x" in key.lower():
                 ax.xaxis.set_minor_locator(tck.AutoMinorLocator())  # ax.minorticks_on()
             if "y" in value.lower() or "y" in key.lower():
@@ -516,16 +550,16 @@ def figsets(*args):
                 ax.minorticks_on()
         if key == "colormap" or key == "cmap":
             plt.set_cmap(value)
-    def sets_small(ax,key, value):
+    def set_step_2(ax,key, value):
         if key == "figsize":
             pass
-        if key == "xlim":
+        if "xlim" in key.lower():
             ax.set_xlim(value)
-        if key == "ylim":
+        if "ylim" in key.lower():
             ax.set_ylim(value)
-        if key == "zlim":
+        if "zlim" in key.lower():
             ax.set_zlim(value)
-        if "sc" in key.lower():
+        if "sc" in key.lower(): #scale
             if "x" in key.lower():
                 ax.set_xscale(value)
             if "y" in key.lower():
@@ -535,19 +569,19 @@ def figsets(*args):
         if key == "grid":
             if isinstance(value, dict):
                 for k, val in value.items():
-                    if "wh" in k.lower():
+                    if "wh" in k.lower(): # which
                         ax.grid(
                             which=val
                         )  # {'major', 'minor', 'both'}, default: 'major'
-                    elif "ax" in k.lower():
+                    elif "ax" in k.lower(): # ax
                         ax.grid(axis=val)  # {'x', 'y', 'both'}, default: 'both'
-                    elif ("c" in k.lower()) and ("ect" not in k.lower()):
+                    elif ("c" in k.lower()) and ("ect" not in k.lower()): # c: color
                         ax.grid(color=val)  # Tick color.
-                    elif "l" in k.lower() and ("s" in k.lower()):
+                    elif "l" in k.lower() and ("s" in k.lower()):# ls:line stype
                         ax.grid(linestyle=val)
-                    elif "l" in k.lower() and ("w" in k.lower()):
+                    elif "l" in k.lower() and ("w" in k.lower()): # lw: line width
                         ax.grid(linewidth=val)
-                    elif "al" in k.lower():
+                    elif "al" in k.lower():# alpha:
                         ax.grid(alpha=val)
             else:
                 if value == "on" or value is True:
@@ -565,23 +599,26 @@ def figsets(*args):
                     adjust_spines(ax)  # dafault distance=2
             if isinstance(value, (float, int)):
                 adjust_spines(ax=ax, distance=value)
-        if "c" in key.lower() and ("sp" in key.lower() or "ax" in key.lower()):
+        if "c" in key.lower() and ("sp" in key.lower() or "ax" in key.lower()):# spine color
             for loc, spi in ax.spines.items():
                 spi.set_color(value)
-
+            
     for arg in args:
         if isinstance(arg,matplotlib.axes._axes.Axes):
             ax=arg
             args=args[1:]
-    if 'ax' not in locals():
+    ax = kwargs.get('ax',plt.gca())
+    if 'ax' not in locals() or ax is None:
         ax=plt.gca()
-
+    for key, value in kwargs.items():
+        set_step_1(ax, key, value)
+        set_step_2(ax, key, value)
     for arg in args:
         if isinstance(arg, dict):
             for k, val in arg.items():
-                sets_priority(ax,k, val)
+                set_step_1(ax,k, val)
             for k, val in arg.items():
-                sets_small(ax,k, val)
+                set_step_2(ax,k, val)
         else:
             Nargin = len(args) // 2
             ax.labelFontSizeMultiplier = 1
@@ -591,11 +628,11 @@ def figsets(*args):
             for ip in range(Nargin):
                 key = args[ip * 2].lower()
                 value = args[ip * 2 + 1]
-                sets_priority(ax,key, value)
+                set_step_1(ax,key, value)
             for ip in range(Nargin):
                 key = args[ip * 2].lower()
                 value = args[ip * 2 + 1]
-                sets_small(ax,key, value)
+                set_step_2(ax,key, value)
     colors = [
         "#474747",
         "#FF2C00",
@@ -611,55 +648,5 @@ def figsets(*args):
         plt.gcf().align_labels()
 
 
-def figsave(*args,dpi=300):
-    dir_save = None
-    fname = None 
-    for arg in args:
-        if isinstance(arg, str):
-            if '/' in arg or '\\' in arg:
-                dir_save = arg
-            elif '/' not in arg and '\\' not in arg:
-                fname = arg
-    # Backup original values
-    if '/' in dir_save:
-        if dir_save[-1] != '/':
-            dir_save = dir_save + '/'
-    elif '\\' in dir_save:
-        if dir_save[-1] != '\\':
-            dir_save = dir_save + '\\'
-    else:
-        raise ValueError('Check the Path of dir_save Directory')
-    ftype = fname.split('.')[-1]
-    if len(fname.split('.')) == 1:
-        ftype = 'nofmt'
-        fname = dir_save + fname + '.' + ftype
-    else:
-        fname = dir_save + fname
-    # Save figure based on file type
-    if ftype.lower() == 'eps':
-        plt.savefig(fname, format='eps', bbox_inches='tight')
-        plt.savefig(fname.replace('.eps', '.pdf'),
-                    format='pdf', bbox_inches='tight',dpi=dpi)
-    elif ftype.lower() == 'nofmt': # default: both "tif" and "pdf"
-        fname_corr=fname.replace('nofmt','pdf')
-        plt.savefig(fname_corr, format='pdf', bbox_inches='tight',dpi=dpi)
-        fname=fname.replace('nofmt','tif')
-        plt.savefig(fname, format='tiff', dpi=dpi, bbox_inches='tight')
-        print(f"default saving filetype: both 'tif' and 'pdf")
-    elif ftype.lower() == 'pdf':
-        plt.savefig(fname, format='pdf', bbox_inches='tight',dpi=dpi)
-    elif ftype.lower() in ['jpg', 'jpeg']:
-        plt.savefig(fname, format='jpeg', dpi=dpi, bbox_inches='tight')
-    elif ftype.lower() == 'png':
-        plt.savefig(fname, format='png', dpi=dpi,
-                    bbox_inches='tight', transparent=True)
-    elif ftype.lower() in ['tiff', 'tif']:
-        plt.savefig(fname, format='tiff', dpi=dpi, bbox_inches='tight')
-    elif ftype.lower() == 'emf':
-        plt.savefig(fname, format='emf', dpi=dpi, bbox_inches='tight')
-    elif ftype.lower() == 'fig':
-        plt.savefig(fname, format='pdf', bbox_inches='tight',dpi=dpi)
-    print(f'\nSaved @: dpi={dpi}\n{fname}')
-
 def get_cmap():
     return plt.colormaps()

{py2ls-0.1.6.0.dist-info → py2ls-0.1.6.1.dist-info}/METADATA

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

{py2ls-0.1.6.0.dist-info → py2ls-0.1.6.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-py2ls/.DS_Store,sha256=jsc3BMbeCYhUpyXqdRFfTdhu4W-R3wYJ1vXblV_RcvU,6148
+py2ls/.DS_Store,sha256=l7m93mLt2ckidOORlgzbfdGcDJ5emCexs-GHEiKbEaQ,6148
 py2ls/.git/COMMIT_EDITMSG,sha256=EBFQ6F6FLLKqdBpaLROBL68CNyHmTvOC--uM_TlZ6KI,11
 py2ls/.git/FETCH_HEAD,sha256=ZYJf1HGynl3E4z5mK-iNYPEV63GUwDCoI31sbgjlgL0,100
 py2ls/.git/HEAD,sha256=KNJb-Cr0wOK3L1CVmyvrhZ4-YLljCl6MYD2tTdsrboA,21
@@ -21,7 +21,7 @@ py2ls/.git/index,sha256=XDvwp0KaZw_2pZgn1OPTmqBe78Abnq6O-xcw_aZuOB8,1855
 py2ls/.git/info/exclude,sha256=ZnH-g7egfIky7okWTR8nk7IxgFjri5jcXAbuClo7DsE,240
 py2ls/.git/logs/HEAD,sha256=0Al8yWeB2OiUKgtEdzKf8Kx9p8_1WI1Mx_X2DXQCbU0,3227
 py2ls/.git/logs/refs/heads/main,sha256=0Al8yWeB2OiUKgtEdzKf8Kx9p8_1WI1Mx_X2DXQCbU0,3227
-py2ls/.git/logs/refs/remotes/origin/HEAD,sha256=sQ4JNeAIjzuiiff10hVIzpu7z8LWIChvpGBPjTmcWsQ,20902
+py2ls/.git/logs/refs/remotes/origin/HEAD,sha256=Ofz2UGxUefJXTI9_-ai1ypszAHLZDEmoOEgG0MK7dRk,23038
 py2ls/.git/logs/refs/remotes/origin/main,sha256=oKNSm-3X1G53hmgJH1DL6RHf4sTppI3Xe-ljAB2ETJA,2888
 py2ls/.git/objects/01/d5bd8065e6860c0bd23ff9fa57161806a099e1,sha256=hEQ8nqJnGsfFsuV5wc4cZas58rehXvT0v5ANx1zmMAY,584
 py2ls/.git/objects/09/08da26de58c114225ad81f484b80bf5d351b34,sha256=NOyYvrJxATpK3aDdP1_stwkqOQRDwJn7DSy6isyKImE,925
@@ -133,14 +133,14 @@ py2ls/data/lang_code_iso639.json,sha256=qZiU7H2RLJjDMXK22C-jhwzLJCI5vKmampjB1ys4
 py2ls/db2ls.py,sha256=MMfFX47aIPIyu7fU9aPvX9lbPRPYOpJ_VXwlnWk-8qo,13615
 py2ls/doc.py,sha256=xN3g1OWfoaGUhikbJ0NqbN5eKy1VZVvWwRlhHMgyVEc,4243
 py2ls/freqanalysis.py,sha256=F4218VSPbgL5tnngh6xNCYuNnfR-F_QjECUUxrPYZss,32594
-py2ls/ips.py,sha256=wbKjFnF3FwLkV-aEX53R-TwAf9NNOatB-wA79MT0V68,99593
+py2ls/ips.py,sha256=AaB2GGZmEG_jY3zqZ1qIIdUYSmwWB5pxrISm9HdcCTE,100423
 py2ls/netfinder.py,sha256=ZsLWGYMeRuGvxj2nqE0Z8ANoaVl18Necfw0HQfh2q7I,45548
-py2ls/plot.py,sha256=Yu7aGCH8WTTUpcXOO6pJjjKntPT9VQ-kckx02fJWxdA,25563
+py2ls/plot.py,sha256=jEPy4G-8H9H4kV2bPUpHE2kdS5E0QHu8ruWwEPCVxOU,24876
 py2ls/setuptools-70.1.0-py3-none-any.whl,sha256=2bi3cUVal8ip86s0SOvgspteEF8SKLukECi-EWmFomc,882588
 py2ls/sleep_events_detectors.py,sha256=36MCuRrpurn0Uvzpo3p3b3_JlVsRNHSWCXbJxCGM3mg,51546
 py2ls/stats.py,sha256=Wd9yCKQ_61QD29WMEgMuEcreFxF91NmlPW65iWT2B5w,39041
 py2ls/translator.py,sha256=6S7MmTZmjj8NljVmj0W5uEauu4ePxso3AMf2LvGVRQA,30516
 py2ls/wb_detector.py,sha256=7y6TmBUj9exCZeIgBAJ_9hwuhkDh1x_-yg4dvNY1_GQ,6284
-py2ls-0.1.6.0.dist-info/METADATA,sha256=Kj2bqmZmUw-wBFtBjXd_zkvwe8KSobjKB_0jJXzFZxo,17943
-py2ls-0.1.6.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-py2ls-0.1.6.0.dist-info/RECORD,,
+py2ls-0.1.6.1.dist-info/METADATA,sha256=q3UMQWGGRezjD_20oGOajmiKe5t1qzePfICwPaGe1rQ,17943
+py2ls-0.1.6.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+py2ls-0.1.6.1.dist-info/RECORD,,