siat 3.1.15__py3-none-any.whl → 3.1.21__py3-none-any.whl

siat/stock_technical.py

@@ -2451,14 +2451,18 @@ def security_technical2(ticker,start='default',end='default', \
                 loc1='best',loc2='best', \
                 ticker_type='auto', \
                     
-                facecolor='papayawhip'):
+                attention_values=[0,30,50,80], \
+                facecolor='papayawhip',price_line_color='gray'):
     """
     
     功能：计算和绘制证券技术分析指标的简易图，仅供进一步探索使用，仅用于单个证券(股债基)
+    
     支持的探索指标：仅供探索使用
     OBV、SAR、VOL、PSY、ARBR、CR、EMV、TRIX、DMA、BIAS、CCI、W%R、ROC、DMI
     支持的其他指标：不如单独的指令功能强
     MACD、RSI、KDJ、BOLL
+    
+    关注的阈值：默认[0,30,50,80]，可以自定义，但0线一般要保留。
     """
     #检查证券代码
     if not isinstance(ticker,str):
@@ -2622,6 +2626,7 @@ def security_technical2(ticker,start='default',end='default', \
     #plt.gca().set_facecolor('whitesmoke')
     fig.gca().set_facecolor(facecolor) #放在这里生效，放尾部不生效
     
+    """
     line0=False; line30=False; line50=False; line80=False
     for l in tech_line_collist:
         lmax=df1[l].max(); lmin=df1[l].min()
@@ -2644,6 +2649,28 @@ def security_technical2(ticker,start='default',end='default', \
     #绘制50线
     if line80:
         plt.axhline(y=80,ls=":",c="black",linewidth=2)
+    """
+    color_list=['k','g','b','c','m','y','r']
+    attention_draws=[False] * len(attention_values)
+
+    for l in tech_line_collist:
+        ax.plot(df1.index,df1[l],label=l.upper())
+        
+        #判断是否绘制关注线
+        lmax=df1[l].max(); lmin=df1[l].min()
+        
+        for al in attention_values:
+            pos=attention_values.index(al)
+            
+            line_al=False
+            if lmax >= al >= lmin: 
+                line_al=True
+            
+            #如果需要绘制关注线，且尚未绘制过，则绘制
+            if line_al and not attention_draws[pos]:
+                plt.axhline(y=attention_values[pos],ls=":",c=color_list[pos],linewidth=2)
+
+                attention_draws[pos]=True
         
     ylabeltxt1=technical1+'指标'
     if mag_label != '':
@@ -2654,7 +2681,7 @@ def security_technical2(ticker,start='default',end='default', \
     ax2 = ax.twinx()
     ylabeltxt2='收盘价'
     ax2.set_ylabel(ylabeltxt2,fontsize=ylabel_txt_size)
-    ax2.plot(df1.index,df1[indicator],label=ylabeltxt2,linestyle='dotted',color='gray')   
+    ax2.plot(df1.index,df1[indicator],label=ylabeltxt2,linestyle='dotted',color=price_line_color)   
     ax2.legend(loc=loc2,fontsize=legend_txt_size)
     
     titletxt=ticker_name(ticker)+': '+tech_list[technical1]+technical1

{siat-3.1.15.dist-info → siat-3.1.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.1.15
+Version: 3.1.21
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University

{siat-3.1.15.dist-info → siat-3.1.21.dist-info}/RECORD

@@ -112,7 +112,7 @@ siat/stock_list_china_test.py,sha256=gv14UwMMvkZqtb6G7DCTSuehIwVHuVwu7w60p6gyHoo
 siat/stock_prices_kneighbors.py,sha256=WfZvo5EyeBsm-T37zDj7Sl9dPSRq5Bx4JxIJ9IUum6s,36738
 siat/stock_prices_linear.py,sha256=-OUKRr27L2aStQgJSlJOrJ4gay_G7P-m-7t7cU2Yoqk,13991
 siat/stock_profile.py,sha256=B3eIwzEmiCqiCaxIlhfdEPsQBoW1PFOe1hkiY3mVF6Y,26038
-siat/stock_technical.py,sha256=YGfvsV5Uu9xaZgJO7dwl1FsvszwX3jsGyJxqJgNamQk,112859
+siat/stock_technical.py,sha256=v84ZcykDJG4fj3zevqjIZRfnQKvM69XZ3cn6b8DVP7I,113818
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
 siat/stooq.py,sha256=dOc_S5HLrYg48YAKTCs1eX8UTJOOkPM8qLL2KupqlLY,2470
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
@@ -133,7 +133,7 @@ siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
 siat/valuation_china.py,sha256=Tde2LzPDQy3Z7xOQQDw4ckQMPdROp_z0-GjFE6Z5_lI,67639
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=f-oDewg7bPzyNanz_Y_jLH68NowAA3gXFehW_weKGG0,14898
-siat-3.1.15.dist-info/METADATA,sha256=hzUOjL_42SOIUQJyxLmvKaDmWLU5k6U6_Bx0XB8Oq_c,1448
-siat-3.1.15.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.1.15.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.1.15.dist-info/RECORD,,
+siat-3.1.21.dist-info/METADATA,sha256=USf7kX9nSPN3E3jLaESifAfvZBR6tPudAjRsMdGLAJk,1448
+siat-3.1.21.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.1.21.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.1.21.dist-info/RECORD,,