siat 3.7.28__py3-none-any.whl → 3.8.10__py3-none-any.whl

siat/grafix.py

@@ -30,7 +30,8 @@ plt.rcParams['xtick.direction'] = 'inout'  # 将x轴的刻度线方向设置向
 plt.rcParams['ytick.direction'] = 'inout'  # 将y轴的刻度方向设置向内内
 
 #统一设定绘制的图片大小：数值为英寸，1英寸=100像素
-plt.rcParams['figure.figsize']=(12.8,7.2)
+#plt.rcParams['figure.figsize']=(12.8,7.2)
+plt.rcParams['figure.figsize']=(12.8,6.4)
 plt.rcParams['figure.dpi']=300
 plt.rcParams['font.size'] = 13
 plt.rcParams['xtick.labelsize']=11 #横轴字体大小
@@ -124,7 +125,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=15,translate=False):
     """
     功能：绘制折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -136,6 +137,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 +179,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 +250,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 +293,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 +312,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 +325,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 +369,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 +383,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')
@@ -396,7 +422,8 @@ def plot_line2(df1,ticker1,colname1,label1, \
                    yline=999,attention_value_area='', \
                    xline=999,attention_point_area='', \
                resample_freq='H',loc1='best',loc2='best', \
-               color1='red',color2='blue',facecolor='whitesmoke'):
+               color1='red',color2='blue',facecolor='whitesmoke', \
+                   maxticks=20):
     """
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -431,7 +458,8 @@ def plot_line2(df1,ticker1,colname1,label1, \
                     xline=xline,attention_point_area=attention_point_area, \
                 resample_freq=resample_freq, \
                 loc1=loc1,loc2=loc2, \
-                color1=color1,color2=color2,facecolor=facecolor)
+                color1=color1,color2=color2,facecolor=facecolor, \
+                    maxticks=maxticks)
     else:
         plot_line2_twinx(df1,ticker1,colname1,label1, \
                          df2,ticker2,colname2,label2, \
@@ -439,7 +467,8 @@ def plot_line2(df1,ticker1,colname1,label1, \
                          resample_freq=resample_freq, \
                              xline=xline,attention_point_area=attention_point_area, \
                          loc1=loc1,loc2=loc2, \
-                         color1=color1,color2=color2,facecolor=facecolor)
+                         color1=color1,color2=color2,facecolor=facecolor, \
+                             maxticks=maxticks)
     return
 
 
@@ -453,7 +482,8 @@ def plot2_line2(df1,ticker1,colname1,label1, \
                    xline=999,attention_point_area='', \
                resample_freq='H',loc1='best',loc2='best', \
                date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
-               color1='red',color2='blue',facecolor='whitesmoke'):
+               color1='red',color2='blue',facecolor='whitesmoke', \
+                   maxticks=20):
     """
     注意：可能有bug，twinx=True时左纵坐标轴和横坐标轴标记可能发生重叠！!!暂不建议使用
     facecolor不起作用
@@ -492,7 +522,8 @@ def plot2_line2(df1,ticker1,colname1,label1, \
                 resample_freq=resample_freq, \
                 loc1=loc1,loc2=loc2, \
                 date_range=date_range,date_freq=date_freq,date_fmt=date_fmt, \
-                color1=color1,color2=color2,facecolor=facecolor)
+                color1=color1,color2=color2,facecolor=facecolor, \
+                    maxticks=maxticks)
     else:
         plot_line2_twinx2(df1,ticker1,colname1,label1, \
                          df2,ticker2,colname2,label2, \
@@ -501,7 +532,9 @@ def plot2_line2(df1,ticker1,colname1,label1, \
                          resample_freq=resample_freq, \
                          loc1=loc1,loc2=loc2, \
                          date_range=date_range,date_freq=date_freq,date_fmt=date_fmt, \
-                         color1=color1,color2=color2,facecolor=facecolor)
+                         color1=color1,color2=color2,facecolor=facecolor, \
+                             maxticks=maxticks)
+            
     return
 
 
@@ -517,7 +550,7 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
                        resample_freq='H', \
                        loc1='best',loc2='best', \
                        color1='red',color2='blue',facecolor='whitesmoke', \
-                       ticker_type='auto'):
+                       ticker_type='auto',maxticks=15):
     """
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -610,6 +643,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 +667,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 +682,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
@@ -721,6 +757,11 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
     
     # 同轴绘图时，loc1/loc2未用上！
     plt.legend(loc=loc1,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)
@@ -765,7 +806,8 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
                        loc1='best',loc2='best', \
                        date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
                        color1='red',color2='blue',facecolor='whitesmoke', \
