siat 3.7.29__py3-none-any.whl → 3.8.2__py3-none-any.whl

siat/grafix.py

@@ -124,7 +124,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
               resample_freq='H',loc='best', \
               date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
               mark_top=True,mark_bottom=True,mark_end=True, \
-              facecolor='whitesmoke'):
+              facecolor='whitesmoke',maxticks=10,translate=False):
     """
     功能：绘制折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -136,6 +136,8 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     注意1：需要日期类型作为df索引
     注意2：date_freq不为False时，必须设置date_range=True，否则无法完成日期设置！
     """
+    DEBUG=False
+    
     import pandas as pd
     
     #空值判断
@@ -176,6 +178,10 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     lwadjust=linewidth_adjust(df)
     
     #if 'filled' not in list(df):
+    if translate:
+        collabel=lang_auto2(collabel)
+        
+    if DEBUG: print(f"df.index: {df.index}")
     plt.plot(df.index,df[colname],'-',label=collabel, \
              linestyle='-',color='blue', linewidth=lwadjust)
     """
@@ -243,7 +249,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
         x_end = df_end[colname].idxmin() # 末端值的x坐标 
         
         #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
-        y1=str(round(y_end,2)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 1 else str(round(y_end,3)) 
+        y1=str(round(y_end,1)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 1 else str(round(y_end,3)) 
         plt.annotate(text=' '+y1, 
                      xy=(x_end, y_end),
                      xytext=(x_end, y_end),fontsize=annotate_size)
@@ -286,6 +292,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
             plt.fill_between(df.index,attention_value_area[0],attention_value_area[1],color='lightgray',alpha=0.5)
     
     import pandas as pd
+    from datetime import datetime; date_format="%Y-%m-%d" 
     if not attention_point=='':
         if isinstance(attention_point,str) or isinstance(attention_point,int) or isinstance(attention_point,float):
             atp_list=[attention_point]
@@ -304,9 +311,12 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
                 
                 #判断是否日期字符串
                 try:
+                    #at=datetime.strptime(at, date_format)
                     atpd=pd.to_datetime(at)
                 except:
                     atpd=at
+                    
+                if DEBUG: print(f"atpd={atpd}")
                 plt.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+str(at))
 
     if not attention_point_area=='':
@@ -314,12 +324,18 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
             apa_list=[]
             for ap in attention_point_area:
                 try:
+                    #ap=datetime.strptime(ap, date_format)
                     appd=pd.to_datetime(ap)
                 except:
                     appd=ap
                 apa_list=apa_list+[appd]
                 
             yaxis_data=plt.ylim()
+            
+            if DEBUG: 
+                print(f"yaxis_data={yaxis_data}")
+                print(f"apa_list[0]={apa_list[0]}")
+                print(f"apa_list[1]={apa_list[1]}")
             plt.fill_betweenx(yaxis_data,apa_list[0],apa_list[1],color='powderblue',alpha=0.5)
 
     if average_value:
@@ -352,7 +368,11 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     if ylabeltxt != '' or average_value or isinstance(zeroline,bool):
         if haveLegend:
             plt.legend(loc=loc,fontsize=legend_txt_size)
-
+    
+    # 使用 AutoDateLocator 自动选择最佳间隔，目的是显示最后一个日期，亲测有效！！！
+    import matplotlib.dates as mdates
+    ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))
+    
     plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
     try:
         plt.gca().set_facecolor(facecolor) #设置画布背景颜色
@@ -362,6 +382,11 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     
     if '基金' in titletxt and '收盘价' in ylabeltxt and not ('基金指数' in titletxt):
         ylabeltxt=ylabeltxt.replace('收盘价','单位净值')
+
+    if translate:
+        ylabeltxt=lang_auto2(ylabeltxt)
+        footnote=lang_auto2(footnote)
+        titletxt=lang_auto2(titletxt)
         
     plt.ylabel(ylabeltxt,fontsize=ylabel_txt_size)
     plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
@@ -610,6 +635,7 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
 
     #是否绘制垂直线
     import pandas as pd
+    from datetime import datetime; date_format="%Y-%m-%d"
     if xline != 999:
         attention_point=xline
         #用于关注点的颜色列表
@@ -633,6 +659,7 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
                 
                 #判断是否日期字符串
                 try:
+                    at=datetime.strptime(at, date_format)
                     atpd=pd.to_datetime(at)
                 except:
                     atpd=at
@@ -647,6 +674,7 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
             apa_list=[]
             for ap in attention_point_area:
                 try:
+                    ap=datetime.strptime(ap, date_format)
                     appd=pd.to_datetime(ap)
                 except:
                     appd=ap
@@ -869,6 +897,7 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
 
     #是否绘制垂直线
     import pandas as pd
+    from datetime import datetime; date_format="%Y-%m-%d"
     if xline != 999:
         attention_point=xline
         #用于关注点的颜色列表
@@ -891,6 +920,7 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
                 
                 #判断是否日期字符串
                 try:
+                    at=datetime.strptime(at, date_format)
                     atpd=pd.to_datetime(at)
                 except:
                     atpd=at
@@ -905,6 +935,7 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
             apa_list=[]
             for ap in attention_point_area:
                 try:
+                    ap=datetime.strptime(ap, date_format)
                     appd=pd.to_datetime(ap)
                 except:
                     appd=ap
@@ -1073,6 +1104,7 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
 
     #绘制关注点
     import pandas as pd
+    from datetime import datetime; date_format="%Y-%m-%d"
     if xline != 999:
         attention_point=xline
         
@@ -1100,6 +1132,7 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
                 
                 #判断是否日期字符串
                 try:
+                    at=datetime.strptime(at, date_format)
                     atpd=pd.to_datetime(at)
                 except:
                     atpd=at
@@ -1110,6 +1143,7 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
             apa_list=[]
             for ap in attention_point_area:
                 try:
+                    ap=datetime.strptime(ap, date_format)
                     appd=pd.to_datetime(ap)
                 except:
                     appd=ap
@@ -1304,6 +1338,7 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
 
     #绘制关注点
     import pandas as pd
+    from datetime import datetime; date_format="%Y-%m-%d"
     if xline != 999:
         attention_point=xline
         
@@ -1331,6 +1366,7 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
                 
                 #判断是否日期字符串
                 try:
+                    at=datetime.strptime(at, date_format)
                     atpd=pd.to_datetime(at)
                 except:
                     atpd=at
@@ -1341,6 +1377,7 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
             apa_list=[]
             for ap in attention_point_area:
                 try:
+                    ap=datetime.strptime(ap, date_format)
                     appd=pd.to_datetime(ap)
                 except:
                     appd=ap
@@ -1478,11 +1515,12 @@ if __name__ =="__main__":
 
 def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                data_label=True,resample_freq='H',smooth=True,linewidth=1.5, \
-               loc='best',annotate=False,annotate_value=False,plus_sign=False, \
+               band_area='',loc='best', \
+                   annotate=False,annotate_value=False,plus_sign=False, \
                 attention_value='',attention_value_area='', \
                 attention_point='',attention_point_area='', \
                mark_top=False,mark_bottom=False,mark_end=False, \
-               ticker_type='auto',facecolor='whitesmoke'):
+               ticker_type='auto',facecolor='whitesmoke',maxticks=10,translate=False):
     """
     函数功能：根据df的内容绘制折线图
     输入参数：
@@ -1500,6 +1538,10 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     注意：需要日期类型作为df索引
     """
     DEBUG=False
+    if DEBUG:
+        print(f"band_area={band_area}")
+        print(f"df0={df0}")
+
     
     if DEBUG:
         print("annotate=",annotate,"annotate_value=",annotate_value)
@@ -1552,6 +1594,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     firstline=True
     
     #绘制折线图
+    ax=plt.gca()
     print('')
     y_end_list=[]    
     for c in collist:
@@ -1598,7 +1641,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                 clabel=c+str(round(dfg[c].values[0],2))
             else:
                 clabel=c
-            plt.plot(dfg,label=clabel,linewidth=lwadjust,ls=lsc,marker=mkc,markersize=3)
+            plt.plot(dfg,label=auto_translate2(clabel,translate),linewidth=lwadjust,ls=lsc,marker=mkc,markersize=3)
         else:
             plt.plot(dfg,linewidth=lwadjust,ls=lsc,marker=mkc,markersize=3)
             
@@ -1615,12 +1658,12 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             if annotate_value: #在标记曲线名称的同时标记其末端数值
                 #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
                 y1=str(round(y_end,2)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 1 else str(round(y_end,3))
-                plt.annotate(text=c+':'+y1, 
+                plt.annotate(text=' '+auto_translate2(c,translate)+':'+y1, 
                              xy=(x_end, y_end),
                              xytext=(x_end, y_end),fontsize=annotate_size,
                              color=last_line_color)
             else:
-                plt.annotate(text=c, 
+                plt.annotate(text=' '+auto_translate2(c,translate), 
                              xy=(x_end, y_end),
                             #xytext=(x_end, y_end),fontsize=9)
                              xytext=(x_end, y_end),fontsize=annotate_size,
@@ -1669,7 +1712,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             x_end = df_end[c].idxmin() # 末端值的x坐标 
             
             #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
-            y1=str(round(y_end,2)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 1 else str(round(y_end,3))
+            y1=str(round(y_end,1)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 1 else str(round(y_end,3))
             plt.annotate(text=' '+y1, 
                          xy=(x_end, y_end),
                          xytext=(x_end, y_end),fontsize=annotate_size,
@@ -1696,8 +1739,35 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     if not attention_value_area=='':
         if isinstance(attention_value_area,list) and len(attention_value_area)>=2:
             plt.fill_between(dfg.index,attention_value_area[0],attention_value_area[1],color='lightgray',alpha=0.5)
+
+    #绘制曲线之间的带状区域
+    if DEBUG:
+        print(f"dfg={dfg}")
+        
+    if band_area != '' and isinstance(band_area,list) and len(band_area)>=2:
+        upper_line=band_area[0]; lower_line=band_area[1]
+        if upper_line not in collist:
+            upper_line=ectranslate(upper_line)
+            lower_line=ectranslate(lower_line)
             
-    import pandas as pd        
+            if upper_line not in collist:
+                upper_line=ticker_name(upper_line)
+                lower_line=ticker_name(lower_line)
+                
+                if upper_line not in collist:
+                    upper_line=None
+                    lower_line=None
+                
+        if not (upper_line is None) and not (lower_line is None):
+            try:
+                plt.fill_between(df2.index,df2[upper_line],df2[lower_line],df2[upper_line] > df2[lower_line],color='aquamarine',alpha=0.5,label='',interpolate=True)
+                plt.fill_between(df2.index,df2[upper_line],df2[lower_line],df2[upper_line] < df2[lower_line],color='lightcoral',alpha=0.5,label='',interpolate=True)
+            except:
+                print(f"  #Warning(draw_lines): band area elements {upper_line} or {lower_line} not found")
+                
+    import pandas as pd  
+    from datetime import datetime; date_format="%Y-%m-%d"
+    from datetime import datetime; date_format="%Y-%m-%d"      
     if not attention_point=='':
         if isinstance(attention_point,str) or isinstance(attention_point,int) or isinstance(attention_point,float):
             atp_list=[attention_point]
@@ -1721,10 +1791,13 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                     
                     color=atp_color_list[-1]
                 
-                #判断是否日期字符串
                 try:
+                    #判断是否日期字符串
+                    at=datetime.strptime(at, date_format)
+                    #若是日期字符串
                     atpd=pd.to_datetime(at)
                 except:
+                    #不是日期字符串
                     atpd=at
                 
                 """
@@ -1752,6 +1825,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             apa_list=[]
             for ap in attention_point_area:
                 try:
+                    ap=datetime.strptime(ap, date_format)
                     appd=pd.to_datetime(ap)
                 except:
                     appd=ap
@@ -1764,19 +1838,23 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     if axhline_label !="":
         if '零线' in axhline_label:
             axhline_label=''
-        plt.axhline(y=axhline_value,label=axhline_label,color='black',linestyle=':',linewidth=2)  
+        plt.axhline(y=axhline_value,label=auto_translate2(axhline_label,translate),color='black',linestyle=':',linewidth=2)  
         #plt.axhline(y=axhline_value,color='purple',linestyle=':',linewidth=1.5)
     
     #坐标轴标记
     y_label_t=ectranslate(y_label)
-    plt.ylabel(y_label_t,fontweight='bold',fontsize=ylabel_txt_size)
+    plt.ylabel(auto_translate2(y_label_t,translate),fontweight='bold',fontsize=ylabel_txt_size)
     
     x_label_t=ectranslate(x_label)
     if x_label != "":
-        plt.xlabel(x_label_t,fontweight='bold',fontsize=xlabel_txt_size,ha='center')
+        plt.xlabel(auto_translate2(x_label_t,translate),fontweight='bold',fontsize=xlabel_txt_size,ha='center')
     #图示标题
