siat 3.8.28__py3-none-any.whl → 3.8.35__py3-none-any.whl

siat/grafix.py

@@ -106,7 +106,7 @@ if __name__ =="__main__":
     power=0
     zeroline=False
     average_value=False
-    resample_freq='H'
+    resample_freq='D'
     loc='best'
     date_range=False
     date_freq=False
@@ -122,9 +122,9 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
               attention_point='',attention_point_area='', \
               average_value=False, \
                   
-              resample_freq='H',loc='best', \
+              resample_freq='D',loc='best', \
               date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
-              mark_top=True,mark_bottom=True,mark_end=True, \
+              mark_start=False,mark_top=True,mark_bottom=True,mark_end=True, \
               facecolor='whitesmoke',maxticks=15,translate=False):
     """
     功能：绘制折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
@@ -203,7 +203,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     
     #绘制数据标签
     if datatag:
-        mark_top=False; mark_bottom=False; mark_end=False
+        mark_start=False; mark_top=False; mark_bottom=False; mark_end=False
         for x, y in zip(df.index, df[colname]):
             plt.text(x,y*1.001,'%.2f' % y,ha='center',va='bottom',color='black')        
 
@@ -243,6 +243,19 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
                 plt.text(x,y1,s % y,ha='right',va='bottom',color='seagreen')
                 plt.scatter(x,y, color='seagreen',marker='8',s=70)
 
+    #标记曲线开始数值
+    if mark_start:
+        df_start=df.head(1)
+        y_start = df_start[colname].min()    # 开始的y坐标
+        x_start = df_start[colname].idxmin() # 开始值的x坐标 
+        
+        #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
+        y1=str(round(y_start,1)) if abs(y_start) >= 100 else str(round(y_start,2)) if abs(y_start) >= 1 else str(round(y_start,3)) 
+        plt.annotate(text=y1, 
+                     xy=(x_start, y_start),
+                     xytext=(x_start, y_start*0.998),fontsize=annotate_size,ha='right',va='center')
+        # 特别注意：这里的left/right与实际图示的方向正好相反！！！
+
     #标记曲线末端数值
     if mark_end:
         df_end=df.tail(1)
@@ -253,7 +266,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
         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)
+                     xytext=(x_end, y_end*0.998),fontsize=annotate_size,ha='left',va='center')
     
     #是否绘制水平线
     if isinstance(zeroline,bool):#若zeroline为True
@@ -340,13 +353,15 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
             plt.fill_betweenx(yaxis_data,apa_list[0],apa_list[1],color='powderblue',alpha=0.5)
 
     if average_value:
-        av=df[colname].mean()
-        plt.axhline(y=av,ls="dashed",c="blueviolet",linewidth=2,label=text_lang("均值","Mean"))
         haveLegend=True
+        
+        av=df[colname].mean()
         #av=str(round(av,2)) if av < 100 else str(int(av))
-        av=str(int(av)) if abs(av) >= 100 else str(round(av,2)) if abs(av) >= 10 else str(round(av,3))
+        #av=str(int(av)) if abs(av) >= 100 else str(round(av,2)) if abs(av) >= 10 else str(round(av,3))
+        avstr=str(int(av)) if abs(av) >= 100 else str(round(av,2)) if abs(av) >= 10 else str(round(av,3))
+        plt.axhline(y=av,ls="dashed",c="blueviolet",linewidth=2,label=text_lang("本期间均值","Periodic mean")+avstr)
         #footnote=footnote + "，均值"+av
-        footnote=text_lang("注：期间均值","Note: Periodic mean ")+av+"; "+footnote
+        #footnote=text_lang("注：期间均值","Note: Periodic mean ")+av+"; "+footnote
     
     #绘制趋势线
     #print("--Debug(plot_line): power=",power)
@@ -412,16 +427,17 @@ if __name__ =="__main__":
     twinx=False
     yline=999
     xline=999
-    resample_freq='H'
+    resample_freq='D'
 
 def plot_line2(df1,ticker1,colname1,label1, \
                df2,ticker2,colname2,label2, \
                ylabeltxt,titletxt,footnote, \
                power=0,datatag1=False,datatag2=False,yscalemax=5, \
-               zeroline=False,twinx=False, \
+               zeroline=False, \
+                   twinx=False, \
                    yline=999,attention_value_area='', \
                    xline=999,attention_point_area='', \
-               resample_freq='H',loc1='best',loc2='best', \
+               resample_freq='D',loc1='best',loc2='best', \
                color1='red',color2='blue',facecolor='whitesmoke', \
                    maxticks=20):
     """
