siat 2.14.1__py3-none-any.whl → 3.0.0__py3-none-any.whl

siat/grafix.py

@@ -21,7 +21,8 @@ from siat.translate import *
 import pandas as pd
 #==============================================================================
 import matplotlib.pyplot as plt
-
+import matplotlib.dates as mdate
+#==============================================================================
 #统一设定绘制的图片大小：数值为英寸，1英寸=100像素
 plt.rcParams['figure.figsize']=(12.8,7.2)
 plt.rcParams['figure.dpi']=300
@@ -69,6 +70,8 @@ plt.rcParams['axes.unicode_minus'] = False
 #==============================================================================
 if __name__ =="__main__":
     df0=get_price('000001.SS','2023-1-1','2024-3-22')
+    df0=get_price('sz149995','2020-1-1','2024-3-31')
+    df0,_=get_price_1ticker('sz149976',fromdate='2024-1-1',todate='2024-4-6',fill=True)
     
     colname='Close'
     collabel='Close'
@@ -84,49 +87,45 @@ if __name__ =="__main__":
     date_range=False
     date_freq=False
     date_fmt='%Y-%m-%d'
-    mark_top=1
-    mark_bottom=1
+    mark_top=True
+    mark_bottom=True
     
-    plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,mark_top=1,mark_bottom=1)
+    plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,mark_top=True,mark_bottom=True)
 
 def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
               power=0,zeroline=False,average_value=False, \
               resample_freq='H',loc='best', \
               date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
-              mark_top=0,mark_bottom=0,mark_end=True):
+              mark_top=True,mark_bottom=True,mark_end=True):
     """
     功能：绘制折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
     输入：数据表df，数据表中的列名colname，列名的标签collabel；y轴标签ylabeltxt；
     标题titletxt，脚注footnote；是否在图中标记数据datatag；趋势图的多项式次数power
-    mark_top,mark_bottom：标记最高最低点的个数
+    mark_top,mark_bottom：是否标记最高最低点
     输出：折线图
     返回值：无
     注意：需要日期类型作为df索引
     """
+    
     #空值判断
     if len(df0) ==0:
         print ("  #Warning(plot_line): no data to plot.")
         return
     
-    #插值平滑
+    #插值平滑：未填充时
+    #if 'filled' not in list(df0):
     try:
         df0x=df0[[colname]].astype('float')
         df=df_smooth_manual(df0x,resample_freq=resample_freq)
     except:
         df=df0
+    #else: df=df0
     
     #先绘制折线图
-    """
-    plt.plot(df.index,df[colname],'-',label=collabel, \
-             linestyle='-',color='blue', linewidth=1, \
-                 marker='o',markersize=2)
-    """
-
-    import matplotlib.dates as mdate
     date_start=df.index[0]
     date_end=df.index[-1]
-    ax=plt.gca()       
+    ax=plt.gca()
     
     if date_range and not date_freq:
         ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
@@ -144,42 +143,65 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
             ylabeltxt=''
 
     lwadjust=linewidth_adjust(df)
+    
+    #if 'filled' not in list(df):
     plt.plot(df.index,df[colname],'-',label=collabel, \
              linestyle='-',color='blue', linewidth=lwadjust)
+    """
+    else:
+        #区分实际有数据部分和填充部分
+        df_raw=df[df['filled'] == False] #原有数据
+        df_filled=df[df['filled'] != False] #填充的数据
+        
+        plt.plot(df_filled.index,df_filled[colname],'-',label=collabel, \
+                 linestyle=':',color='black', linewidth=lwadjust)
         
+        plt.plot(df_raw.index,df_raw[colname],'-',label=collabel, \
+                 linestyle='-',color='blue', linewidth=lwadjust)
+    """        
     haveLegend=True
     if collabel == '':
         haveLegend=False
     
     #绘制数据标签
     if datatag:
+        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')        
 
     #标记最高点/最低点
-    if mark_top > 0 or mark_bottom > 0:
+    if mark_top or mark_bottom:
         df_mark=df[[colname]].copy() #避免影响原df
         df_mark.sort_values(by=colname,ascending=False,inplace=True)
         
         high_poit=df_mark[colname].head(1).values[0]
         low_poit=df_mark[colname].tail(1).values[0]
         high_low=high_poit - low_poit