-    plt.title(title_txt,fontweight='bold',fontsize=title_txt_size)
+    plt.title(auto_translate2(title_txt,translate),fontweight='bold',fontsize=title_txt_size)
     
+    # 使用 AutoDateLocator 自动选择最佳间隔，目的是显示最后一个日期，亲测有效！！！
+    import matplotlib.dates as mdates
+    ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))   
+
     plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
     try:
         plt.gca().set_facecolor(facecolor)
@@ -1822,7 +1900,7 @@ if __name__=='__main__':
 
 #==============================================================================
 def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
-                data_label=False,resample_freq='6H',smooth=True, \
+                data_label=False,resample_freq='1D',smooth=True, \
                 date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
                 colorlist=[],lslist=[],lwlist=[], \
                 #指定纵轴两个变量之间的区域
@@ -1835,7 +1913,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                     attention_point_area='', \
                 annotate=False,annotate_value=False, \
                 mark_top=False,mark_bottom=False,mark_end=False, \
-                facecolor='whitesmoke'):
+                facecolor='whitesmoke',maxticks=10,translate=False):
     """
     函数功能：根据df的内容绘制折线图
     输入参数：
@@ -1858,6 +1936,9 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     """
     import pandas as pd
     DEBUG=False
+    if DEBUG:
+        print(f"band_area={band_area}")
+        print(f"df0={df0}")
     
     #空值判断
     if len(df0) ==0:
@@ -1927,17 +2008,17 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
         
         if (lcolor !='') and (lls !=''):
             if not annotate:
-                plt.plot(df[c],label=c,linewidth=llw,ls=lls,color=lcolor)
+                plt.plot(df[c],label=auto_translate2(c,translate),linewidth=llw,ls=lls,color=lcolor)
             else:
                 plt.plot(df[c],linewidth=llw,ls=lls,color=lcolor)
         elif (lcolor !=''):
             if not annotate:
-                plt.plot(df[c],label=c,linewidth=llw,color=lcolor)
+                plt.plot(df[c],label=auto_translate2(c,translate),linewidth=llw,color=lcolor)
             else:
                 plt.plot(df[c],linewidth=llw,color=lcolor)
         else:
             if not annotate:
-                plt.plot(df[c],label=c,linewidth=llw)
+                plt.plot(df[c],label=auto_translate2(c,translate),linewidth=llw)
             else:
                 plt.plot(df[c],linewidth=llw)
             
@@ -1987,12 +2068,12 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             if annotate_value: #在标记曲线名称的同时标记其末端数值
                 #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
                 y1=str(int(y_end)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 10 else str(round(y_end,4))
-                plt.annotate(text=c+':'+y1, 
+                plt.annotate(text=auto_translate2(c,translate)+':'+y1, 
                              xy=(x_end, y_end),
                              xytext=(x_end, y_end),fontsize=annotate_size,
                              color=last_line_color)
             else:
-                plt.annotate(text=c, 
+                plt.annotate(text=auto_translate2(c,translate), 
                              xy=(x_end, y_end),
                              xytext=(x_end, y_end),fontsize=annotate_size,
                              color=last_line_color)
@@ -2004,7 +2085,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             x_end = df_end[c].idxmin() # 末端值的x坐标 
             
             #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
-            y1=str(round(y_end,2)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 1 else str(round(y_end,3))
+            y1=str(round(y_end,1)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 1 else str(round(y_end,3))
             plt.annotate(text=y1, 
                          xy=(x_end, y_end),
                          xytext=(x_end, y_end),fontsize=annotate_size,
@@ -2026,15 +2107,19 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                     lower_line=None
                 
         if not (upper_line is None) and not (lower_line is None):
-            """
-            plt.fill_between(df.index,df[upper_line],df[lower_line],color='moccasin',alpha=0.5,label='',where=df[upper_line]>=df[lower_line])
-            plt.fill_between(df.index,df[upper_line],df[lower_line],color='aquamarine',alpha=0.5,label='',where=df[upper_line]<=df[lower_line])
-            """
-            #plt.fill_between(df.index,df[upper_line],df[lower_line],color='aquamarine',alpha=0.5,label='')
-            plt.fill_between(df.index,df[upper_line],df[lower_line],df[upper_line] > df[lower_line],color='aquamarine',alpha=0.5,label='',interpolate=True)
-            plt.fill_between(df.index,df[upper_line],df[lower_line],df[upper_line] < df[lower_line],color='lightcoral',alpha=0.5,label='',interpolate=True)
-            #plt.fill_between(df.index,df[upper_line],df[lower_line],df[upper_line] == df[lower_line],color='lightgray',alpha=0.5,label='')
-            
+            try:
+                """
+                plt.fill_between(df.index,df[upper_line],df[lower_line],color='moccasin',alpha=0.5,label='',where=df[upper_line]>=df[lower_line])
+                plt.fill_between(df.index,df[upper_line],df[lower_line],color='aquamarine',alpha=0.5,label='',where=df[upper_line]<=df[lower_line])
+                """
+                #plt.fill_between(df.index,df[upper_line],df[lower_line],color='aquamarine',alpha=0.5,label='')
+                plt.fill_between(df.index,df[upper_line],df[lower_line],df[upper_line] > df[lower_line],color='aquamarine',alpha=0.5,label='',interpolate=True)
+                plt.fill_between(df.index,df[upper_line],df[lower_line],df[upper_line] < df[lower_line],color='lightcoral',alpha=0.5,label='',interpolate=True)
+                #plt.fill_between(df.index,df[upper_line],df[lower_line],df[upper_line] == df[lower_line],color='lightgray',alpha=0.5,label='')
+            except:
+                print(f"  #Warning(draw_lines2): lack of data for either {upper_line} or {lower_line}")
+                #return None
+                
     #绘制水平辅助线
     if axhline_label !="":
         if DEBUG:
@@ -2068,6 +2153,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             plt.fill_between(df.index,attention_value_area[0],attention_value_area[1],color='lightgray',alpha=0.5)
         
     import pandas as pd
+    from datetime import datetime; date_format="%Y-%m-%d" 
     if not attention_point=='':
         if isinstance(attention_point,str) or isinstance(attention_point,int) or isinstance(attention_point,float):
             atp_list=[attention_point]
@@ -2085,6 +2171,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                 
                 #判断是否日期字符串
                 try:
+                    at=datetime.strptime(at, date_format)
                     atpd=pd.to_datetime(at)
                 except:
                     atpd=at
@@ -2095,6 +2182,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             apa_list=[]
             for ap in attention_point_area:
                 try:
+                    ap=datetime.strptime(ap, date_format)
                     appd=pd.to_datetime(ap)
                 except:
                     appd=ap
@@ -2104,11 +2192,16 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             plt.fill_betweenx(yaxis_data,apa_list[0],apa_list[1],color='powderblue',alpha=0.5)
     
     #坐标轴标记
-    plt.ylabel(y_label,fontweight='bold',fontsize=ylabel_txt_size)
+    plt.ylabel(auto_translate2(y_label,translate),fontweight='bold',fontsize=ylabel_txt_size)
     if x_label != "":
-        plt.xlabel(x_label,fontweight='bold',fontsize=xlabel_txt_size,ha='center')
+        plt.xlabel(auto_translate2(x_label,translate),fontweight='bold',fontsize=xlabel_txt_size,ha='center')
     #图示标题
-    plt.title(title_txt,fontweight='bold',fontsize=title_txt_size)
+    plt.title(auto_translate2(title_txt,translate),fontweight='bold',fontsize=title_txt_size)
+    
+    # 使用 AutoDateLocator 自动选择最佳间隔，目的是显示最后一个日期，亲测有效！！！
+    import matplotlib.dates as mdates
+    ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))   
+    
     plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
     try:
         plt.gca().set_facecolor(facecolor)

siat/sector_china.py

@@ -889,9 +889,17 @@ def display_industry_sw(sw_level='1',numberPerLine=4,colalign='left'):
     """
     按照类别打印申万行业列表，名称(代码)，每行5个, 套壳函数
     """
-    itype_list=['1','2','3','F','S','B','C']
-    sw_level_list=['1','2','3','F','S','B','C']
-    pos=sw_level_list.index(sw_level)
+    #itype_list=['1','2','3','F','S','B','C']
+    itype_list=['1','2','3','F','S','B']
+    #sw_level_list=['1','2','3','F','S','B','C']
+    sw_level_list=['1','2','3','F','S','B']
+    
+    try:
+        pos=sw_level_list.index(sw_level)
+    except:
+        print(f"  #Warning(display_industry_sw): no such level in Shenwan system {sw_level}")
+        print(f"  Supported Shenwan system: {sw_level_list}")
+        
     itype=itype_list[pos]
 
     print_industry_sw(itype=itype,numberPerLine=numberPerLine,colalign=colalign) 
@@ -2884,6 +2892,7 @@ if __name__=='__main__':
     
 def find_peers_china(industry='',top=20,rank=20,sw_level='2'):
     """
+    ===========================================================================
     功能：找出一个申万行业的上市公司排名
     主要参数：
     industry：申万行业名称。当industry = ''，显示的内容由sw_level控制。申万二级行业分类
@@ -3489,10 +3498,13 @@ if __name__=='__main__':
     
 def find_industry_sw(ticker,level='1',ticker_order=True,max_sleep=30):
     """
+    ===========================================================================
     功能：寻找一只或一组股票所属的申万行业，支持股票代码和股票名称。
-    level='1'：默认只查找申万1级行业,以便节省时间
-    ticker_order=True：默认输出结果按照ticker中的顺序,而非按照所属行业排序
-    max_sleep：为防止反爬虫，默认每次爬虫后睡眠最多几秒钟
+    level='1'：默认只查找申万1级行业；查找2/3级行业时间较久，可能触发反爬虫机制。
+    ticker_order=True：默认输出结果按照ticker中的顺序,而非按照所属行业排序。
+    max_sleep：为防止触发反爬虫机制，默认每次爬虫后睡眠最多30秒钟。
+    
+    返回值：查找结果df。
     """
     print("  Searching shenwan industries for securities ... ...")
     
@@ -3621,21 +3633,24 @@ if __name__=='__main__':
     
     peers=stock_industry_peer_em(ticker,indicator="市盈率",rank=10)
 
-def stock_peers_em(ticker='',indicator='',rank=10, \
+def stock_peers_em(ticker='',indicator='市盈率',rank=10, \
                    force_show_stock=True, \
                    font_size="16px",facecolor="papayawhip", \
                    numberPerLine=5):
     """
-    功能：基于东方财富行业分类，查找股票所属的行业板块以及主要同行排名
-    特点：行业分类较粗糙，略胜于无
+    ===========================================================================
+    功能：基于东方财富行业分类，查找股票所属的行业板块以及主要同行排名。
+    特点：行业分类较粗糙，略胜于无。
     主要参数：
-    ticker：股票代码，默认''显示所有板块名称
-    indicator：排名指标，默认''。例如："股价"、"流动性"、"市净率"、"市盈率"
-    rank：排名数量，默认10前十名
-    force_show_stock：是否显示股票信息，默认False
-    font_size：表格字体大小，默认"16px"
-    facecolor：输出表格的背景颜色，默认"papayawhip",
-    numberPerLine：输出表格中的每行显示个数，默认5
+    ticker：股票代码，默认''显示所有板块名称。
+    indicator：排名指标，默认''。例如："股价"、"流动性"、"市净率"、"市盈率"。
+    rank：排名数量，默认10前十名。
+    force_show_stock：是否显示股票信息，默认False。
+    font_size：表格字体大小，默认"16px"。
+    facecolor：输出表格的背景颜色，默认"papayawhip"。
+    numberPerLine：输出表格中的每行显示个数，默认5。
+    
+    注意：若结果异常，可尝试升级插件akshare。
     
     示例：
     industries=stock_peers_em()     # 显示东方财富所有行业板块分类
@@ -3663,6 +3678,7 @@ def stock_peers_em(ticker='',indicator='',rank=10, \
     except:
         if not ticker=='':
             print("  #Warning(stock_peer_em): stock info not found for",ticker)
+            print("  Solution: if stock code is correct, upgrade akshare and try again")
             
         df_em=ak.stock_board_industry_name_em()
         #df_em.sort_values(by="板块名称",ascending=True,inplace=True)
@@ -3725,7 +3741,8 @@ def stock_peers_em(ticker='',indicator='',rank=10, \
         df_disp=cfg[collist].tail(abs(rank))
     
     #强制显示所选股票
-    if force_show_stock and rank != 10:
+    #if force_show_stock and rank != 10:
+    if force_show_stock:
         #所选股票是否在其中？
         if not ticker[:6] in list(df_disp["代码"]):
             ticker_seq=cfg[cfg["代码"]==ticker[:6]]["序号"].values[0]
@@ -3780,8 +3797,22 @@ def concept_stocks_em(concept='',ticker='',indicator="市盈率",rank=10, \
                       force_show_stock=False, \
                       font_size="16px",facecolor="papayawhip",numberPerLine=5):
     """
-    功能：基于东方财富概念板块，查找关键字相关概念以及股票业绩
-    特点：概念板块划分细致，同一股票可能分属多个板块，与行业分类不同
+    ===========================================================================
+    功能：基于东方财富概念板块，查找关键字相关概念以及股票业绩。
+    特点：概念板块划分细致，同一股票可能分属多个板块，与行业分类不同。
+    参数：
+    concept：概念板块名称，或名称中的关键字，默认''输出所有概念板块名称；
+        若查找到多个名称，则优先输出查找到的名称；
+        若仅仅找到一个板块，则按indicator输出该板块的股票排行。
+    ticker：股票代码，默认''
+    indicator：指标名称，默认"市盈率"，还支持：股价，市净率，涨跌幅，流动性，换手率。
+    rank：排名，支持正负数，默认10。
+    force_show_stock：若ticker不为空，且不在rank范围内，是否强制显示该股票，默认False。
+    font_size：显示字体大小，默认"16px"。
+    facecolor：表格背景颜色，默认"papayawhip"。
+    numberPerLine：当显示板块名称时，每行显示个数，默认5。
+    
+    返回值：df
     """
     if indicator in ["股价","股票价格","价格","收盘价","价位"]:
         indicator="最新价"

siat/stock.py

@@ -987,7 +987,7 @@ def security_mindicators(ticker,measures,
         titletxt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker,ticker_type=ticker_type)       
         
         draw_lines2(df,y_label,x_label,axhline_value,axhline_label,titletxt, \
-                   data_label=False,resample_freq='6H',smooth=smooth, \
+                   data_label=False,resample_freq='1D',smooth=smooth, \
                    date_range=date_range,date_freq=date_freq,date_fmt='%Y-%m-%d', \
                         attention_value=attention_value,attention_value_area=attention_value_area, \
                         attention_point=attention_point,attention_point_area=attention_point_area, \