@@ -450,7 +466,36 @@ def plot_line2(df1,ticker1,colname1,label1, \
         print("Going to plot_line2_coaxial")
         print("yline=",yline,"; xline=",xline)
     
-    if not twinx:            
+    #if not twinx:
+    if twinx == True: # 双轴会图
+        plot_line2_twinx(df1,ticker1,colname1,label1, \
+                         df2,ticker2,colname2,label2, \
+                         titletxt,footnote,power,datatag1,datatag2, \
+                         resample_freq=resample_freq, \
+                             xline=xline,attention_point_area=attention_point_area, \
+                         loc1=loc1,loc2=loc2, \
+                         color1=color1,color2=color2,facecolor=facecolor, \
+                             maxticks=maxticks)
+    elif 'LR' in twinx.upper(): # 左右双图
+        plot_line2_LR(df1,ticker1,colname1,label1, \
+                         df2,ticker2,colname2,label2, \
+                         titletxt,footnote,power,datatag1,datatag2, \
+                         resample_freq=resample_freq, \
+                             xline=xline,attention_point_area=attention_point_area, \
+                         loc1=loc1,loc2=loc2, \
+                         color1=color1,color2=color2,facecolor=facecolor, \
+                             maxticks=maxticks)
+    elif 'UD' in twinx.upper(): # 上下双图
+        plot_line2_UD(df1,ticker1,colname1,label1, \
+                         df2,ticker2,colname2,label2, \
+                         titletxt,footnote,power,datatag1,datatag2, \
+                         resample_freq=resample_freq, \
+                             xline=xline,attention_point_area=attention_point_area, \
+                         loc1=loc1,loc2=loc2, \
+                         color1=color1,color2=color2,facecolor=facecolor, \
+                             maxticks=maxticks)
+        
+    else: # twinx == False # 正常绘图           
         plot_line2_coaxial(df1,ticker1,colname1,label1, \
                 df2,ticker2,colname2,label2, \
                 ylabeltxt,titletxt,footnote,power,datatag1,datatag2,zeroline, \
@@ -460,15 +505,7 @@ def plot_line2(df1,ticker1,colname1,label1, \
                 loc1=loc1,loc2=loc2, \
                 color1=color1,color2=color2,facecolor=facecolor, \
                     maxticks=maxticks)
-    else:
-        plot_line2_twinx(df1,ticker1,colname1,label1, \
-                         df2,ticker2,colname2,label2, \
-                         titletxt,footnote,power,datatag1,datatag2, \
-                         resample_freq=resample_freq, \
-                             xline=xline,attention_point_area=attention_point_area, \
-                         loc1=loc1,loc2=loc2, \
-                         color1=color1,color2=color2,facecolor=facecolor, \
-                             maxticks=maxticks)
+            
     return
 
 
@@ -480,7 +517,7 @@ def plot2_line2(df1,ticker1,colname1,label1, \
                zeroline=False,twinx=False, \
                    yline=999,attention_value_area='', \
                    xline=999,attention_point_area='', \
-               resample_freq='H',loc1='best',loc2='best', \
+               resample_freq='D',loc1='best',loc2='best', \
                date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
                color1='red',color2='blue',facecolor='whitesmoke', \
                    maxticks=20):
@@ -547,7 +584,7 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
                        power=0,datatag1=False,datatag2=False,zeroline=False, \
                            yline=999,attention_value_area='', \
                            xline=999,attention_point_area='', \
-                       resample_freq='H', \
+                       resample_freq='D', \
                        loc1='best',loc2='best', \
                        color1='red',color2='blue',facecolor='whitesmoke', \
                        ticker_type='auto',maxticks=15):
@@ -760,7 +797,10 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
     
     # 使用 AutoDateLocator 自动选择最佳间隔，目的是显示最后一个日期，亲测有效！！！
     import matplotlib.dates as mdates
-    ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))    
+    try:
+        ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))    
+    except:
+        pass
     
     plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
     try:
