siat 3.5.12__py3-none-any.whl → 3.6.6__py3-none-any.whl

siat/grafix.py

@@ -24,6 +24,11 @@ import matplotlib.pyplot as plt
 import matplotlib.dates as mdate
 #import matplotlib.font_manager as fm
 #==============================================================================
+
+#设置刻度线风格：in，out，inout
+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.dpi']=300
@@ -55,10 +60,6 @@ plt.rcParams['axes.grid']=False
 #plt.rcParams['grid.linewidth']=0.5
 
 
-#设置刻度线风格：in，out，inout
-plt.rcParams['xtick.direction'] = 'in'  # 将x轴的刻度线方向设置向内
-plt.rcParams['ytick.direction'] = 'in'  # 将y轴的刻度方向设置向内内
-
 #设置x，y 的主刻度定位器
 #from matplotlib.pyplot import MultipleLocator
 
@@ -115,7 +116,11 @@ if __name__ =="__main__":
     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, \
+              power=0,zeroline=False, \
+              attention_value='',attention_value_area='', \
+              attention_point='',attention_point_area='', \
+              average_value=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, \
@@ -249,12 +254,69 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
             plt.axhline(y=hline,ls=":",c="black",linewidth=2,label='')
             haveLegend=False
     else:
+        #不在必要，被attention_value的逻辑替代
         if isinstance(zeroline,float) or isinstance(zeroline,int):
             hline=zeroline
             plt.axhline(y=hline,ls=":",c="darkorange",linewidth=3,label=text_lang("关注值","Attention"))
             haveLegend=True
             footnote=footnote + text_lang("，关注值",", Attention ")+str(hline)
+
+    #用于关注值的颜色列表
+    atv_color_list=["lightgray","paleturquoise","wheat","khaki","lightsage"]
+    #用于关注点的颜色列表
+    atp_color_list=["crimson","dodgerblue","magenta","lightseagreen","chocolate"]
+
+    if not attention_value=='':
+        if isinstance(attention_value,int) or isinstance(attention_value,float):
+            atv_list=[attention_value]
+        elif isinstance(attention_value,list):
+            atv_list=attention_value
+        else:
+            atv_list=[]
+        if not atv_list==[] and not atv_list==['']:
+            for at in atv_list:
+                pos=atv_list.index(at)
+                color=atv_color_list[pos]
+                plt.axhline(y=at,ls=":",c=color,linewidth=2,label=text_lang("关注值","Attention value ")+str(at))
+
+    if not attention_value_area=='':
+        if isinstance(attention_value_area,list) and len(attention_value_area)>=2:
+            plt.fill_between(df.index,attention_value_area[0],attention_value_area[1],color='lightgray',alpha=0.5)
     
+    import pandas as pd
+    if not attention_point=='':
+        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=[]
+        if not atp_list==[] and not atp_list==['']:
+            
+            for at in atp_list:
+                pos=atp_list.index(at)
+                color=atp_color_list[pos]
+                
+                #判断是否日期字符串
+                try:
+                    atpd=pd.to_datetime(at)
+                except:
+                    atpd=at
+                plt.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:
+                    appd=pd.to_datetime(ap)
+                except:
+                    appd=ap
+                apa_list=apa_list+[appd]
+                
+            yaxis_data=plt.ylim()
+            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"))
@@ -300,6 +362,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     
+    plt.legend()
     plt.show()
     plt.close()
     
@@ -322,7 +385,9 @@ 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,yline=999,xline=999, \
+               zeroline=False,twinx=False, \
+                   yline=999,attention_value_area='', \
+                   xline=999,attention_point_area='', \
                resample_freq='H',loc1='best',loc2='best', \
                color1='red',color2='blue',facecolor='whitesmoke'):
     """
@@ -336,6 +401,8 @@ def plot_line2(df1,ticker1,colname1,label1, \
     返回值：无
     注意：需要日期类型作为df索引
     """
+    DEBUG=False
+    
     #空值判断
     if len(df1) ==0:
         print ("  #Warning(plot_line2): no data to plot df1.")
@@ -344,11 +411,18 @@ def plot_line2(df1,ticker1,colname1,label1, \
     if (len(df1) ==0) and (len(df2) ==0):
         return
     
+    if DEBUG:
+        print("In plot_line2")
+        print("Going to plot_line2_coaxial")
+        print("yline=",yline,"; xline=",xline)
+    
     if not twinx:            
         plot_line2_coaxial(df1,ticker1,colname1,label1, \
                 df2,ticker2,colname2,label2, \
                 ylabeltxt,titletxt,footnote,power,datatag1,datatag2,zeroline, \
-                yline,xline,resample_freq=resample_freq, \
+                    yline=yline,attention_value_area=attention_value_area, \
+                    xline=xline,attention_point_area=attention_point_area, \
+                resample_freq=resample_freq, \
                 loc1=loc1,loc2=loc2, \
                 color1=color1,color2=color2,facecolor=facecolor)
     else:
@@ -356,6 +430,7 @@ def plot_line2(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)
     return
@@ -366,7 +441,9 @@ def plot2_line2(df1,ticker1,colname1,label1, \
                df2,ticker2,colname2,label2, \
                ylabeltxt,titletxt,footnote, \
                power=0,datatag1=False,datatag2=False,yscalemax=5, \
-               zeroline=False,twinx=False,yline=999,xline=999, \
+               zeroline=False,twinx=False, \
+                   yline=999,attention_value_area='', \
+                   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'):
@@ -401,9 +478,11 @@ def plot2_line2(df1,ticker1,colname1,label1, \
     
     if not twinx:            
         plot_line2_coaxial2(df1,ticker1,colname1,label1, \
-                           df2,ticker2,colname2,label2, \
+                            df2,ticker2,colname2,label2, \
                 ylabeltxt,titletxt,footnote,power,datatag1,datatag2,zeroline, \
-                yline,xline,resample_freq=resample_freq, \
+                    yline=yline,attention_value_area=attention_value_area, \
+                    xline=xline,attention_point_area=attention_point_area, \
+                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)
@@ -411,6 +490,7 @@ def plot2_line2(df1,ticker1,colname1,label1, \
         plot_line2_twinx2(df1,ticker1,colname1,label1, \
                          df2,ticker2,colname2,label2, \
                          titletxt,footnote,power,datatag1,datatag2, \
+                             xline,attention_point_area=attention_point_area, \
                          resample_freq=resample_freq, \
                          loc1=loc1,loc2=loc2, \
                          date_range=date_range,date_freq=date_freq,date_fmt=date_fmt, \
@@ -425,7 +505,9 @@ 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', \
+                           yline=999,attention_value_area='', \
+                           xline=999,attention_point_area='', \
+                       resample_freq='H', \
                        loc1='best',loc2='best', \
                        color1='red',color2='blue',facecolor='whitesmoke', \
                        ticker_type='auto'):
@@ -440,6 +522,7 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
     返回值：无
     注意：需要日期类型作为df索引
     """
+    DEBUG=False
 
     #插值平滑
     try:
@@ -487,13 +570,79 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
     if zeroline:
         plt.axhline(y=0,ls=":",c="black",linewidth=2)
 
+    if DEBUG:
+        print("In plot_line2_coaxial:")
+        print("yline=",yline,"; xline=",xline)
+        
     #是否绘制水平线
     if yline != 999:
-        plt.axhline(y=yline,ls=":",c="black",linewidth=2)        
+        attention_value=yline
+        
+        #用于关注值的颜色列表
+        atv_color_list=["lightgray","paleturquoise","wheat","khaki","lightsage"]     
+        
+        if isinstance(attention_value,int) or isinstance(attention_value,float):
+            atv_list=[attention_value]
+        elif isinstance(attention_value,list):
+            atv_list=attention_value
+        else:
+            atv_list=[]
+
+        if DEBUG:
+            print("atv_list=",atv_list)
+            
+        if not atv_list==[] and not atv_list==['']:
+            for at in atv_list:
+                pos=atv_list.index(at)
+                color=atv_color_list[pos]
+                plt.axhline(y=at,ls=":",c=color,linewidth=2,label=text_lang("关注值","Attention value ")+str(at))        
+
+    if not attention_value_area=='':
+        if isinstance(attention_value_area,list) and len(attention_value_area)>=2:
+            plt.fill_between(df1.index,attention_value_area[0],attention_value_area[1],color='lightgray',alpha=0.5)
 
     #是否绘制垂直线
+    import pandas as pd
     if xline != 999:
-        plt.axvline(x=xline,ls=":",c="black",linewidth=1)   
+        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=[]
+        if not atp_list==[] and not atp_list==['']:
+            
+            for at in atp_list:
+                pos=atp_list.index(at)
+                color=atp_color_list[pos]
+                
+                #判断是否日期字符串
+                try:
+                    atpd=pd.to_datetime(at)
+                except:
+                    atpd=at
+
+                if DEBUG:
+                    print("atpd=",atpd)
+
+                plt.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:
+                    appd=pd.to_datetime(ap)
+                except:
+                    appd=ap
+                apa_list=apa_list+[appd]
+                
+            yaxis_data=plt.ylim()
+            plt.fill_betweenx(yaxis_data,apa_list[0],apa_list[1],color='powderblue',alpha=0.5)
     
     #绘证券1：制趋势线
     if power > 0:
@@ -599,7 +748,9 @@ def plot_line2_coaxial2(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', \
+                           yline=999,attention_value_area='', \
+                           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', \
@@ -665,6 +816,7 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
     if zeroline and ((min(df1[colname1]) < 0) or (min(df2[colname2]) < 0)):
         plt.axhline(y=0,ls=":",c="black",linewidth=2.5)
 
+    """
     #是否绘制水平线
     if yline != 999:
         plt.axhline(y=yline,ls=":",c="black",linewidth=2.5)        
@@ -672,6 +824,77 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
     #是否绘制垂直线
     if xline != 999:
         plt.axvline(x=xline,ls=":",c="black",linewidth=2.5)   
+    """
+    #是否绘制水平线
+    if yline != 999:
+        attention_value=yline
+        
+        #用于关注值的颜色列表
+        atv_color_list=["lightgray","paleturquoise","wheat","khaki","lightsage"]     
+        
+        if isinstance(attention_value,int) or isinstance(attention_value,float):
+            atv_list=[attention_value]
+        elif isinstance(attention_value,list):
+            atv_list=attention_value
+        else:
+            atv_list=[]
+
+        if DEBUG:
+            print("atv_list=",atv_list)
+            
+        if not atv_list==[] and not atv_list==['']:
+            for at in atv_list:
+                pos=atv_list.index(at)
+                color=atv_color_list[pos]
+                plt.axhline(y=at,ls=":",c=color,linewidth=2,label=text_lang("关注值","Attention value ")+str(at))        
+
+    if not attention_value_area=='':
+        if isinstance(attention_value_area,list) and len(attention_value_area)>=2:
+            plt.fill_between(df1.index,attention_value_area[0],attention_value_area[1],color='lightgray',alpha=0.5)
+
+    #是否绘制垂直线
+    import pandas as pd
+    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=[]
+        if not atp_list==[] and not atp_list==['']:
+            
+            for at in atp_list:
+                pos=atp_list.index(at)
+                color=atp_color_list[pos]
+                
+                #判断是否日期字符串
+                try:
+                    atpd=pd.to_datetime(at)
+                except:
+                    atpd=at
+
+                if DEBUG:
+                    print("atpd=",atpd)
+
+                plt.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:
+                    appd=pd.to_datetime(ap)
+                except:
+                    appd=ap
+                apa_list=apa_list+[appd]
+                
+            yaxis_data=plt.ylim()
+            plt.fill_betweenx(yaxis_data,apa_list[0],apa_list[1],color='powderblue',alpha=0.5)    
+    
     
     #绘证券1：制趋势线
     if power > 0:
@@ -769,7 +992,9 @@ 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',loc1='upper left',loc2='lower left', \
+                     resample_freq='H', \
+                         xline=999,attention_point_area='', \
+                     loc1='upper left',loc2='lower left', \
                      color1='red',color2='blue',facecolor='whitesmoke', \
                      ticker_type='auto'):
     """
@@ -783,6 +1008,8 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
     返回值：无
     注意：需要日期类型作为df索引
     """
+    DEBUG=False
+    
     #plt.rcParams['axes.grid']=False
     
     #插值平滑
@@ -820,11 +1047,57 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
     lwadjust=linewidth_adjust(df1)
     ax.plot(df1.index,df1[colname1],'-',label=label1txt, \
              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
+    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=[]
+
+        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:
+                    atpd=pd.to_datetime(at)
+                except:
+                    atpd=at
+                plt.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:
+                    appd=pd.to_datetime(ap)
+                except:
+                    appd=ap
+                apa_list=apa_list+[appd]
+                
+            yaxis_data=plt.ylim()
+            plt.fill_betweenx(yaxis_data,apa_list[0],apa_list[1],color='powderblue',alpha=0.5)
+
     #绘证券1：制趋势线
     if power > 0:
         lang=check_language()
@@ -936,6 +1209,7 @@ if __name__ =="__main__":
 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', \
                       date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
                       color1='red',color2='blue',facecolor='whitesmoke', \
@@ -1007,6 +1281,52 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
         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
+    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=[]
+
+        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:
+                    atpd=pd.to_datetime(at)
+                except:
+                    atpd=at
+                plt.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:
+                    appd=pd.to_datetime(ap)
+                except:
+                    appd=ap
+                apa_list=apa_list+[appd]
+                
+            yaxis_data=plt.ylim()
+            plt.fill_betweenx(yaxis_data,apa_list[0],apa_list[1],color='powderblue',alpha=0.5)
+
+
     #绘证券1：制趋势线
     if power > 0:
         lang=check_language()
@@ -1117,6 +1437,8 @@ 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, \
+                attention_value='',attention_value_area='', \
+                attention_point='',attention_point_area='', \
                mark_top=False,mark_bottom=False,mark_end=False, \
                ticker_type='auto',facecolor='whitesmoke'):
     """
@@ -1229,7 +1551,15 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             #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)
+        if not annotate or c in ["平均值","中位数"]:
+            if c in ["平均值","中位数"]:
+                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)
+        else:
+            plt.plot(dfg,linewidth=lwadjust,ls=lsc,marker=mkc,markersize=3)
+            
         lines = plt.gca().lines
         last_line_color = lines[-1].get_color()
         
@@ -1303,6 +1633,81 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                          xytext=(x_end, y_end),fontsize=annotate_size,
                          color=last_line_color)
 
+    #用于关注值的颜色列表
+    atv_color_list=["lightgray","paleturquoise","wheat","khaki","lightsage"]
+    #用于关注点的颜色列表
+    atp_color_list=["crimson","dodgerblue","magenta","lightseagreen","chocolate"]
+
+    if not attention_value=='':
+        if isinstance(attention_value,int) or isinstance(attention_value,float):
+            atv_list=[attention_value]
+        elif isinstance(attention_value,list):
+            atv_list=attention_value
+        else:
+            atv_list=[]
+        if not atv_list==[] and not atv_list==['']:
+            for at in atv_list:
+                pos=atv_list.index(at)
+                color=atv_color_list[pos]
+                plt.axhline(y=at,ls=":",c=color,linewidth=2,label=text_lang("关注值","Attention value ")+str(at))
+
+    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)
+            
+    import pandas as pd        
+    if not attention_point=='':
+        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=[]
+        if not atp_list==[] and not atp_list==['']:
+            
+            for at in atp_list:
+                pos=atp_list.index(at)
+                color=atp_color_list[pos]
+                
+                #判断是否日期字符串
+                try:
+                    atpd=pd.to_datetime(at)
+                except:
+                    atpd=at
+                
+                """
+                #纵轴最小值                    
+                yaxis_min=plt.ylim()[0]
+                arrow_dx=0
+                #各曲线在关注点的最大值
+                point_max=dfg.loc[atpd].max()
+                arrow_dy=point_max - yaxis_min
+                
+                if DEBUG:
+                    print("*** In draw_lines:")
+                    print("dfg.loc[atpd]",dfg.loc[atpd].values)
+                    print("yaxis_min=",yaxis_min)
+                    print("point_max=",point_max)
+                    print("arrow_dy=",arrow_dy)
+
+                plt.arrow(atpd,yaxis_min,arrow_dx,arrow_dy,ls=':',lw=2,fc=color,ec=color,alpha=0.5,shape='full', \
+                          width=0.05,length_includes_head=True)
+                """
+                plt.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:
+                    appd=pd.to_datetime(ap)
+                except:
+                    appd=ap
+                apa_list=apa_list+[appd]
+                
+            yaxis_data=plt.ylim()
+            plt.fill_betweenx(yaxis_data,apa_list[0],apa_list[1],color='powderblue',alpha=0.5)
+                
     #绘制水平辅助线
     if axhline_label !="":
         if '零线' in axhline_label:
@@ -1328,8 +1733,8 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
         plt.gca().set_facecolor("whitesmoke") 
         
     # 若不绘制annotate，则绘制图例
-    if not annotate:
-        plt.legend(loc=loc,fontsize=legend_txt_size)
+    #if not annotate:
+    plt.legend(loc=loc,fontsize=legend_txt_size)
     
     if plus_sign:
         # 尝试改变纵轴刻度格式：给正数添加正号+，以便突出显示增减幅度
@@ -1352,7 +1757,15 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                 data_label=False,resample_freq='6H',smooth=True, \
                 date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
                 colorlist=[],lslist=[],lwlist=[], \
-                band_area='',loc='best',annotate=False,annotate_value=False, \
+                #指定纵轴两个变量之间的区域
+                band_area='',loc='best', \
+                    attention_value='', \
+                    #指定纵轴两个数值之间的区域
+                    attention_value_area='', \
+                    attention_point='', \
+                    #指定两个横轴之间的区域
+                    attention_point_area='', \
+                annotate=False,annotate_value=False, \
                 mark_top=False,mark_bottom=False,mark_end=False, \
                 facecolor='whitesmoke'):
     """
@@ -1444,11 +1857,20 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             llw=linewidth_adjust(df)
         
         if (lcolor !='') and (lls !=''):
-            plt.plot(df[c],label=c,linewidth=llw,ls=lls,color=lcolor)
+            if not annotate:
+                plt.plot(df[c],label=c,linewidth=llw,ls=lls,color=lcolor)
+            else:
+                plt.plot(df[c],linewidth=llw,ls=lls,color=lcolor)
         elif (lcolor !=''):
-            plt.plot(df[c],label=c,linewidth=llw,color=lcolor)
+            if not annotate:
+                plt.plot(df[c],label=c,linewidth=llw,color=lcolor)
+            else:
+                plt.plot(df[c],linewidth=llw,color=lcolor)
         else:
-            plt.plot(df[c],label=c,linewidth=llw)
+            if not annotate:
+                plt.plot(df[c],label=c,linewidth=llw)
+            else:
+                plt.plot(df[c],linewidth=llw)
             
         lines = plt.gca().lines; last_line_color = lines[-1].get_color()
         
@@ -1539,8 +1961,10 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             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],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='')
             
     #绘制水平辅助线
     if axhline_label !="":
@@ -1551,6 +1975,61 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             plt.axhline(y=axhline_value,color='black',linestyle='--',linewidth=2)  
         else:
             plt.axhline(y=axhline_value,label=axhline_label,color='black',linestyle='--',linewidth=2)  
+
+    #用于关注值的颜色列表
+    atv_color_list=["lightgray","paleturquoise","wheat","khaki","lightsage"]
+    #用于关注点的颜色列表
+    atp_color_list=["crimson","dodgerblue","magenta","lightseagreen","chocolate"]
+
+    if not attention_value=='':
+        if isinstance(attention_value,int) or isinstance(attention_value,float):
+            atv_list=[attention_value]
+        elif isinstance(attention_value,list):
+            atv_list=attention_value
+        else:
+            atv_list=[]
+        if not atv_list==[] and not atv_list==['']:
+            for at in atv_list:
+                pos=atv_list.index(at)
+                color=atv_color_list[pos]
+                plt.axhline(y=at,ls=":",c=color,linewidth=2,label=text_lang("关注值","Attention value ")+str(at))
+
+    if not attention_value_area=='':
+        if isinstance(attention_value_area,list) and len(attention_value_area)>=2:
+            plt.fill_between(df.index,attention_value_area[0],attention_value_area[1],color='lightgray',alpha=0.5)
+        
+    import pandas as pd
+    if not attention_point=='':
+        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=[]
+        if not atp_list==[] and not atp_list==['']:
+            for at in atp_list:
+                pos=atp_list.index(at)
+                color=atp_color_list[pos]
+                
+                #判断是否日期字符串
+                try:
+                    atpd=pd.to_datetime(at)
+                except:
+                    atpd=at
+                plt.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:
+                    appd=pd.to_datetime(ap)
+                except:
+                    appd=ap
+                apa_list=apa_list+[appd]
+                
+            yaxis_data=plt.ylim()
+            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)
@@ -1565,8 +2044,8 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
         print("  #Warning(draw_lines2): color",facecolor,"is unsupported, changed to default setting")
         plt.gca().set_facecolor("whitesmoke") 
         
-    if not annotate:
-        plt.legend(loc=loc,fontsize=legend_txt_size)
+    #if not annotate:
+    plt.legend(loc=loc,fontsize=legend_txt_size)
         
     #设置绘图风格：关闭网格虚线
     plt.rcParams['axes.grid']=False