-                       ticker_type='auto'):
+                       ticker_type='auto', \
+                           maxticks=15):
     """
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -869,6 +911,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 +934,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 +949,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
@@ -991,6 +1036,11 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
     
     # 同轴绘图时，loc1/loc2未用上！
     plt.legend(loc=loc1,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)
@@ -1014,7 +1064,8 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
                          xline=999,attention_point_area='', \
                      loc1='upper left',loc2='lower left', \
                      color1='red',color2='blue',facecolor='whitesmoke', \
-                     ticker_type='auto'):
+                     ticker_type='auto', \
+                         maxticks=15):
     """
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -1073,6 +1124,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 +1152,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 +1163,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
@@ -1200,6 +1254,11 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
             label2txt=label2+'('+ticker_name(ticker2,ticker_type_list[1])+')'
     ax2.set_ylabel(label2txt,fontsize=ylabel_txt_size)
     ax2.legend(loc=loc2,fontsize=legend_txt_size)
+
+    # 使用 AutoDateLocator 自动选择最佳间隔，目的是显示最后一个日期，亲测有效！！！
+    import matplotlib.dates as mdates
+    ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))
+    ax2.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))
     
     #自动优化x轴标签
     plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
@@ -1233,7 +1292,8 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
                       resample_freq='H',loc1='upper left',loc2='lower left', \
                       date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
                       color1='red',color2='blue',facecolor='whitesmoke', \
-                      ticker_type='auto'):
+                      ticker_type='auto', \
+                          maxticks=15):
     """
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -1304,6 +1364,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 +1392,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 +1403,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
@@ -1445,6 +1508,11 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
             label2txt=label2+'('+ticker_name(ticker2,ticker_type_list[1])+')'
     ax2.set_ylabel(label2txt,fontsize=ylabel_txt_size)
     ax2.legend(loc=loc2,fontsize=legend_txt_size)
+
+    # 使用 AutoDateLocator 自动选择最佳间隔，目的是显示最后一个日期，亲测有效！！！
+    import matplotlib.dates as mdates
+    ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))
+    ax2.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))
     
     #自动优化x轴标签
     #格式化时间轴标注
@@ -1478,11 +1546,14 @@ 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_enable=True,maxticks=15, \
+               translate=False):
     """
     函数功能：根据df的内容绘制折线图
     输入参数：
@@ -1500,6 +1571,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 +1627,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 +1674,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 +1691,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 +1745,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 +1772,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 +1824,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 +1858,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 +1871,28 @@ 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)  
+            
+        max_values = df2.max(numeric_only=True); global_max_values=max_values.max()
+        min_values = df2.min(numeric_only=True); global_min_values=min_values.min()
+        if global_max_values >= axhline_value and global_min_values <= axhline_value:
+            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)
     
+    if maxticks_enable:
+        # 使用 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 +1938,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 +1951,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=20,translate=False):
     """
     函数功能：根据df的内容绘制折线图
     输入参数：
@@ -1858,6 +1974,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 +2046,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 +2106,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 +2123,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 +2145,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 +2191,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 +2209,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 +2220,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 +2230,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)
@@ -2266,7 +2397,8 @@ def plot_2lines(df01,colname1,label1, \
                 df02,colname2,label2, \
                 ylabeltxt,titletxt,footnote,hline=0,vline=0,resample_freq='H', \
                 date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
-                facecolor='whitesmoke'):
+                facecolor='whitesmoke', \
+                    maxticks=15):
     """
     功能：绘制两个证券的折线图。如果hline=0不绘制水平虚线，vline=0不绘制垂直虚线
     假定：数据表有日期索引，且已经按照索引排序
@@ -2356,6 +2488,10 @@ def plot_2lines(df01,colname1,label1, \
     plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     plt.legend(loc='best',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)
@@ -2624,7 +2760,7 @@ if __name__=='__main__':
     firstColSpecial=True
     colWidth=0.1
     tabScale=2
-    figsize=(10,6)
+    figsize=(12.8,6.4)
     cellLoc='right'
     fontsize=10
 
@@ -2636,7 +2772,7 @@ if __name__=='__main__':
     pandas2plttable(df)
 
 def pandas2plttable(df,titletxt,firstColSpecial=True,colWidth=0.1,tabScale=2,cellLoc='right', \
-                    figsize=(10,4),fontsize=13,auto_len=False,title_x=0.5):
+                    figsize=(12.8,6.4),fontsize=13,auto_len=False,title_x=0.5):
     """
     功能：将一个df转换为matplotlib表格格式，打印图形表格，适应性广
     firstColSpecial：第一列是否特殊处理，默认True
@@ -2688,7 +2824,6 @@ def pandas2plttable(df,titletxt,firstColSpecial=True,colWidth=0.1,tabScale=2,cel
     for i in range(0,len(df)): 
         vals=vals+[list(df.iloc[i])]
     
-    #plt.figure(figsize=figsize,dpi=figdpi)
     plt.figure(figsize=figsize)
     
     if not auto_len: