siat 2.0.19__py3-none-any.whl → 2.1.5__py3-none-any.whl

siat/grafix.py

@@ -911,7 +911,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'):
+               data_label=True,resample_freq='H',smooth=True,linewidth=1.5,loc='best',annotate=False):
     """
     函数功能：根据df的内容绘制折线图
     输入参数：
@@ -974,7 +974,17 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             continue
         
         #plt.plot(dfg,label=c,linewidth=linewidth,ls=lsc,marker=mkc,markersize=3)
-        plt.plot(dfg,label=codetranslate(c),linewidth=linewidth,ls=lsc,marker=mkc,markersize=3)
+        if not annotate:
+            plt.plot(dfg,label=codetranslate(c),linewidth=linewidth,ls=lsc,marker=mkc,markersize=3)
+        else:
+            plt.plot(dfg[c],label=codetranslate(c),linewidth=linewidth,ls=lsc,marker=mkc,markersize=3)
+            df_end=dfg.tail(1)
+            y_end = round(df_end[c].min(),2)    # 末端的y坐标
+            x_end = df_end[c].idxmin() # 末端值的x坐标 
+            plt.annotate(text=codetranslate(c)+':'+str(y_end), 
+                                 xy=(x_end, y_end),
+                                 xytext=(x_end, y_end),fontsize=9)   
+            
         #plt.plot(df[c],label=c,linewidth=1.5,marker=mkc,markersize=3)
         #为折线加数据标签
         if data_label==True:

siat/stock.py

@@ -1237,7 +1237,8 @@ def compare_msecurity(tickers,measure,start,end, \
                       axhline_value=0,axhline_label='', \
                       preprocess='none',linewidth=1.5, \
                       scaling_option='start', \
-                      graph=True,loc='best'):
+                      graph=True,loc='best', \
+                      annotate=False):
     """
     功能：比较并绘制多条证券指标曲线（多于2条），个数可为双数或单数
     注意：
@@ -1496,9 +1497,10 @@ def compare_msecurity(tickers,measure,start,end, \
             axhline_label='收益零线'
 
     draw_lines(dfs2,y_label,x_label,axhline_value,axhline_label,title_txt, \
-               data_label=False,resample_freq='H',smooth=True,linewidth=linewidth,loc=loc)
+               data_label=False,resample_freq='H',smooth=True,linewidth=linewidth,loc=loc, \
+               annotate=annotate)
 
-    return dfs
+    return dfs2
 
 if __name__ =="__main__":
     tickers=['000001.SS',"^HSI","^TWII"]
@@ -1589,7 +1591,7 @@ if __name__ =="__main__":
     df=compare_msecurity(tickers2,measure1,start,end)
     df=compare_msecurity(tickers2,measure2,start,end)
 #==============================================================================
-def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,20]):
+def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10]):
     """
     功能：绘制证券价格K线图。
     输入：证券代码ticker；开始日期fromdate，结束日期todate；
@@ -1687,17 +1689,32 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,20]):
              figratio=(12.8,7.2)
              )
     """
-    mpf.plot(daily,type='candle',
+    fig, axlist = mpf.plot(daily,type='candle',
          volume=volume,
+         show_nontrading=False,#自动剔除非交易日空白
          style=s,
-         title=titletxt,
+         #title=titletxt,
          datetime_format='%Y-%m-%d',
          tight_layout=True,
+         #tight_layout=False,
          xrotation=15,
          ylabel=texttranslate(ylabel_txt),
          ylabel_lower=texttranslate(ylabel_lower_txt),
          mav=mav,
-         figratio=(12.8,7.2))       
+         figratio=(12.8,7.2),
+         #figscale=1.5,
+         returnfig=True
+         )       
+    
+    # add a title the the correct axes, 0=first subfigure
+    titletxt=titletxt+"：K线图走势，日移动均线="+str(mav)
+    axlist[0].set_title(titletxt,
+                        fontsize=16,
+                        #style='italic',
+                        #fontfamily='fantasy',
+                        loc='center')
+
+    fig.show()
     
     reset_plt()
     
@@ -1767,6 +1784,13 @@ if __name__ =="__main__":
     line=False
     price=candlestick_pro("000002.SZ","2020-2-1","2020-2-29")    
 #==============================================================================
+if __name__ =="__main__":
+    stkcd='BABA'
+    fromdate='2023-6-5'
+    todate='2023-6-9'
+    
+    colorup='red';colordown='green';width=0.7
+    
 def candlestick_demo(stkcd,fromdate,todate,colorup='red',colordown='green',width=0.7):
     """
     功能：绘制证券价格K线图，叠加收盘价。
@@ -1780,7 +1804,9 @@ def candlestick_demo(stkcd,fromdate,todate,colorup='red',colordown='green',width
     if p is None:
         print("  #Error(candlestick_demo): failed to get price info of",stkcd,fromdate,todate)
         return    
-
+    
+    p['Date']=p.index
+    
     import numpy as np
     b= np.array(p.reset_index()[['Date','Open','High','Low','Close']])
     
@@ -1831,7 +1857,7 @@ def candlestick_demo(stkcd,fromdate,todate,colorup='red',colordown='green',width
         price_txt='Price'
         source_txt="Source: "
     else:
-        titletxt=texttranslate("证券价格走势蜡烛图演示：")+codetranslate(str(stkcd))
+        titletxt=texttranslate("K线图/蜡烛图演示：")+codetranslate(str(stkcd))
         price_txt='价格'
         source_txt="数据来源: "