-        if mark_top > 0:
-            df_mark_top=df_mark[:mark_top]
+        if mark_top:
+            df_mark_top=df_mark[:1]
             for x, y in zip(df_mark_top.index, df_mark_top[colname]):
                 #plt.text(x,y+0.1,'%.2f' % y,ha='center',va='bottom',color='red')
-                y1=round(y+high_low*0.01,2)
+                #y1=round(y+high_low*0.01,2)
+                y1=y+high_low*0.01
+                #s='%.0f' if y >= 100 else '%.2f'
+                s='%.0f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f' 
+                plt.text(x,y1,s % y,ha='right',va='bottom',color='red')
+                """
                 s='%.0f' if y >= 100 else '%.2f'
-                plt.text(x,y1,s % y,ha='center',va='bottom',color='red')
+                plt.text(x,y,s % y,ha='right',va='bottom',color='red')
+                """
                 plt.scatter(x,y, color='red',marker='8',s=70)
             
-        if mark_bottom > 0:
-            df_mark_bottom=df_mark[-mark_bottom:]
+        if mark_bottom:
+            df_mark_bottom=df_mark[-1:]
             for x, y in zip(df_mark_bottom.index, df_mark_bottom[colname]):
                 #plt.text(x,y-0.1,'%.2f' % y,ha='center',va='bottom',color='black')  
-                y1=round(y-high_low*0.055,2) #标记位置对应y1的底部
-                s='%.0f' if y >= 100 else '%.2f'
-                plt.text(x,y1,s % y,ha='center',va='bottom',color='seagreen')
+                #y1=round(y-high_low*0.055,2) #标记位置对应y1的底部
+                y1=y-high_low*0.050 #标记位置对应y1的底部
+                #s='%.0f' if y >= 100 else '%.2f'
+                s='%.0f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f'
+                #plt.text(x,y1,s % y,ha='center',va='bottom',color='seagreen')
+                plt.text(x,y1,s % y,ha='right',va='bottom',color='seagreen')
                 plt.scatter(x,y, color='seagreen',marker='8',s=70)
 
     #标记曲线末端数值
@@ -188,7 +210,8 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
         y_end = df_end[colname].min()    # 末端的y坐标
         x_end = df_end[colname].idxmin() # 末端值的x坐标 
         
-        y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
+        #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,3)) 
         plt.annotate(text=' '+y1, 
                      xy=(x_end, y_end),
                      xytext=(x_end, y_end),fontsize=annotate_size)
@@ -197,8 +220,9 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     if isinstance(zeroline,bool):#若zeroline为True
         if zeroline: 
             hline=0
-            plt.axhline(y=hline,ls=":",c="green",linewidth=2,label="零线")
-            haveLegend=True
+            #plt.axhline(y=hline,ls=":",c="green",linewidth=2,label="零线")
+            plt.axhline(y=hline,ls=":",c="black",linewidth=2,label='')
+            haveLegend=False
     else:
         if isinstance(zeroline,float) or isinstance(zeroline,int):
             hline=zeroline
@@ -210,16 +234,16 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
         av=df[colname].mean()
         plt.axhline(y=av,ls="dashed",c="blueviolet",linewidth=2,label="均值")
         haveLegend=True
-        footnote=footnote + "，均值"+str(round(av,2))
+        #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))
+        #footnote=footnote + "，均值"+av
+        footnote="注：期间均值"+av+"；"+footnote
     
     #绘制趋势线
     #print("--Debug(plot_line): power=",power)
     if power > 0:
-        lang=check_language()
-        trend_txt='趋势线'
-        #trend_txt=''
-        if lang == 'English':
-            trend_txt='Trend line'           
+        trend_txt=text_lang('趋势线','Trend line')
+        
         try:
             #生成行号，借此将横轴的日期数量化，以便拟合
             df['id']=range(len(df))
@@ -231,13 +255,16 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
             plt.plot(df.index, f(df.id),"r--", label=trend_txt,linewidth=1)
             haveLegend=True
         except: 
-            print("  Warning(plot_line): failed to converge trend line, try a smaller power.")
+            print("  #Warning(plot_line): failed to converge trend line, try a smaller power.")
     
     if ylabeltxt != '' or average_value or isinstance(zeroline,bool):
         if haveLegend:
             plt.legend(loc=loc,fontsize=legend_txt_size)
 
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
+    
+    if '基金' in titletxt and '收盘价' in ylabeltxt:
+        ylabeltxt=ylabeltxt.replace('收盘价','单位净值')
         
     plt.ylabel(ylabeltxt,fontsize=ylabel_txt_size)
     plt.xlabel(footnote,fontsize=xlabel_txt_size)
@@ -248,8 +275,6 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     
     return
 
-if __name__ =="__main__":
-    plot_line(df,'Close',"收盘价","价格","万科股票","数据来源：新浪/stooq",power=4)
 
 #==============================================================================
 if __name__ =="__main__":
@@ -364,11 +389,12 @@ def plot2_line2(df1,ticker1,colname1,label1, \
 
 def plot_line2_coaxial(df01,ticker1,colname1,label1, \
                        df02,ticker2,colname2,label2, \
-                    ylabeltxt,titletxt,footnote, \
-                    power=0,datatag1=False,datatag2=False,zeroline=False, \
-                    yline=999,xline=999,resample_freq='H', \
-                        loc1='best',loc2='best', \
-                        color1='red',color2='blue'):
+                       ylabeltxt,titletxt,footnote, \
+                       power=0,datatag1=False,datatag2=False,zeroline=False, \
+                       yline=999,xline=999,resample_freq='H', \
+                       loc1='best',loc2='best', \
+                       color1='red',color2='blue', \
+                       ticker_type='auto'):
     """
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -392,19 +418,24 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
         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)    
+    
     #证券1：先绘制折线图
     
     if ticker1 == '':
         label1txt=label1
     else:
         if label1 == '':
-            label1txt=codetranslate(ticker1)
+            label1txt=ticker_name(ticker1,ticker_type_list[0])
         else:
-            label1txt=codetranslate(ticker1)+'('+label1+')'    
+            label1txt=ticker_name(ticker1,ticker_type_list[0])+'('+label1+')'    
     
     lwadjust=linewidth_adjust(df1)
     plt.plot(df1.index,df1[colname1],'-',label=label1txt, \
              linestyle='-',linewidth=lwadjust,color=color1)
+    
     #证券1：绘制数据标签
     if datatag1:
         for x, y in zip(df1.index, df1[colname1]):
@@ -424,10 +455,7 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
     
     #绘证券1：制趋势线
     if power > 0:
-        lang=check_language()
-        trend_txt='趋势线'
-        if lang == 'English':
-            trend_txt='Trend line'    
+        trend_txt=text_lang('趋势线','Trend line')
             
         try:
             #生成行号，借此将横轴的日期数量化，以便拟合
@@ -441,7 +469,7 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
             if ticker1 == '':
                 label1txt=''
             else:
-                label1txt=codetranslate(ticker1)+"("+trend_txt+")"            
+                label1txt=ticker_name(ticker1,ticker_type_list[0])+"("+trend_txt+")"            
                     
             #plt.plot(df1.index, f(df1.id),"g--", label=label1txt,linewidth=1)
             plt.plot(df1.index, f(df1.id),"g--", label='',linewidth=1)
@@ -452,9 +480,9 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
         label2txt=label2
     else:
         if label2 == '':
-            label2txt=codetranslate(ticker2)
+            label2txt=ticker_name(ticker2,ticker_type_list[1])
         else:
-            label2txt=codetranslate(ticker2)+'('+label2+')'    
+            label2txt=ticker_name(ticker2,ticker_type_list[1])+'('+label2+')'    
     
     lwadjust=linewidth_adjust(df2)
     plt.plot(df2.index,df2[colname2],'-',label=label2txt, \
@@ -483,7 +511,7 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
             if ticker2 == '':
                 label2txt=''
             else:
-                label2txt=codetranslate(ticker2)+"("+trend_txt+")"            
+                label2txt=ticker_name(ticker2,ticker_type_list[1])+"("+trend_txt+")"            
                     
             #plt.plot(df2.index, f(df2.id),"r--", label=label2txt,linewidth=1)
             plt.plot(df2.index, f(df2.id),"r--", label='',linewidth=1)
@@ -527,7 +555,7 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
                        yline=999,xline=999,resample_freq='H', \
                        loc1='best',loc2='best', \
                        date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
-                       color1='red',color2='blue'):
+                       color1='red',color2='blue',ticker_type='auto'):
     """
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -551,17 +579,19 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
         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)    
+        
     #证券1：先绘制折线图
-    
     if ticker1 == '':
         label1txt=label1
     else:
         if label1 == '':
-            label1txt=codetranslate(ticker1)
+            label1txt=ticker_name(ticker1,ticker_type_list[0])
         else:
-            label1txt=codetranslate(ticker1)+'('+label1+')'    
+            label1txt=ticker_name(ticker1,ticker_type_list[0])+'('+label1+')'    
 
-    import matplotlib.dates as mdate
     ax=plt.gca()    
     date_start=df1.index[0]
     date_end=df1.index[-1]
@@ -614,7 +644,7 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
             if ticker1 == '':
                 label1txt=''
             else:
-                label1txt=codetranslate(ticker1)+"("+trend_txt+")"            
+                label1txt=ticker_name(ticker1,ticker_type_list[0])+"("+trend_txt+")"            
             plt.plot(df1.index, f(df1.id),"g--", label=label1txt,linewidth=1)
         except: pass
     
@@ -623,9 +653,9 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
         label2txt=label2
     else:
         if label2 == '':
-            label2txt=codetranslate(ticker2)
+            label2txt=ticker_name(ticker2,ticker_type_list[1])
         else:
-            label2txt=codetranslate(ticker2)+'('+label2+')'    
+            label2txt=ticker_name(ticker2,ticker_type_list[1])+'('+label2+')'    
 
     date_start=df2.index[0]
     date_end=df2.index[-1]
@@ -666,7 +696,7 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
             if ticker2 == '':
                 label2txt=''
             else:
-                label2txt=codetranslate(ticker2)+"("+trend_txt+")"            
+                label2txt=ticker_name(ticker2,ticker_type_list[1])+"("+trend_txt+")"            
             plt.plot(df2.index, f(df2.id),"r--", label=label2txt,linewidth=1)
         except: pass
     
@@ -687,7 +717,7 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
                      df02,ticker2,colname2,label2, \
                     titletxt,footnote,power=0,datatag1=False,datatag2=False, \
                     resample_freq='H',loc1='upper left',loc2='lower left', \
-                    color1='red',color2='blue'):
+                    color1='red',color2='blue',ticker_type='auto'):
     """
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -712,9 +742,11 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
         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)        
+    
     #证券1：绘制折线图，双坐标轴
-    import matplotlib.dates as mdates
     fig = plt.figure()
     ax = fig.add_subplot(111)
     
@@ -722,9 +754,9 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
         label1txt=label1
     else:
         if label1 == '':
-            label1txt=codetranslate(ticker1)
+            label1txt=ticker_name(ticker1,ticker_type_list[0])
         else:
-            label1txt=codetranslate(ticker1)+'('+label1+')'   
+            label1txt=ticker_name(ticker1,ticker_type_list[0])+'('+label1+')'   
             
     lwadjust=linewidth_adjust(df1)
     ax.plot(df1.index,df1[colname1],'-',label=label1txt, \
@@ -752,7 +784,7 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
         if ticker1 == '':
             label1txt=''
         else:
-            label1txt=codetranslate(ticker1)+"("+trend_txt+")"
+            label1txt=ticker_name(ticker1,ticker_type_list[0])+"("+trend_txt+")"
         ax.plot(df1.index, f(df1.id),"r--", label=label1txt,linewidth=1)
 
     #绘证券2：建立第二y轴
@@ -762,9 +794,9 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
         label2txt=label2
     else:
         if label2 == '':
-            label2txt=codetranslate(ticker2)
+            label2txt=ticker_name(ticker2,ticker_type_list[1])
         else:
-            label2txt=codetranslate(ticker2)+'('+label2+')'   
+            label2txt=ticker_name(ticker2,ticker_type_list[1])+'('+label2+')'   
             
     lwadjust=linewidth_adjust(df2)
     ax2.plot(df2.index,df2[colname2],'-',label=label2txt, \
@@ -792,7 +824,7 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
         if ticker2 == '':
             label2txt=''
         else:
-            label2txt=codetranslate(ticker2)+"("+trend_txt+")"
+            label2txt=ticker_name(ticker2,ticker_type_list[1])+"("+trend_txt+")"
         ax2.plot(df2.index, f(df2.id),"c--", label=label2txt,linewidth=1)        
         
     ax.set_xlabel(footnote,fontsize=xlabel_txt_size)
@@ -801,9 +833,9 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
         label1txt=label1
     else:
         if label1 == "":
-            label1txt=codetranslate(ticker1)
+            label1txt=ticker_name(ticker1,ticker_type_list[0])
         else:
-            label1txt=label1+'('+codetranslate(ticker1)+')'
+            label1txt=label1+'('+ticker_name(ticker1,ticker_type_list[0])+')'
     ax.set_ylabel(label1txt,fontsize=ylabel_txt_size)
     ax.legend(loc=loc1,fontsize=legend_txt_size)
     
@@ -811,9 +843,9 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
         label2txt=label2
     else:
         if label2 == "":
-            label2txt=codetranslate(ticker2)
+            label2txt=ticker_name(ticker2,ticker_type_list[1])
         else:
-            label2txt=label2+'('+codetranslate(ticker2)+')'
+            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)
     
@@ -847,7 +879,7 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
                      titletxt,footnote,power=0,datatag1=False,datatag2=False, \
                      resample_freq='H',loc1='upper left',loc2='lower left', \
                      date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
-                     color1='red',color2='blue'):
+                     color1='red',color2='blue',ticker_type='auto'):
     """
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -872,9 +904,11 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
         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)
         
     #证券1：绘制折线图，双坐标轴
-    import matplotlib.dates as mdate
     fig = plt.figure()
     ax = fig.add_subplot(111)
     
@@ -882,9 +916,9 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
         label1txt=label1
     else:
         if label1 == '':
-            label1txt=codetranslate(ticker1)
+            label1txt=ticker_name(ticker1,ticker_type_list[0])
         else:
-            label1txt=codetranslate(ticker1)+'('+label1+')'    
+            label1txt=ticker_name(ticker1,ticker_type_list[0])+'('+label1+')'    
         
     date_start=df1.index[0]
     date_end=df1.index[-1]
@@ -924,7 +958,7 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
         if ticker1 == '':
             label1txt=''
         else:
-            label1txt=codetranslate(ticker1)+"("+trend_txt+")"
+            label1txt=ticker_name(ticker1,ticker_type_list[0])+"("+trend_txt+")"
         ax.plot(df1.index, f(df1.id),"r--", label=label1txt,linewidth=1)
 
     #绘证券2：建立第二y轴
@@ -934,9 +968,9 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
         label2txt=label2
     else:
         if label2 == '':
-            label2txt=codetranslate(ticker2)
+            label2txt=ticker_name(ticker2,ticker_type_list[1])
         else:
-            label2txt=codetranslate(ticker2)+'('+label2+')'    
+            label2txt=ticker_name(ticker2,ticker_type_list[1])+'('+label2+')'    
         
     date_start=df2.index[0]
     date_end=df2.index[-1]
@@ -976,7 +1010,7 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
         if ticker2 == '':
             label2txt=''
         else:
-            label2txt=codetranslate(ticker2)+"("+trend_txt+")"
+            label2txt=ticker_name(ticker2,ticker_type_list[1])+"("+trend_txt+")"
         
         ax2.plot(df2.index, f(df2.id),"c--", label=label2txt,linewidth=1)        
         
@@ -986,9 +1020,9 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
         label1txt=label1
     else:
         if label1 == "":
-            label1txt=codetranslate(ticker1)
+            label1txt=ticker_name(ticker1,ticker_type_list[0])
         else:
-            label1txt=label1+'('+codetranslate(ticker1)+')'
+            label1txt=label1+'('+ticker_name(ticker1,ticker_type_list[0])+')'
     ax.set_ylabel(label1txt,fontsize=ylabel_txt_size)
     ax.legend(loc=loc1,fontsize=legend_txt_size)
     
@@ -996,9 +1030,9 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
         label2txt=label2
     else:
         if label2 == "":
-            label2txt=codetranslate(ticker2)
+            label2txt=ticker_name(ticker2,ticker_type_list[1])
         else:
-            label2txt=label2+'('+codetranslate(ticker2)+')'
+            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)
     
@@ -1016,7 +1050,7 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
 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, \
-               mark_top=0,mark_bottom=0,mark_end=False):
+               mark_top=False,mark_bottom=False,mark_end=False,ticker_type='auto'):
     """
     函数功能：根据df的内容绘制折线图
     输入参数：
@@ -1103,63 +1137,80 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
         
         #plt.plot(dfg,label=c,linewidth=linewidth,ls=lsc,marker=mkc,markersize=3)
         lwadjust=linewidth_adjust(dfg)
+        
+        """
         if not annotate:
-            """
-            注意：许多传入的df字段名已经不是证券代码，此处调用codetranslate将会导致
-            股票名称字典重新下载，耗费时间，且出现黄条。
-            建议：在调用draw_lines之前，先调用codetranslate，将证券代码翻译为证券名称。
-            本函数仅负责绘图，不负责翻译证券名称。
-            """
+            
+            #注意：许多传入的df字段名已经不是证券代码，此处调用codetranslate将会导致
+            #股票名称字典重新下载，耗费时间，且出现黄条。
+            #建议：在调用draw_lines之前，先调用codetranslate，将证券代码翻译为证券名称。
+            #本函数仅负责绘图，不负责翻译证券名称。
+            
             #plt.plot(dfg,label=codetranslate(c),linewidth=linewidth,ls=lsc,marker=mkc,markersize=3)
             plt.plot(dfg,label=c,linewidth=lwadjust,ls=lsc,marker=mkc,markersize=3)
         else:
             #plt.plot(dfg[c],label=codetranslate(c),linewidth=linewidth,ls=lsc,marker=mkc,markersize=3)
             #plt.plot(dfg,label=codetranslate(c),linewidth=linewidth,ls=lsc,marker=mkc,markersize=3)
             plt.plot(dfg,label=c,linewidth=lwadjust,ls=lsc,marker=mkc,markersize=3)