@@ -802,7 +842,7 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
                        power=0,datatag1=False,datatag2=False,zeroline=False, \
                            yline=999,attention_value_area='', \
                            xline=999,attention_point_area='', \
-                       resample_freq='H', \
+                       resample_freq='D', \
                        loc1='best',loc2='best', \
                        date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
                        color1='red',color2='blue',facecolor='whitesmoke', \
@@ -1060,7 +1100,7 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
 def plot_line2_twinx(df01,ticker1,colname1,label1, \
                      df02,ticker2,colname2,label2, \
                      titletxt,footnote,power=0,datatag1=False,datatag2=False, \
-                     resample_freq='H', \
+                     resample_freq='D', \
                          xline=999,attention_point_area='', \
                      loc1='upper left',loc2='lower left', \
                      color1='red',color2='blue',facecolor='whitesmoke', \
@@ -1280,16 +1320,507 @@ if __name__ =="__main__":
         df2,'600266.SS','Close','收盘价', \
         "证券价格走势对比图","数据来源：新浪/stooq")
 
-    plot_line2_twinx(df1,'000002.SZ','Close','收盘价', \
+    plot_line2_LR(df1,'000002.SZ','Close','收盘价', \
         df2,'600266.SS','Close','收盘价', \
         "证券价格走势对比图","数据来源：新浪/stooq",power=3)
 
+#==============================================================================
+def plot_line2_LR(df01,ticker1,colname1,label1, \
+                  df02,ticker2,colname2,label2, \
+                  titletxt,footnote,power=0, \
+                      datatag1=False,datatag2=False, \
+                      resample_freq='D', \
+                      xline=999,attention_point_area='', \
+                  loc1='upper left',loc2='lower left', \
+                      color1='red',color2='blue',facecolor='whitesmoke', \
+                      ticker_type='auto', \
+                      maxticks=15):
+    """
+    功能：绘制两个证券或指标的左右折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
+    假定：数据表有索引，且已经按照索引排序
+    输入：
+    证券1：数据表df1，证券代码ticker1，列名1，列名标签1；
+    证券2：数据表df2，证券代码ticker2，列名2，列名标签2；
+    标题titletxt，脚注footnote；是否在图中标记数据datatag；趋势图的多项式次数power
+    输出：绘制左右并列折线图
+    返回值：无
+    注意：需要日期类型作为df索引
+    """
+    DEBUG=False
+    
+    #plt.rcParams['axes.grid']=False
+    
+    #插值平滑
+    try:
+        df01x=df01[[colname1]].astype('float')
+        df1=df_smooth_manual(df01x,resample_freq=resample_freq)
+    except:
+        df1=df01
+    try:
+        df02x=df02[[colname2]].astype('float')
+        df2=df_smooth_manual(df02x,resample_freq=resample_freq)
+    except:
+        df2=df02
+    
+    #预处理ticker_type
+    ticker_type_list=ticker_type_preprocess_mticker_mixed([ticker1,ticker2],ticker_type)        
+    
+    #创建画布：绘制折线图，左右双子图
+    fig, (ax, ax2) = plt.subplots(1, 2)
+    
+    #设置主标题
+    #plt.suptitle(titletxt,fontweight='bold',fontsize=title_txt_size, y=1.01)  # y参数调整垂直位置
+    plt.suptitle(titletxt,fontweight='bold',fontsize=title_txt_size)
+    
+    # 绘制左子图================================================================
+    #设置画布背景颜色
+    try:
+        ax.set_facecolor(facecolor)
+    except:
+        print("  #Warning(plot_line2_twinx): color",facecolor,"is unsupported")
+        facecolor="whitesmoke"
+        ax.set_facecolor(facecolor) 
+    
+    # 设置折线标签
+    if ticker1 == '':
+        label1txt=label1
+    else:
+        if label1 == '':
+            label1txt=ticker_name(ticker1,ticker_type_list[0])
+        else:
+            label1txt=ticker_name(ticker1,ticker_type_list[0])+'('+label1+')'   
+
+    # 设置子图标题
+    if ticker1 != ticker2:
+        ax.set_title(label1txt,fontsize=xlabel_txt_size)
+    else:
+        ax.set_title(ectranslate(colname1),fontsize=xlabel_txt_size)
+
+    # 绘图        
+    lwadjust=linewidth_adjust(df1)
+    """
+    ax.plot(df1.index,df1[colname1],'-',label=label1txt, \
+             linestyle='-',color=color1,linewidth=lwadjust)   
+    """  
+    ax.plot(df1.index,df1[colname1],'-', \
+             linestyle='-',color=color1,linewidth=lwadjust)   
+
+    #证券1：绘制数据标签
+    if datatag1:
+        for x, y in zip(df1.index, df1[colname1]):
+            ax.text(x,y+0.1,'%.2f' % y,ha='center',va='bottom',color='black')
+
+    #绘制关注点
+    import pandas as pd
+    from datetime import datetime; date_format="%Y-%m-%d"
+    if xline != 999:
+        attention_point=xline
+        
+        #用于关注点的颜色列表
+        atp_color_list=["crimson","dodgerblue","magenta","lightseagreen","chocolate"]  
+        
+        if isinstance(attention_point,str) or isinstance(attention_point,int) or isinstance(attention_point,float):
+            atp_list=[attention_point]
+        elif isinstance(attention_point,list):
+            atp_list=attention_point
+        else:
+            atp_list=[]
+        #去重，不打乱原来的顺序
+        atp_list=list(dict.fromkeys(atp_list))
+
+        if DEBUG:
+            print("In plot_line2_twinx")
+            print("atp_list=",atp_list)
+            
+        if not atp_list==[] and not atp_list==['']:
+            
+            for at in atp_list:
+                pos=atp_list.index(at)
+                color=atp_color_list[pos]
+                
+                #判断是否日期字符串
+                try:
+                    at=datetime.strptime(at, date_format)
+                    atpd=pd.to_datetime(at)
+                except:
+                    atpd=at
+                ax.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+str(at))        
+
+    if not attention_point_area=='':
+        if isinstance(attention_point_area,list) and len(attention_point_area)>=2:
+            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()
+            ax.fill_betweenx(yaxis_data,apa_list[0],apa_list[1],color='powderblue',alpha=0.5)
+
+    #绘证券1：制趋势线
+    if power > 0:
+        lang=check_language()
+        trend_txt='趋势线'
+        if lang == 'English':
+            trend_txt='Trend line'        
+        
+        #生成行号，借此将横轴的日期数量化，以便拟合
+        df1['id']=range(len(df1))
+        
+        #设定多项式拟合，power为多项式次数
+        import numpy as np
+        parameter = np.polyfit(df1.id, df1[colname1], power)
+        f = np.poly1d(parameter)
+
+        if ticker1 == '':
+            label1txt=''
+        else:
+            label1txt=ticker_name(ticker1,ticker_type_list[0])+"("+trend_txt+")"
+        ax.plot(df1.index, f(df1.id),"r--", label=label1txt,linewidth=1)
+
+    # 纵轴标签
+    #ax.set_ylabel(label1txt,fontsize=ylabel_txt_size)
+    #ax.legend(loc=loc1,fontsize=legend_txt_size)
+
+    # 横轴标签
+    #ax.set_xlabel(text_lang("日期","Date"),fontsize=xlabel_txt_size,ha='center')
+
+    #绘图右图===================================================================
+    #设置画布背景颜色
+    ax2.set_facecolor(facecolor)
+
+    # 折线标签
+    if ticker2 == '':
+        label2txt=label2
+    else:
+        if label2 == '':
+            label2txt=ticker_name(ticker2,ticker_type_list[1])
+        else:
+            label2txt=ticker_name(ticker2,ticker_type_list[1])+'('+label2+')'   
+
+    # 设置子图标题
+    if ticker1 != ticker2:
+        ax2.set_title(label2txt,fontsize=xlabel_txt_size)
+    else:
+        ax2.set_title(ectranslate(colname2),fontsize=xlabel_txt_size)
+    
+    # 绘图        
+    lwadjust=linewidth_adjust(df2)
+    """
+    ax2.plot(df2.index,df2[colname2],'-',label=label2txt, \
+             linestyle='-.',color=color2,linewidth=lwadjust)
+    """  
+    ax2.plot(df2.index,df2[colname2],'-', \
+             linestyle='-.',color=color2,linewidth=lwadjust)
+
+    #证券2：绘制数据标签
+    if datatag2:
+        for x, y in zip(df2.index, df2[colname2]):
+            ax2.text(x,y+0.1,'%.2f' % y,ha='center',va='bottom',color='black')
+    
+    #绘证券2：制趋势线
+    if power > 0:
+        lang=check_language()
+        trend_txt='趋势线'
+        if lang == 'English':
+            trend_txt='Trend line'           
+        
+        #生成行号，借此将横轴的日期数量化，以便拟合
+        df2['id']=range(len(df2))
+        
+        #设定多项式拟合，power为多项式次数
+        import numpy as np
+        parameter = np.polyfit(df2.id, df2[colname2], power)
+        f = np.poly1d(parameter)
+
+        if ticker2 == '':
+            label2txt=''
+        else:
+            label2txt=ticker_name(ticker2,ticker_type_list[1])+"("+trend_txt+")"
+        ax2.plot(df2.index, f(df2.id),"c--", label=label2txt,linewidth=1)        
+    
+    # 纵轴标签
+    #ax2.set_ylabel(label2txt,fontsize=ylabel_txt_size)
+    #ax2.legend(loc=loc2,fontsize=legend_txt_size)
+
+    # 横轴标签
+    #ax2.set_xlabel(text_lang("日期","Date"),fontsize=xlabel_txt_size,ha='center')
+    
+    #自动优化x轴标签
+    #ax2.autofmt_xdate(ha="center") # 优化标注（自动倾斜）
+    
+    # 共同脚注==================================================================
+    fig.text(0.5,-0.01,footnote,ha='center',fontsize=xlabel_txt_size,color='gray')
+    #plt.xlabel(footnote,ha='center',fontsize=xlabel_txt_size,color='gray')
+    
+    # 自动倾斜横轴日期
+    fig.autofmt_xdate(ha="center")
+    
+    # 调整布局防止重叠
+    plt.tight_layout()        
+    plt.show()
+    
+    return
+
+
+#==============================================================================
+def plot_line2_UD(df01,ticker1,colname1,label1, \
+                  df02,ticker2,colname2,label2, \
+                  titletxt,footnote,power=0, \
+                      datatag1=False,datatag2=False, \
+                      resample_freq='D', \
+                      xline=999,attention_point_area='', \
+                  loc1='upper left',loc2='lower left', \
+                      color1='red',color2='blue',facecolor='whitesmoke', \
+                      ticker_type='auto', \
+                      maxticks=15):
+    """
+    功能：绘制两个证券或指标的上下折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
+    假定：数据表有索引，且已经按照索引排序
+    输入：
+    证券1：数据表df1，证券代码ticker1，列名1，列名标签1；
+    证券2：数据表df2，证券代码ticker2，列名2，列名标签2；
+    标题titletxt，脚注footnote；是否在图中标记数据datatag；趋势图的多项式次数power
+    输出：绘制上下并列折线图
+    返回值：无
+    注意：需要日期类型作为df索引
+    """
+    DEBUG=False
+    
+    #plt.rcParams['axes.grid']=False
+    
+    #插值平滑
+    try:
+        df01x=df01[[colname1]].astype('float')
+        df1=df_smooth_manual(df01x,resample_freq=resample_freq)
+    except:
+        df1=df01
+    try:
+        df02x=df02[[colname2]].astype('float')
+        df2=df_smooth_manual(df02x,resample_freq=resample_freq)
+    except:
+        df2=df02
+    
+    #预处理ticker_type
+    ticker_type_list=ticker_type_preprocess_mticker_mixed([ticker1,ticker2],ticker_type)        
+    
+    #创建画布：绘制折线图，上下双子图
+    fig, (ax, ax2) = plt.subplots(2, 1)
+    
+    #设置主标题
+    #plt.suptitle(titletxt,fontweight='bold',fontsize=title_txt_size, y=1.01)  # y参数调整垂直位置
+    plt.suptitle(titletxt,fontweight='bold',fontsize=title_txt_size)
+    
+    # 绘制左子图================================================================
+    #设置画布背景颜色
+    try:
+        ax.set_facecolor(facecolor)
+    except:
+        print("  #Warning(plot_line2_twinx): color",facecolor,"is unsupported")
+        facecolor="whitesmoke"
+        ax.set_facecolor(facecolor) 
+    
+    # 设置折线标签
+    if ticker1 == '':
+        label1txt=label1
+    else:
+        if label1 == '':
+            label1txt=ticker_name(ticker1,ticker_type_list[0])
+        else:
+            label1txt=ticker_name(ticker1,ticker_type_list[0])+'('+label1+')'   
+
+    # 设置子图标题
+    """
+    if ticker1 != ticker2:
+        ax.set_title(label1txt,fontsize=xlabel_txt_size)
+    else:
+        ax.set_title(ectranslate(colname1),fontsize=xlabel_txt_size)
+    """
+    # 绘图        
+    lwadjust=linewidth_adjust(df1)
+    """
+    ax.plot(df1.index,df1[colname1],'-',label=label1txt, \
+             linestyle='-',color=color1,linewidth=lwadjust)   
+    """  
+    ax.plot(df1.index,df1[colname1],'-', \
+             linestyle='-',color=color1,linewidth=lwadjust)   
+
+    #证券1：绘制数据标签
+    if datatag1:
+        for x, y in zip(df1.index, df1[colname1]):
+            ax.text(x,y+0.1,'%.2f' % y,ha='center',va='bottom',color='black')
+
+    #绘制关注点
+    import pandas as pd
+    from datetime import datetime; date_format="%Y-%m-%d"
+    if xline != 999:
+        attention_point=xline
+        
+        #用于关注点的颜色列表
+        atp_color_list=["crimson","dodgerblue","magenta","lightseagreen","chocolate"]  
+        
+        if isinstance(attention_point,str) or isinstance(attention_point,int) or isinstance(attention_point,float):
+            atp_list=[attention_point]
+        elif isinstance(attention_point,list):
+            atp_list=attention_point
+        else:
+            atp_list=[]
+        #去重，不打乱原来的顺序
+        atp_list=list(dict.fromkeys(atp_list))
+
+        if DEBUG:
+            print("In plot_line2_twinx")
+            print("atp_list=",atp_list)
+            
+        if not atp_list==[] and not atp_list==['']:
+            
+            for at in atp_list:
+                pos=atp_list.index(at)
+                color=atp_color_list[pos]
+                
+                #判断是否日期字符串
+                try:
+                    at=datetime.strptime(at, date_format)
+                    atpd=pd.to_datetime(at)
+                except:
+                    atpd=at
+                ax.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+str(at))        
+
+    if not attention_point_area=='':
+        if isinstance(attention_point_area,list) and len(attention_point_area)>=2:
+            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()
+            ax.fill_betweenx(yaxis_data,apa_list[0],apa_list[1],color='powderblue',alpha=0.5)
+
+    #绘证券1：制趋势线
+    if power > 0:
+        lang=check_language()
+        trend_txt='趋势线'
+        if lang == 'English':
+            trend_txt='Trend line'        
+        
+        #生成行号，借此将横轴的日期数量化，以便拟合
+        df1['id']=range(len(df1))
+        
+        #设定多项式拟合，power为多项式次数
+        import numpy as np
+        parameter = np.polyfit(df1.id, df1[colname1], power)
+        f = np.poly1d(parameter)
+
+        if ticker1 == '':
+            label1txt=''
+        else:
+            label1txt=ticker_name(ticker1,ticker_type_list[0])+"("+trend_txt+")"
+        ax.plot(df1.index, f(df1.id),"r--", label=label1txt,linewidth=1)
+
+    # 纵轴标签
+    if ticker1 != ticker2:
+        ax.set_ylabel(label1txt,fontsize=ylabel_txt_size)
+    else:
+        ax.set_ylabel(ectranslate(colname1),fontsize=ylabel_txt_size)
+    #ax.legend(loc=loc1,fontsize=legend_txt_size)
+
+    # 横轴标签
+    #ax.set_xlabel(text_lang("日期","Date"),fontsize=xlabel_txt_size,ha='center')
+
+    #绘图右图===================================================================
+    #设置画布背景颜色
+    ax2.set_facecolor(facecolor)
+
+    # 折线标签
+    if ticker2 == '':
+        label2txt=label2
+    else:
+        if label2 == '':
+            label2txt=ticker_name(ticker2,ticker_type_list[1])
+        else:
+            label2txt=ticker_name(ticker2,ticker_type_list[1])+'('+label2+')'   
+
+    # 设置子图标题
+    """
+    if ticker1 != ticker2:
+        ax2.set_title(label2txt,fontsize=xlabel_txt_size)
+    else:
+        ax2.set_title(ectranslate(colname2),fontsize=xlabel_txt_size)
+    """
+    # 绘图        
+    lwadjust=linewidth_adjust(df2)
+    """
+    ax2.plot(df2.index,df2[colname2],'-',label=label2txt, \
+             linestyle='-.',color=color2,linewidth=lwadjust)
+    """  
+    ax2.plot(df2.index,df2[colname2],'-', \
+             linestyle='-.',color=color2,linewidth=lwadjust)
+
+    #证券2：绘制数据标签
+    if datatag2:
+        for x, y in zip(df2.index, df2[colname2]):
+            ax2.text(x,y+0.1,'%.2f' % y,ha='center',va='bottom',color='black')
+    
+    #绘证券2：制趋势线
+    if power > 0:
+        lang=check_language()
+        trend_txt='趋势线'
+        if lang == 'English':
+            trend_txt='Trend line'           
+        
+        #生成行号，借此将横轴的日期数量化，以便拟合
+        df2['id']=range(len(df2))
+        
+        #设定多项式拟合，power为多项式次数
+        import numpy as np
+        parameter = np.polyfit(df2.id, df2[colname2], power)
+        f = np.poly1d(parameter)
+
+        if ticker2 == '':
+            label2txt=''
+        else:
+            label2txt=ticker_name(ticker2,ticker_type_list[1])+"("+trend_txt+")"
+        ax2.plot(df2.index, f(df2.id),"c--", label=label2txt,linewidth=1)        
+    
+    # 纵轴标签
+    if ticker1 != ticker2:
+        ax2.set_ylabel(label2txt,fontsize=ylabel_txt_size)
+    else:
+        ax2.set_ylabel(ectranslate(colname2),fontsize=ylabel_txt_size)
+    #ax2.legend(loc=loc2,fontsize=legend_txt_size)
+
+    # 横轴标签
+    #ax2.set_xlabel(text_lang("日期","Date"),fontsize=xlabel_txt_size,ha='center')
+    
+    #自动优化x轴标签
+    #ax2.autofmt_xdate(ha="center") # 优化标注（自动倾斜）
+    
+    # 共同脚注==================================================================
+    fig.text(0.5,-0.01,footnote,ha='center',fontsize=xlabel_txt_size,color='gray')
+    #plt.xlabel(footnote,ha='center',fontsize=xlabel_txt_size,color='gray')
+    
+    # 自动倾斜横轴日期
+    fig.autofmt_xdate(ha="center")
+    
+    # 调整布局防止重叠
+    plt.tight_layout()        
+    plt.show()
+    
+    return
+
 #==============================================================================
 def plot_line2_twinx2(df01,ticker1,colname1,label1, \
                       df02,ticker2,colname2,label2, \
                       titletxt,footnote,power=0,datatag1=False,datatag2=False, \
                           xline=999,attention_point_area='', \
-                      resample_freq='H',loc1='upper left',loc2='lower left', \
+                      resample_freq='D',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', \
@@ -1532,7 +2063,7 @@ if __name__ =="__main__":
     axhline_value=0; axhline_label=''
     title_txt='Title'
     data_label=False
-    resample_freq='H'; smooth=True
+    resample_freq='D'; smooth=True
     linewidth=1.5
     loc='best'
     annotate=True; annotate_value=True
@@ -1545,12 +2076,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, \
+               data_label=False,resample_freq='D',smooth=False,linewidth=1.5, \
                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, \
+               mark_start=False,mark_top=False,mark_bottom=False,mark_end=False, \
                ticker_type='auto',facecolor='whitesmoke', \
                    maxticks_enable=True,maxticks=15, \
                translate=False):
@@ -1738,6 +2269,19 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                     plt.text(x,y1,s % y,ha='right',va='bottom',color=last_line_color)
                     plt.scatter(x,y, color='seagreen',marker='8',s=70)
 
+        #标记曲线开始数值
+        if mark_start and (c not in ["平均值","中位数"]):
+            df_end=dfg.head(1)
+            y_end = df_end[c].min()    # 开始的y坐标
+            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,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*0.998),fontsize=annotate_size,
+                         color=last_line_color,ha='right',va='center')
+
         #标记曲线末端数值
         if mark_end and (c not in ["平均值","中位数"]):
             df_end=dfg.tail(1)
@@ -1748,8 +2292,8 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             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,
-                         color=last_line_color)
+                         xytext=(x_end, y_end*0.998),fontsize=annotate_size,
+                         color=last_line_color,ha='left',va='center')
 
     #用于关注值的颜色列表
     atv_color_list=["lightgray","paleturquoise","wheat","khaki","lightsage","hotpink","mediumslateblue"]
@@ -1950,7 +2494,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, \
+                mark_start=False,mark_top=False,mark_bottom=False,mark_end=False, \
                 facecolor='whitesmoke',maxticks=20,translate=False):
     """
     函数功能：根据df的内容绘制折线图
@@ -1973,6 +2517,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     band_area=''：默认为空，否则为列表，第1个值为带状区域上边沿字段，第2个值为带状区域下边沿字段
     """
     import pandas as pd
+    
     DEBUG=False
     if DEBUG:
         print(f"band_area={band_area}")
@@ -2115,6 +2660,19 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                              xy=(x_end, y_end),
                              xytext=(x_end, y_end),fontsize=annotate_size,
                              color=last_line_color)
+
+        #标记曲线开始数值
+        if mark_start:
+            df_start=df.head(1)
+            y_start = df_start[c].min()    # 开始的y坐标
+            x_start = df_start[c].idxmin() # 开始值的x坐标 
+            
+            #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
+            y1=str(round(y_start,1)) if abs(y_start) >= 100 else str(round(y_start,2)) if abs(y_start) >= 1 else str(round(y_start,3)) 
+            plt.annotate(text=y1, 
+                         xy=(x_start, y_start),
+                         xytext=(x_start, y_start*0.998),fontsize=annotate_size,ha='right',va='center')
+            # 特别注意：这里的left/right与实际图示的方向正好相反！！！
     
         #处理布林带的mark_end，仅标记上中下线
         if mark_end & (c in collist3):
@@ -2395,7 +2953,7 @@ if __name__=='__main__':
 #==============================================================================
 def plot_2lines(df01,colname1,label1, \
                 df02,colname2,label2, \
-                ylabeltxt,titletxt,footnote,hline=0,vline=0,resample_freq='H', \
+                ylabeltxt,titletxt,footnote,hline=0,vline=0,resample_freq='D', \
                 date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
                 facecolor='whitesmoke', \
                     maxticks=15):
@@ -2584,7 +3142,7 @@ def df_smooth(df):
     
         
 #==============================================================================
-def df_smooth_manual(df,method='linear',resample_freq='H',order=3):
+def df_smooth_manual(df,method='linear',resample_freq='D',order=3):
     """
     功能：对df中的第一个数值列样本进行插值，以便绘制的折线图相对平滑。
     要求：df的索引为pandas的datetime日期型