siat 3.2.20__py3-none-any.whl → 3.2.30__py3-none-any.whl

siat/stock_technical.py

@@ -90,7 +90,7 @@ if __name__ =="__main__":
     
     BIAS_days=[6,12,24]
     
-    CCI_day=14; CCI_madays=[5,20]
+    CCI_days=[6,12]
     
     WR_days=[10,6]
     
@@ -183,13 +183,15 @@ def calc_technical(df,start,end,technical='MACD', \
             
         TRIX_day=12,TRIX_madays=[20], \
         BIAS_days=[6,12,24], \
-        CCI_day=14,CCI_madays=[5,20], \
+        CCI_days=[6,12], \
         WR_days=[10,6], \
         ROC_day=12,ROC_madays=[6], \
         DMI_DIdays=[14],DMI_ADXdays=[6], \
             
-        MFI_day=14,MFI_madays=[14], \
-        MOM_day=10,MOM_madays=[10], \
+        MFI_day=14,MFI_madays=[6], \
+            
+        #提出选择12日或25日，移动均线为10日            
+        MOM_day=12,MOM_madays=6, \
             
         #需要显示SAR
         SAR_day=4,SAR_madays=[5,20], \
@@ -201,7 +203,7 @@ def calc_technical(df,start,end,technical='MACD', \
         TSF_day=14,TSF_madays=[5,20], \
             
         #需要显示AD
-        AD_day=26,AD_madays=[5,20], \
+        AD_madays=[5], \
         
         #不建议使用复权价，因为最高最低价和开盘价没有复权价！
         indicator='Close', \
@@ -586,11 +588,11 @@ def calc_technical(df,start,end,technical='MACD', \
             TRIX_madays=[TRIX_madays]
         for d in TRIX_madays:    
             df['trix_ma'+str(d)] = talib.MA(df['trix'],timeperiod=d)    
-        
+        """
         if not more_details:
             #不保留TRIX
             df.drop(columns = ['trix'],inplace=True) 
-
+        """
     #=========== DMA: 平均线差
     """
     计算公式：
@@ -640,11 +642,14 @@ def calc_technical(df,start,end,technical='MACD', \
     """
     计算过程：
     CCI(N日) = （TP-MA）÷MD÷0.015
-    说明：TP = （最高价+最低价+收盘价）÷3；MA=最近N日收盘价的累计之和÷N；MD=最近N日（MA-收盘价）的累计之和÷N；0.015为计算系数；N为计算周期，默认为14天
+    说明：TP = （最高价+最低价+收盘价）÷3；
+    MA=最近N日收盘价的累计之和÷N；
+    MD=最近N日（MA-收盘价）的累计之和÷N；
+    0.015为计算系数；N为计算周期，默认为14天
     """ 
     if technical=='CCI':
-    
-        df['cci'] = talib.CCI(df['High'],df['Low'],df[indicator],timeperiod=CCI_day)
+        """
+        df['cci'] = talib.CCI(df['High'],df['Low'],df[indicator],timeperiod=CCI_days)
         
         if not isinstance(CCI_madays,list):
             CCI_madays=[CCI_madays]
@@ -655,6 +660,14 @@ def calc_technical(df,start,end,technical='MACD', \
         if not more_details:
             #不保留指标本身
             df.drop(columns = ['cci'],inplace=True) 
+        """
+        if not isinstance(CCI_days,list):
+            CCI_days=[CCI_days]
+            
+        for d in CCI_days:    
+            df['cci'+str(d)] = talib.CCI(df['High'],df['Low'],df[indicator],timeperiod=d)
+        
+        
     #=========== W%R: 威廉指标   
     """
     N日W%R = [(Hn-Ct)/(Hn-Ln)]*100
@@ -733,11 +746,11 @@ def calc_technical(df,start,end,technical='MACD', \
             MFI_madays=[MFI_madays]
         for d in MFI_madays:    
             df['mfi_ma'+str(d)] = df['mfi'].rolling(window=d).mean()
-    
+        """
         if not more_details:
             #不保留指标本身
             df.drop(columns = ['mfi'],inplace=True) 
-    
+        """
     #=========== MOM：动量指标
     """
     
@@ -749,11 +762,11 @@ def calc_technical(df,start,end,technical='MACD', \
             MOM_madays=[MOM_madays]
         for d in MOM_madays:    
             df['mom_ma'+str(d)] = df['mom'].rolling(window=d).mean()   
-    
+        """
         if not more_details:
             #不保留指标本身
             df.drop(columns = ['mom'],inplace=True) 
-    
+        """
     #=========== BETA：贝塔系数
     """
     动态贝塔系数？
@@ -794,18 +807,17 @@ def calc_technical(df,start,end,technical='MACD', \
     """
     if technical=='AD':
     
-        #df['ad'] = talib.AD(df['High'],df['Low'],df[indicator],df['Volume'],timeperiod=AD_day)
         df['ad'] = talib.AD(df['High'],df['Low'],df[indicator],df['Volume'])
         
         if not isinstance(AD_madays,list):
             AD_madays=[AD_madays]
         for d in AD_madays:    
             df['ad_ma'+str(d)] = df['ad'].rolling(window=d).mean()   
-    
+        """
         if not more_details:
             #不保留指标本身
             df.drop(columns = ['ad'],inplace=True) 
-
+        """
 
     
     #过滤日期===================================================================
@@ -854,7 +866,8 @@ def security_MACD(ticker,start='default',end='default', \
              MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
              resample_freq='6H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
+             price_line_color='red'):
     """
     套壳函数：可用于股票、交易所债券、交易所基金、部分期货期权(限美股)
     """
@@ -864,7 +877,8 @@ def security_MACD(ticker,start='default',end='default', \
                  MACD_signalperiod=MACD_signalperiod, \
                  resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
                  loc1=loc1,loc2=loc2, \
-                 graph=graph,printout=printout,ticker_type=ticker_type,source=source)
+                 graph=graph,printout=printout,ticker_type=ticker_type,source=source, \
+                 price_line_color=price_line_color)
     return df
     
     
@@ -873,7 +887,8 @@ def stock_MACD(ticker,start='default',end='default', \
              MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
              resample_freq='H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
+             price_line_color='red'):
     """
     功能：计算股票的技术分析指标MACD
     输入：df，四种股价Open/Close/High/Low，成交量Volume
@@ -998,7 +1013,7 @@ def stock_MACD(ticker,start='default',end='default', \
     if ('EMA' in graph) or ('ALL' in graph):
         EMA_cols=[]
         for mad in EMA_days:
-            col='EMA'+str(mad)+'指数加权均线'
+            col='EMA'+str(mad)+'指数移动平均线'
             EMA_cols=EMA_cols+[col]
             df[col] = talib.EMA(df['Close'],timeperiod=mad)
         
@@ -1029,13 +1044,13 @@ def stock_MACD(ticker,start='default',end='default', \
         
         df3=df1[['Close']+EMA_cols]
         df3.rename(columns={'Close':'收盘价'},inplace=True)
-        title_txt="证券价格走势分析："+ticker_name(ticker,ticker_type)+"，指数加权均线"
+        title_txt="证券价格走势分析："+ticker_name(ticker,ticker_type)+"，指数移动平均线"
         draw_lines(df3,y_label,x_label,axhline_value,axhline_label,title_txt, \
                    data_label=False,resample_freq=resample_freq,smooth=smooth,linewidth=linewidth*2)        
 
         if printout:
             if len(dft3)!=0:            
-                print("\n== 指数加权均线交叉 ==")
+                print("\n== 指数移动平均线交叉 ==")
                 alignlist=['left','center']
                 print(dft3[['日期','交叉类型']].to_markdown(index=False,tablefmt='plain',colalign=alignlist))
             else:
@@ -1121,8 +1136,8 @@ def stock_MACD(ticker,start='default',end='default', \
         """
         macd_plus=df4[df4['柱线MACD']>=0]
         macd_minus=df4[df4['柱线MACD']<=0]
-        ax.bar(macd_plus.index,macd_plus['柱线MACD'],color='red')
-        ax.bar(macd_minus.index,macd_minus['柱线MACD'],color='green',label='柱线MACD')
+        ax.bar(macd_plus.index,macd_plus['柱线MACD'],color='red',alpha=0.5)
+        ax.bar(macd_minus.index,macd_minus['柱线MACD'],color='green',label='柱线MACD',alpha=0.5)
         
         # 绘制水平辅助线
         #plt.axhline(y=0,label='指标零线',color='cyan',linestyle=':',linewidth=linewidth*2) 
@@ -1149,7 +1164,7 @@ def stock_MACD(ticker,start='default',end='default', \
             df5=df4
         
         ax2 = ax.twinx()
-        ax2.plot(df5['收盘价'],label='收盘价',linewidth=linewidth,color='gray',ls='--')
+        ax2.plot(df5['收盘价'],label='收盘价',linewidth=linewidth,color=price_line_color,ls='--')
         
         # 右侧坐标轴标记
         ax2.set_ylabel('收盘价',fontsize=ylabel_txt_size)
@@ -1225,7 +1240,8 @@ def security_RSI(ticker,start='default',end='default', \
              RSI_days=[6,12,24],RSI_lines=[20,50,80], \
              resample_freq='6H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
+             price_line_color='red'):
     """
     套壳函数，除了股票，还可用于交易所债券和交易所基金（如ETF和REITS）
     """
@@ -1233,7 +1249,8 @@ def security_RSI(ticker,start='default',end='default', \
                  RSI_days=RSI_days,RSI_lines=RSI_lines, \
                  resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
                  loc1=loc1,loc2=loc2, \
-                 graph=graph,printout=printout,ticker_type=ticker_type,source=source)
+                 graph=graph,printout=printout,ticker_type=ticker_type,source=source, \
+                 price_line_color=price_line_color)
     return df
 
     
@@ -1241,7 +1258,8 @@ def stock_RSI(ticker,start='default',end='default', \
              RSI_days=[6,12,24],RSI_lines=[20,50,80], \
              resample_freq='H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
+             price_line_color='red'):
     """
     功能：计算股票的技术分析指标RSI
     输入：df，四种股价Open/Close/High/Low，成交量Volume
@@ -1295,6 +1313,10 @@ def stock_RSI(ticker,start='default',end='default', \
         return None   
     
     #============ 计算RSI 
+    if len(RSI_days) < 3:
+        print("  #Warning(stock_RSI): RSI_days parameter needs 3 different days")
+        return None
+        
     #df['rsi'] = talib.RSI(df['Close'], timeperiod=RSI_days)
     RSI_cols=[]
     RSI_seq=1
@@ -1383,7 +1405,7 @@ def stock_RSI(ticker,start='default',end='default', \
             df5=df4
         
         ax2 = ax.twinx()
-        ax2.plot(df5['收盘价'],label='收盘价',linewidth=linewidth,color='gray',ls='--')
+        ax2.plot(df5['收盘价'],label='收盘价',linewidth=linewidth,color=price_line_color,ls='--')
         
         # 右侧坐标轴标记
         ax2.set_ylabel('收盘价',fontsize=ylabel_txt_size)
@@ -1466,7 +1488,8 @@ def security_KDJ(ticker,start='default',end='default', \
              KDJ_days=[9,3,3],matypes=[0,0],KDJ_lines=[20,50,80], \
              resample_freq='6H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
+             price_line_color='red'):
     """
     套壳函数
     """
@@ -1474,7 +1497,8 @@ def security_KDJ(ticker,start='default',end='default', \
                  KDJ_days=KDJ_days,matypes=matypes,KDJ_lines=KDJ_lines, \
                  resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
                  loc1=loc1,loc2=loc2, \
-                 graph=graph,printout=printout,ticker_type=ticker_type,source=source)
+                 graph=graph,printout=printout,ticker_type=ticker_type,source=source, \
+                 price_line_color=price_line_color)
     return df
 
     
@@ -1482,7 +1506,8 @@ def stock_KDJ(ticker,start='default',end='default', \
              KDJ_days=[9,3,3],matypes=[0,0],KDJ_lines=[20,50,80], \
              resample_freq='H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
+             price_line_color='red'):
     """
     功能：计算股票的技术分析指标KDJ
     输入：df，四种股价Open/Close/High/Low，成交量Volume
@@ -1674,7 +1699,7 @@ def stock_KDJ(ticker,start='default',end='default', \
             df5=df4
         
         ax2 = ax.twinx()
-        ax2.plot(df5['收盘价'],label='收盘价',linewidth=linewidth,color='gray',ls='--')
+        ax2.plot(df5['收盘价'],label='收盘价',linewidth=linewidth,color=price_line_color,ls='--')
         
         # 右侧坐标轴标记
         ax2.set_ylabel('收盘价',fontsize=ylabel_txt_size)
@@ -2442,6 +2467,8 @@ if __name__ =="__main__":
 def security_technical(ticker,start='default',end='default', \
              MA_days=[5,20],EMA_days=[5,20], \
              MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
+                 
+             #RSI参数个数必须为3个，否则出错
              RSI_days=[6,12,24],RSI_lines=[20,50,80], \
              KDJ_days=[9,3,3],matypes=[0,0],KDJ_lines=[20,50,80], \
              boll_days=20,boll_years=7, \
@@ -2450,7 +2477,8 @@ def security_technical(ticker,start='default',end='default', \
              graph=['ALL'],printout=False, \
              date_range=False,date_freq=False,annotate=False, \
              technical=['MACD'],indicator='Close', \
-             ticker_type='auto',source='auto'):
+             ticker_type='auto',source='auto', \
+             price_line_color='red'):
     
     """
     功能：技术分析中的MACD/RSI/KDJ/布林带，支持教学演示，支持参数调节。
@@ -2509,21 +2537,24 @@ def security_technical(ticker,start='default',end='default', \
              MACD_fastperiod=MACD_fastperiod,MACD_slowperiod=MACD_slowperiod,MACD_signalperiod=MACD_signalperiod, \
              resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
              loc1=loc1,loc2=loc2, \
-             graph=graph1,printout=printout,ticker_type=ticker_type,source=source)
+             graph=graph1,printout=printout,ticker_type=ticker_type,source=source, \
+             price_line_color=price_line_color)
        
     if 'RSI' in technical1:
         df=security_RSI(ticker=ticker,start=fromdate,end=todate, \
              RSI_days=RSI_days,RSI_lines=RSI_lines, \
              resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
              loc1=loc1,loc2=loc2, \
-             graph=graph1,printout=printout,ticker_type=ticker_type,source=source)
+             graph=graph1,printout=printout,ticker_type=ticker_type,source=source, \
+             price_line_color=price_line_color)
 
     if 'KDJ' in technical1:
         df=security_KDJ(ticker=ticker,start=fromdate,end=todate, \
              KDJ_days=KDJ_days,matypes=matypes,KDJ_lines=KDJ_lines, \
              resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
              loc1=loc1,loc2=loc2, \
-             graph=graph1,printout=printout,ticker_type=ticker_type,source=source)
+             graph=graph1,printout=printout,ticker_type=ticker_type,source=source, \
+             price_line_color=price_line_color)
 
     if 'Bollinger' in technical1 and 'Close' in indicator1:
         df=security_Bollinger(ticker=ticker,start=fromdate,end=todate,boll_days=boll_days, \
@@ -2586,21 +2617,21 @@ if __name__ =="__main__":
     TRIX_day=12; TRIX_madays=20
     DMA_fastperiod=10; DMA_slowperiod=50; DMA_madays=10
     BIAS_days=[6,12,24]
-    CCI_day=14; CCI_madays=[5,10]
+    CCI_days=[6,12]
     WR_days=[10,6]
     ROC_day=12; ROC_madays=6
     DMI_DIdays=14; DMI_ADXdays=6
-    MFI_day=14; MFI_madays=[3,5]
-    MOM_day=10; MOM_madays=[5,20]
+    MFI_day=14; MFI_madays=[6]
+    MOM_day=12; MOM_madays=6
     SAR_day=4; SAR_madays=[5,20]
     BETA_day=5; BETA_madays=[5,20]
     TSF_day=14; TSF_madays=[5,10]
-    AD_day=26; AD_madays=[5,20]
+    AD_madays=[5]
     
     
     ticker='002594.SZ';ticker_type='auto'
     start='2024-5-1'; end='2024-6-13'; ahead_days=30*8
-    technical='OBV'; indicator='Close'
+    technical='BIAS'; indicator='Close'
     
     attention_values=[0,25,50,75]
     more_details=True
@@ -2661,11 +2692,11 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
         
         DMA_fastperiod=10,DMA_slowperiod=50,DMA_madays=[10], \
         
-        TRIX_day=12,TRIX_madays=[5,10], \
+        TRIX_day=12,TRIX_madays=[20], \
             
         BIAS_days=[6,12,24], \
             
-        CCI_day=14,CCI_madays=[5,10], \
+        CCI_days=[6,12], \
             
         WR_days=[13,34,89], \
             
@@ -2673,9 +2704,10 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
             
         DMI_DIdays=7,DMI_ADXdays=6, \
         
-        #资金流：3日作为信号，5日作为确认信号
-        MFI_day=14,MFI_madays=[3,5], \
-        MOM_day=10,MOM_madays=[5,20], \
+        #资金流：
+        MFI_day=14,MFI_madays=[6], \
+            
+        MOM_day=12,MOM_madays=6, \
             
         #需要显示SAR
         SAR_day=4,SAR_madays=[5,20], \
@@ -2687,7 +2719,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
         TSF_day=14,TSF_madays=[5,10], \
             
         #需要显示AD
-        AD_day=26,AD_madays=[5,20], \
+        AD_madays=[], \
         
         #数据提前量，用于前置计算指标的移动平均值   
         ahead_days=30*8, \
@@ -2696,8 +2728,8 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
         resample_freq='2H',smooth=True,linewidth=1.5, \
         date_range=False,date_freq=False, \
             
-        #未启用    
-        annotate=False, \
+        #启用
+        annotate=True, \
         
         #除了MACD外，其他指标均应为ALL
         graph=['ALL'], \
@@ -2709,11 +2741,11 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
             
         #价格线的绘图参数
         #price_line_style=(0,(1,1)), \
-        price_line_style='dotted', \
+        price_line_style=(0,(3,1,1,1,1,1)), \
         price_line_color=['red','green'], \
         price_line_width=1,price_line_marker='o', \
         marker_sizes=[30,120,250], \
-                        ):
+        ):
     """
     功能：计算和绘制证券技术分析指标的简易图，仅供进一步探索使用，仅用于单个证券(股债基)
     
@@ -2819,7 +2851,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
                 
             TRIX_day=TRIX_day,TRIX_madays=TRIX_madays, \
             BIAS_days=BIAS_days, \
-            CCI_day=CCI_day,CCI_madays=CCI_madays, \
+            CCI_days=CCI_days, \
             WR_days=WR_days, \
             ROC_day=ROC_day,ROC_madays=ROC_madays, \
             DMI_DIdays=DMI_DIdays,DMI_ADXdays=DMI_ADXdays, \
@@ -2837,7 +2869,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
             TSF_day=TSF_day,TSF_madays=TSF_madays, \
                 
             #需要显示AD
-            AD_day=AD_day,AD_madays=AD_madays, \
+            AD_madays=AD_madays, \
             
             indicator=indicator, \
             more_details=more_details)
@@ -2976,7 +3008,10 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
     except:
         ax3.set_facecolor('papayawhip')
         
-    color_list=['k','g','b','c','m','y','r']
+    color_list=['k','g','b','c','m','yellowgreen','tomato','lime','orange','deepskyblue']
+    
+    if isinstance(attention_values,int):
+        attention_values=[attention_values]
     attention_draws=[False] * len(attention_values)
 
     for l in tech_line_collist:
@@ -2988,8 +3023,29 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
         if labeltxt =='DIF':
             labeltxt='快线(DIF)'            
             
-        ax.plot(df1.index,df1[l],label=labeltxt)
-        
+        axline, = ax.plot(df1.index,df1[l],label=labeltxt)
+        last_line_color = axline.get_color()
+        
+        if annotate:
+            df_end=df1.tail(1)
+            # df_end[c]必须为数值类型，否则可能出错
+            y_end = df_end[l].min()    # 末端的y坐标
+            x_end = df_end[l].idxmin() # 末端值的x坐标 
+            """
+            if annotate_value: #在标记曲线名称的同时标记其末端数值
+                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),color=last_line_color)
+            else:
+                plt.annotate(text=c, 
+                             xy=(x_end, y_end),
+                             xytext=(x_end, y_end),color=last_line_color)        
+            """
+            ax.annotate(text=''+l.upper(), 
+                         xy=(x_end, y_end),
+                         xytext=(x_end, y_end),color=last_line_color,fontsize=legend_txt_size)        
+            
         #判断是否绘制关注线
         lmax=df1[l].max(); lmin=df1[l].min()
         
@@ -3002,7 +3058,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
             
             #如果需要绘制关注线，且尚未绘制过，则绘制
             if line_al and not attention_draws[pos]:
-                ax.axhline(y=attention_values[pos],ls=":",c=color_list[pos],linewidth=2)
+                ax.axhline(y=attention_values[pos],ls='dotted',c=color_list[pos],linewidth=1)
 
                 attention_draws[pos]=True
         
@@ -3012,20 +3068,21 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
     ax.set_ylabel(ylabeltxt1,fontsize=ylabel_txt_size)
     
     #对图例项目排序
-    # 获取图例句柄和标签
-    handles, labels = ax.get_legend_handles_labels()
-     
-    # 指定显示顺序
-    labels_sorted = sort_list_by_len(labels,reverse=False)
-    handles_sorted = []
-    for l in labels_sorted:
-        pos=labels.index(l)
-        h=handles[pos]
-        handles_sorted =handles_sorted +[h]
-     
-    # 在指定位置添加新的图例，并按照指定顺序显示
-    ax.legend(handles=handles_sorted,labels=labels_sorted,loc=loc1,fontsize=legend_txt_size)
-    #ax.legend(loc=loc1,fontsize=legend_txt_size)
+    if not annotate:
+        # 获取图例句柄和标签
+        handles, labels = ax.get_legend_handles_labels()
+         
+        # 指定显示顺序
+        labels_sorted = sort_list_by_len(labels,reverse=False)
+        handles_sorted = []
+        for l in labels_sorted:
+            pos=labels.index(l)
+            h=handles[pos]
+            handles_sorted =handles_sorted +[h]
+         
+        # 在指定位置添加新的图例，并按照指定顺序显示
+        ax.legend(handles=handles_sorted,labels=labels_sorted,loc=loc1,fontsize=legend_txt_size)
+        #ax.legend(loc=loc1,fontsize=legend_txt_size)
     
     interval=int(len(df1)/10)+1
     ax.xaxis.set_major_locator(mdates.DayLocator(interval=interval))  # 隔interval天一个标记
@@ -3057,8 +3114,8 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
     ax2.set_ylabel(ylabeltxt2,fontsize=ylabel_txt_size)
 
     #细灰线先画出轮廓
-    ax2.plot(df1.index,df1[indicator],label='', \
-             linestyle=price_line_style,color='grey',lw=2)   
+    ax2.plot(df1.index,df1[indicator],label=ylabeltxt2, \
+             linestyle=price_line_style,color='k',lw=2)   
 
     #不同颜色绘制涨跌价格线
     first_time=True; second_time=False
@@ -3067,11 +3124,13 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
         if df1seg['up_down'].values[0] >=0:
             seg_color=price_line_color1
             #labeltxt=ylabeltxt2+'(当日↑)'
-            labeltxt=ylabeltxt2+'(当日阳线)'
+            #labeltxt=ylabeltxt2+'(当日阳线)'
+            labeltxt='当日↑'
         else:
             seg_color=price_line_color2
             #labeltxt=ylabeltxt2+'(当日↓)'
-            labeltxt=ylabeltxt2+'(当日阴线)'
+            #labeltxt=ylabeltxt2+'(当日阴线)'
+            labeltxt='当日↓'
             
         if first_time:
             first_time=False; second_time=True
@@ -3083,7 +3142,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
         ax2.scatter(df1seg.index,df1seg[indicator], \
                     s=df1seg['marker_size'], \
                     label=labeltxt, \
-                    linestyle=':',color=seg_color,lw=price_line_width,marker=price_line_marker)   
+                    linestyle=':',color=seg_color,lw=price_line_width,marker=price_line_marker,alpha=0.5)   
     
     ax2.legend(loc=loc2,fontsize=legend_txt_size)
     

siat/translate.py

@@ -3297,7 +3297,20 @@ def ticker1_name(ticker,ticker_type='auto'):
                 #注意：绘图时有基于‘基金’字符的判断，决定显示收盘价还是单位净值
                 if '基金' not in tname: tname=tname + '基金'
                 break
+    
+    #加港股标记
+    if ('.HK' in ticker) and not ("港股" in tname):
+        tname=tname+"港股"
+        #加港股人民币柜台标志
+        HKcode=ticker.split('.')[0]
+        if len(HKcode)==5 and HKcode[0]=='8' and not ("人民币" in tname):
+            tname=tname+"(人民币)"
         
+    #加美股标记
+    """
+    if len(ticker.split('.'))==1 and not ("美股" in tname):
+        tname=tname+"美股" 
+    """  
     return tname
 
 #==============================================================================

{siat-3.2.20.dist-info → siat-3.2.30.dist-info}/METADATA

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