-            
+        """  
+        plt.plot(dfg,label=c,linewidth=lwadjust,ls=lsc,marker=mkc,markersize=3)
+        lines = plt.gca().lines
+        last_line_color = lines[-1].get_color()
+        
+        if annotate:
             df_end=dfg.tail(1)
             # df_end[c]必须为数值类型，否则可能出错
             y_end = df_end[c].min()    # 末端的y坐标
             x_end = df_end[c].idxmin() # 末端值的x坐标 
             
             if annotate_value: #在标记曲线名称的同时标记其末端数值
-                y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
+                #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,3))
                 plt.annotate(text=c+':'+y1, 
-                                 xy=(x_end, y_end),
-                                 xytext=(x_end, y_end),fontsize=annotate_size)
+                             xy=(x_end, y_end),
+                             xytext=(x_end, y_end),fontsize=annotate_size,
+                             color=last_line_color)
             else:
                 plt.annotate(text=c, 
-                                 xy=(x_end, y_end),
-                                #xytext=(x_end, y_end),fontsize=9)
-                                 xytext=(x_end, y_end),fontsize=annotate_size)
+                             xy=(x_end, y_end),
+                            #xytext=(x_end, y_end),fontsize=9)
+                             xytext=(x_end, y_end),fontsize=annotate_size,
+                             color=last_line_color)
                 
         #plt.plot(df[c],label=c,linewidth=1.5,marker=mkc,markersize=3)
         #为折线加数据标签
         if data_label==True:
+            mark_top=False; mark_bottom=False; mark_end=False
             for a,b in zip(dfg.index,df2[c]):
                 plt.text(a,b+0.02,str(round(b,2)), \
                          ha='center',va='bottom',fontsize=7)
 
         #标记最高点/最低点
-        if mark_top > 0 or mark_bottom > 0:
+        if mark_top or mark_bottom:
             df_mark=dfg[[c]].copy() #避免影响原df
             df_mark.dropna(inplace=True)
             df_mark.sort_values(by=c,ascending=False,inplace=True)
             
-            if mark_top > 0:
-                df_mark_top=df_mark[:mark_top]
+            if mark_top:
+                df_mark_top=df_mark[:1]
                 for x, y in zip(df_mark_top.index, df_mark_top[c]):
-                    y1=round(y+high_low*0.01,2)
-                    s='%.0f' if y >= 100 else '%.2f'
-                    plt.text(x,y1,s % y,ha='center',va='bottom',color='red')
+                    #y1=round(y+high_low*0.01,2)
+                    y1=y+high_low*0.01
+                    #s='%.0f' if y >= 100 else '%.2f'
+                    s='%.0f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f'
+                    #plt.text(x,y1,s % y,ha='center',va='bottom',color='red')
+                    plt.text(x,y1,s % y,ha='right',va='bottom',color=last_line_color)
                     plt.scatter(x,y, color='red',marker='8',s=70)
                 
-            if mark_bottom > 0:
-                df_mark_bottom=df_mark[-mark_bottom:]
+            if mark_bottom:
+                df_mark_bottom=df_mark[-1:]
                 for x, y in zip(df_mark_bottom.index, df_mark_bottom[c]):
-                    y1=round(y-high_low*0.055,2) #标记位置对应y1的底部
-                    s='%.0f' if y >= 100 else '%.2f'
-                    plt.text(x,y1,s % y,ha='center',va='bottom',color='seagreen')
+                    #y1=round(y-high_low*0.055,2) #标记位置对应y1的底部
+                    y1=y-high_low*0.050 #标记位置对应y1的底部
+                    #s='%.0f' if y >= 100 else '%.2f'
+                    s='%.0f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f'
+                    #plt.text(x,y1,s % y,ha='center',va='bottom',color='seagreen')
+                    plt.text(x,y1,s % y,ha='right',va='bottom',color=last_line_color)
                     plt.scatter(x,y, color='seagreen',marker='8',s=70)
 
         #标记曲线末端数值
@@ -1168,10 +1219,12 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             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(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,3))
             plt.annotate(text=' '+y1, 
                          xy=(x_end, y_end),
-                         xytext=(x_end, y_end),fontsize=annotate_size)
+                         xytext=(x_end, y_end),fontsize=annotate_size,
+                         color=last_line_color)
 
 
     #绘制水平辅助线
@@ -1218,7 +1271,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                 date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
                 colorlist=[],lslist=[],lwlist=[], \
                 band_area='',loc='best',annotate=False,annotate_value=False, \
-                mark_top=0,mark_bottom=0,mark_end=False):
+                mark_top=False,mark_bottom=False,mark_end=False):
     """
     函数功能：根据df的内容绘制折线图
     输入参数：
@@ -1266,7 +1319,6 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     high_low=dfmax - dfmin
 
     #定义横轴标签：显示完整开始、结束日期
-    import matplotlib.dates as mdate
     ax=plt.gca()    
     date_start=df.index[0]
     date_end=df.index[-1]
@@ -1294,35 +1346,44 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
         except:
             lwadjust=linewidth_adjust(df)
             plt.plot(df[c],label=c,linewidth=lwadjust)
+            lines = plt.gca().lines; last_line_color = lines[-1].get_color()
         else:
             plt.plot(df[c],label=c,linewidth=llw,ls=lls,color=lcolor)
+            lines = plt.gca().lines; last_line_color = lines[-1].get_color()
         
         #为折线加数据标签
         if data_label==True:
+            mark_top=False; mark_bottom=False; mark_end=False
             for a,b in zip(df.index,df[c]):
                 plt.text(a,b+0.02,str(round(b,2)), \
                          ha='center',va='bottom',fontsize=7)
 
         #标记最高点/最低点
-        if mark_top > 0 or mark_bottom > 0:
+        if mark_top or mark_bottom:
             df_mark=df[[c]].copy() #避免影响原df
             df_mark.dropna(inplace=True)
             df_mark.sort_values(by=c,ascending=False,inplace=True)
             
-            if mark_top > 0:
-                df_mark_top=df_mark[:mark_top]
+            if mark_top:
+                df_mark_top=df_mark[:1]
                 for x, y in zip(df_mark_top.index, df_mark_top[c]):
-                    y1=round(y+high_low*0.01,2)
-                    s='%.0f' if y >= 100 else '%.2f'
-                    plt.text(x,y1,s % y,ha='center',va='bottom',color='red')
+                    #y1=round(y+high_low*0.01,2)
+                    y1=y+high_low*0.01
+                    #s='%.0f' if y >= 100 else '%.2f'
+                    s='%.0f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f'
+                    #plt.text(x,y1,s % y,ha='center',va='bottom',color='red')
+                    plt.text(x,y1,s % y,ha='right',va='bottom',color=last_line_color)
                     plt.scatter(x,y, color='red',marker='8',s=70)
                 
-            if mark_bottom > 0:
-                df_mark_bottom=df_mark[-mark_bottom:]
+            if mark_bottom:
+                df_mark_bottom=df_mark[-1:]
                 for x, y in zip(df_mark_bottom.index, df_mark_bottom[c]):
-                    y1=round(y-high_low*0.055,2) #标记位置对应y1的底部
-                    s='%.0f' if y >= 100 else '%.2f'
-                    plt.text(x,y1,s % y,ha='center',va='bottom',color='seagreen')
+                    #y1=round(y-high_low*0.055,2) #标记位置对应y1的底部
+                    y1=y-high_low*0.050 #标记位置对应y1的底部
+                    #s='%.0f' if y >= 100 else '%.2f'
+                    s='%.0f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f'
+                    #plt.text(x,y1,s % y,ha='center',va='bottom',color='seagreen')
+                    plt.text(x,y1,s % y,ha='right',va='bottom',color=last_line_color)
                     plt.scatter(x,y, color='seagreen',marker='8',s=70)
     
         #曲线末端标记：不建议用于布林带
@@ -1332,14 +1393,17 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             x_end = df_end[c].idxmin() # 末端值的x坐标 
             
             if annotate_value: #在标记曲线名称的同时标记其末端数值
-                y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
+                #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,3))
                 plt.annotate(text=c+':'+y1, 
                              xy=(x_end, y_end),
-                             xytext=(x_end, y_end),fontsize=annotate_size)
+                             xytext=(x_end, y_end),fontsize=annotate_size,
+                             color=last_line_color)
             else:
                 plt.annotate(text=c, 
                              xy=(x_end, y_end),
-                             xytext=(x_end, y_end),fontsize=annotate_size)
+                             xytext=(x_end, y_end),fontsize=annotate_size,
+                             color=last_line_color)
     
         #处理布林带的mark_end，仅标记上中下线
         if mark_end & (c in collist3):
@@ -1347,10 +1411,12 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             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(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,3))
             plt.annotate(text=y1, 
                          xy=(x_end, y_end),
-                         xytext=(x_end, y_end),fontsize=annotate_size)
+                         xytext=(x_end, y_end),fontsize=annotate_size,
+                         color=last_line_color)
         
     #绘制带状区域
     if band_area != '' and isinstance(band_area,list) and len(band_area)>=2:
@@ -1545,7 +1611,6 @@ def plot_2lines(df01,colname1,label1, \
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     
     #证券1：先绘制折线图
-    import matplotlib.dates as mdate
     date_start=df1.index[0]
     date_end=df1.index[-1]
     if date_range and not date_freq: