siat 3.10.25__py3-none-any.whl → 3.10.75__py3-none-any.whl

siat/grafix.py

@@ -425,6 +425,13 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
 
 #==============================================================================
 if __name__ =="__main__":
+    df1=df2=option_comm_china(symbol='黄金期权',contract='au2508',printout=False,graph=False)
+    
+    ticker1='看涨期权'; ticker2='看跌期权' 
+    colname1='最新价C'; colname2='最新价P'
+    label1=label2=ylabeltxt='价格'
+    twinx=True
+    
     power=0
     datatag1=False
     datatag2=False
@@ -434,6 +441,10 @@ if __name__ =="__main__":
     yline=999
     xline=999
     resample_freq='D'
+    
+    attention_value_area=''; attention_point_area=''
+    loc1='best'; loc2='best'
+    color1='red'; color2='blue'; facecolor='whitesmoke'; maxticks=20
 
 def plot_line2(df1,ticker1,colname1,label1, \
                df2,ticker2,colname2,label2, \
@@ -465,6 +476,7 @@ def plot_line2(df1,ticker1,colname1,label1, \
     if len(df2) ==0:
         print ("  #Warning(plot_line2): no data to plot df2.")
     if (len(df1) ==0) and (len(df2) ==0):
+        pass
         return
     
     if DEBUG:
@@ -618,17 +630,20 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
     """
     DEBUG=False
 
-    #插值平滑
-    try:
-        df01x=df01[[colname1]].astype('float')
-        df1=df_smooth_manual(df01x,resample_freq=resample_freq)
-    except:
-        df1=df01
-    try:
-        df02x=df02[[colname2]].astype('float')
-        df2=df_smooth_manual(df02x,resample_freq=resample_freq)
-    except:
-        df2=df02
+    #插值平滑：如果横轴不为日期型时不可平滑，否则数据会丢失！
+    if not isinstance(maxticks,bool):    
+        try:
+            df01x=df01[[colname1]].astype('float')
+            df1=df_smooth_manual(df01x,resample_freq=resample_freq)
+        except:
+            df1=df01
+        try:
+            df02x=df02[[colname2]].astype('float')
+            df2=df_smooth_manual(df02x,resample_freq=resample_freq)
+        except:
+            df2=df02
+    else:
+        df1=df01; df2=df02            
     
     #预处理ticker_type
     ticker_type_list=ticker_type_preprocess_mticker_mixed([ticker1,ticker2],ticker_type)    
@@ -813,17 +828,20 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
             plt.plot(df2.index, f(df2.id),"r--", label='',linewidth=1)
         except: pass
     
-    # 同轴绘图时，loc1/loc2未用上！
+    # 同轴绘图时，loc2未用上！
     plt.legend(loc=loc1,fontsize=legend_txt_size)
     
     # 使用 AutoDateLocator 自动选择最佳间隔，目的是显示最后一个日期，亲测有效！！！
-    import matplotlib.dates as mdates
-    try:
-        ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))    
-    except:
-        pass
-    
-    plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
+    if not isinstance(maxticks,bool):    
+        import matplotlib.dates as mdates
+        try:
+            ax=plt.gca()
+            ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))    
+        except:
+            pass
+        
+        plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
+        
     try:
         plt.gca().set_facecolor(facecolor)
     except:
@@ -883,17 +901,20 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
     import pandas as pd
     DEBUG=False
     
-    #插值平滑
-    try:
-        df01x=df01[[colname1]].astype('float')
-        df1=df_smooth_manual(df01x,resample_freq=resample_freq)
-    except:
-        df1=df01
-    try:
-        df02x=df02[[colname2]].astype('float')
-        df2=df_smooth_manual(df02x,resample_freq=resample_freq)
-    except:
-        df2=df02
+    #插值平滑：对于df索引为非日期型的不能进行插值平滑，否则会丢失数据！！！
+    if not isinstance(maxticks,bool):    
+        try:
+            df01x=df01[[colname1]].astype('float')
+            df1=df_smooth_manual(df01x,resample_freq=resample_freq)
+        except:
+            df1=df01
+        try:
+            df02x=df02[[colname2]].astype('float')
+            df2=df_smooth_manual(df02x,resample_freq=resample_freq)
+        except:
+            df2=df02
+    else:
+        df1=df01; df2=df02
         
     #预处理ticker_type
     ticker_type_list=ticker_type_preprocess_mticker_mixed([ticker1,ticker2],ticker_type)    
@@ -1104,10 +1125,11 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
     plt.legend(loc=loc1,fontsize=legend_txt_size)
     
     # 使用 AutoDateLocator 自动选择最佳间隔，目的是显示最后一个日期，亲测有效！！！
-    import matplotlib.dates as mdates
-    ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))    
-    
-    plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
+    if not isinstance(maxticks,bool):    
+        import matplotlib.dates as mdates
+        ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))    
+        
+        plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
     try:
         plt.gca().set_facecolor(facecolor)
     except:
@@ -1123,6 +1145,10 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
     return
 
 #==============================================================================
+if __name__ =="__main__":
+    df01=df1; df02=df2
+    maxticks=False    
+    
 def plot_line2_twinx(df01,ticker1,colname1,label1, \
                      df02,ticker2,colname2,label2, \
                      titletxt,footnote,power=0,datatag1=False,datatag2=False, \
@@ -1148,16 +1174,19 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
     #plt.rcParams['axes.grid']=False
     
     #插值平滑
-    try:
-        df01x=df01[[colname1]].astype('float')
-        df1=df_smooth_manual(df01x,resample_freq=resample_freq)
-    except:
-        df1=df01
-    try:
-        df02x=df02[[colname2]].astype('float')
-        df2=df_smooth_manual(df02x,resample_freq=resample_freq)
-    except:
-        df2=df02
+    if not isinstance(maxticks,bool):
+        try:
+            df01x=df01[[colname1]].astype('float')
+            df1=df_smooth_manual(df01x,resample_freq=resample_freq)
+        except:
+            df1=df01
+        try:
+            df02x=df02[[colname2]].astype('float')
+            df2=df_smooth_manual(df02x,resample_freq=resample_freq)
+        except:
+            df2=df02
+    else:
+        df1=df01; df2=df02
     
     #预处理ticker_type
     ticker_type_list=ticker_type_preprocess_mticker_mixed([ticker1,ticker2],ticker_type)        
@@ -1327,12 +1356,13 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
     ax2.legend(loc=loc2,fontsize=legend_txt_size)
 
     # 使用 AutoDateLocator 自动选择最佳间隔，目的是显示最后一个日期，亲测有效！！！
-    import matplotlib.dates as mdates
-    ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))
-    ax2.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))
-    
-    #自动优化x轴标签
-    plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
+    if not isinstance(maxticks,bool):
+        import matplotlib.dates as mdates
+        ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))
+        ax2.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))
+        
+        #自动优化x轴标签
+        plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
         
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     plt.show()
@@ -1381,17 +1411,20 @@ def plot_line2_LR(df01,ticker1,colname1,label1, \
     
     #plt.rcParams['axes.grid']=False
     
-    #插值平滑
-    try:
-        df01x=df01[[colname1]].astype('float')
-        df1=df_smooth_manual(df01x,resample_freq=resample_freq)
-    except:
-        df1=df01
-    try:
-        df02x=df02[[colname2]].astype('float')
-        df2=df_smooth_manual(df02x,resample_freq=resample_freq)
-    except:
-        df2=df02
+    #插值平滑：若df索引为非日期型，不能进行插值平滑
+    if not isinstance(maxticks,bool):    
+        try:
+            df01x=df01[[colname1]].astype('float')
+            df1=df_smooth_manual(df01x,resample_freq=resample_freq)
+        except:
+            df1=df01
+        try:
+            df02x=df02[[colname2]].astype('float')
+            df2=df_smooth_manual(df02x,resample_freq=resample_freq)
+        except:
+            df2=df02
+    else:
+        df1=df01; df2=df02            
     
     #预处理ticker_type
     ticker_type_list=ticker_type_preprocess_mticker_mixed([ticker1,ticker2],ticker_type)        
@@ -1594,7 +1627,8 @@ def plot_line2_LR(df01,ticker1,colname1,label1, \
     #plt.xlabel(footnote,ha='center',fontsize=xlabel_txt_size,color='gray')
     
     # 自动倾斜横轴日期
-    fig.autofmt_xdate(ha="center")
+    if not isinstance(maxticks,bool):    
+        fig.autofmt_xdate(ha="center")
     
     # 调整布局防止重叠
     plt.tight_layout()        
@@ -1630,16 +1664,19 @@ def plot_line2_UD(df01,ticker1,colname1,label1, \
     #plt.rcParams['axes.grid']=False
     
     #插值平滑
-    try:
-        df01x=df01[[colname1]].astype('float')
-        df1=df_smooth_manual(df01x,resample_freq=resample_freq)
-    except:
-        df1=df01
-    try:
-        df02x=df02[[colname2]].astype('float')
-        df2=df_smooth_manual(df02x,resample_freq=resample_freq)
-    except:
-        df2=df02
+    if not isinstance(maxticks,bool):    
+        try:
+            df01x=df01[[colname1]].astype('float')
+            df1=df_smooth_manual(df01x,resample_freq=resample_freq)
+        except:
+            df1=df01
+        try:
+            df02x=df02[[colname2]].astype('float')
+            df2=df_smooth_manual(df02x,resample_freq=resample_freq)
+        except:
+            df2=df02
+    else:
+        df1=df01; df2=df02            
     
     #预处理ticker_type
     ticker_type_list=ticker_type_preprocess_mticker_mixed([ticker1,ticker2],ticker_type)        
@@ -1850,7 +1887,8 @@ def plot_line2_UD(df01,ticker1,colname1,label1, \
     #plt.xlabel(footnote,ha='center',fontsize=xlabel_txt_size,color='gray')
     
     # 自动倾斜横轴日期
-    fig.autofmt_xdate(ha="center")
+    if not isinstance(maxticks,bool):    
+        fig.autofmt_xdate(ha="center")
     
     # 调整布局防止重叠
     plt.tight_layout()        
@@ -1883,16 +1921,19 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
     #plt.rcParams['axes.grid']=False
 
     #插值平滑
-    try:
-        df01x=df01[[colname1]].astype('float')
-        df1=df_smooth_manual(df01x,resample_freq=resample_freq)
-    except:
-        df1=df01
-    try:
-        df02x=df02[[colname2]].astype('float')
-        df2=df_smooth_manual(df02x,resample_freq=resample_freq)
-    except:
-        df2=df02
+    if not isinstance(maxticks,bool):    
+        try:
+            df01x=df01[[colname1]].astype('float')
+            df1=df_smooth_manual(df01x,resample_freq=resample_freq)
+        except:
+            df1=df01
+        try:
+            df02x=df02[[colname2]].astype('float')
+            df2=df_smooth_manual(df02x,resample_freq=resample_freq)
+        except:
+            df2=df02
+    else:
+        df1=df01; df2=df02            
 
     #预处理ticker_type
     ticker_type_list=ticker_type_preprocess_mticker_mixed([ticker1,ticker2],ticker_type)
@@ -2097,7 +2138,8 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
     #自动优化x轴标签
     #格式化时间轴标注
     #plt.gca().xaxis.set_major_formatter(mdate.DateFormatter('%y-%m-%d')) 
-    plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
+    if not isinstance(maxticks,bool):    
+        plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
         
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     plt.show()
@@ -2133,7 +2175,8 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                mark_start=False,mark_top=False,mark_bottom=False,mark_end=False, \
                ticker_type='auto',facecolor='whitesmoke', \
                    maxticks_enable=True,maxticks=15, \
-               translate=False):
+               translate=False, \
+                   precision=2):
     """
     函数功能：根据df的内容绘制折线图
     输入参数：
@@ -2167,7 +2210,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
         return
     
     #插值平滑
-    if smooth:
+    if smooth and not isinstance(maxticks,bool):
         #print("  Rendering graphics ...")
         try:
             df=df_smooth_manual(df0,resample_freq=resample_freq)
@@ -2270,7 +2313,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             
             if annotate_value: #在标记曲线名称的同时标记其末端数值
                 #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
-                y1=str(round(y_end,2)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 1 else str(round(y_end,3))
+                y1=str(round(y_end,2)) if abs(y_end) >= 100 else str(round(y_end,precision)) if abs(y_end) >= 1 else str(round(y_end,precision))
                 plt.annotate(text=' '+auto_translate2(c,translate)+': '+y1, 
                              xy=(x_end, y_end),
                              xytext=(x_end, y_end),fontsize=annotate_size,
@@ -2325,7 +2368,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             x_end = df_end[c].idxmin() # 开始值的x坐标 
             
             #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
-            y1=str(round(y_end,1)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 1 else str(round(y_end,3))
+            y1=str(round(y_end,1)) if abs(y_end) >= 100 else str(round(y_end,precision)) if abs(y_end) >= 1 else str(round(y_end,precision))
             plt.annotate(text=' '+y1, 
                          xy=(x_end, y_end),
                          xytext=(x_end, y_end*0.998),fontsize=annotate_size,
@@ -2338,7 +2381,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             x_end = df_end[c].idxmin() # 末端值的x坐标 
             
             #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
-            y1=str(round(y_end,1)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 1 else str(round(y_end,3))
+            y1=str(round(y_end,1)) if abs(y_end) >= 100 else str(round(y_end,precision)) if abs(y_end) >= 1 else str(round(y_end,precision))
             plt.annotate(text=' '+y1, 
                          xy=(x_end, y_end),
                          xytext=(x_end, y_end*0.998),fontsize=annotate_size,
@@ -2487,12 +2530,13 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     #图示标题
     plt.title(auto_translate2(title_txt,translate),fontweight='bold',fontsize=title_txt_size)
     
-    if maxticks_enable:
-        # 使用 AutoDateLocator 自动选择最佳间隔，目的是显示最后一个日期，亲测有效！！！
-        import matplotlib.dates as mdates
-        ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))   
-
-    plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
+    if not isinstance(maxticks,bool):    
+        if maxticks_enable:
+            # 使用 AutoDateLocator 自动选择最佳间隔，目的是显示最后一个日期，亲测有效！！！
+            import matplotlib.dates as mdates
+            ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))   
+    
+        plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
     try:
         plt.gca().set_facecolor(facecolor)
     except:
@@ -2584,7 +2628,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
         return
     
     #插值平滑
-    if smooth:
+    if smooth and not isinstance(maxticks,bool):
         print("  Smoothening curves ...")
         try:
             df=df_smooth_manual(df0,resample_freq=resample_freq)
@@ -2605,18 +2649,19 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     high_low=dfmax - dfmin
 
     #定义横轴标签：显示完整开始、结束日期
-    ax=plt.gca()    
-    date_start=df.index[0]
-    date_end=df.index[-1]
-    if date_range and not date_freq:
-        ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
-        plt.xticks(pd.date_range(date_start,date_end))
-    if not date_range and date_freq:
-        ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
-        plt.xticks(pd.date_range(freq=date_freq))
-    if date_range and date_freq:
-        ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
-        plt.xticks(pd.date_range(date_start,date_end,freq=date_freq))    
+    if not isinstance(maxticks,bool):    
+        ax=plt.gca()    
+        date_start=df.index[0]
+        date_end=df.index[-1]
+        if date_range and not date_freq:
+            ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
+            plt.xticks(pd.date_range(date_start,date_end))
+        if not date_range and date_freq:
+            ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
+            plt.xticks(pd.date_range(freq=date_freq))
+        if date_range and date_freq:
+            ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
+            plt.xticks(pd.date_range(date_start,date_end,freq=date_freq))    
         
     #取得df字段名列表
     collist=df.columns.values.tolist()  
@@ -2857,10 +2902,11 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     plt.title(auto_translate2(title_txt,translate),fontweight='bold',fontsize=title_txt_size)
     
     # 使用 AutoDateLocator 自动选择最佳间隔，目的是显示最后一个日期，亲测有效！！！
-    import matplotlib.dates as mdates
-    ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))   
-    
-    plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
+    if not isinstance(maxticks,bool):    
+        import matplotlib.dates as mdates
+        ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))   
+        
+        plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
     try:
         plt.gca().set_facecolor(facecolor)
     except:
@@ -3045,54 +3091,59 @@ def plot_2lines(df01,colname1,label1, \
         return
 
     #插值平滑
-    try:
-        df01x=df01[[colname1]].astype('float')
-        df1=df_smooth_manual(df01x,resample_freq=resample_freq)
-    except:
-        df1=df01
-        
-    try:
-        df02x=df02[[colname2]].astype('float')        
-        df2=df_smooth_manual(df02x,resample_freq=resample_freq)
-    except:
-        df2=df02
+    if not isinstance(maxticks,bool):    
+        try:
+            df01x=df01[[colname1]].astype('float')
+            df1=df_smooth_manual(df01x,resample_freq=resample_freq)
+        except:
+            df1=df01
+            
+        try:
+            df02x=df02[[colname2]].astype('float')        
+            df2=df_smooth_manual(df02x,resample_freq=resample_freq)
+        except:
+            df2=df02
+    else:
+        df1=df01; df2=df02            
     
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     
     #证券1：先绘制折线图
-    date_start=df1.index[0]
-    date_end=df1.index[-1]
-    if date_range and not date_freq:
-        ax=plt.gca()
-        ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
-        plt.xticks(pd.date_range(date_start,date_end))
-    if not date_range and date_freq:
-        ax=plt.gca()
-        ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
-        plt.xticks(pd.date_range(freq=date_freq))
-    if date_range and date_freq:
-        ax=plt.gca()
-        ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
-        plt.xticks(pd.date_range(date_start,date_end,freq=date_freq))
+    if not isinstance(maxticks,bool):    
+        date_start=df1.index[0]
+        date_end=df1.index[-1]
+        if date_range and not date_freq:
+            ax=plt.gca()
+            ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
+            plt.xticks(pd.date_range(date_start,date_end))
+        if not date_range and date_freq:
+            ax=plt.gca()
+            ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
+            plt.xticks(pd.date_range(freq=date_freq))
+        if date_range and date_freq:
+            ax=plt.gca()
+            ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
+            plt.xticks(pd.date_range(date_start,date_end,freq=date_freq))
     
     lwadjust=linewidth_adjust(df1)
     plt.plot(df1.index,df1[colname1],label=label1,linestyle='-',linewidth=lwadjust)
     
     #证券2：先绘制折线图
-    date_start=df2.index[0]
-    date_end=df2.index[-1]
-    if date_range and not date_freq:
-        ax=plt.gca()
-        ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
-        plt.xticks(pd.date_range(date_start,date_end))
-    if not date_range and date_freq:
-        ax=plt.gca()
-        ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
-        plt.xticks(pd.date_range(freq=date_freq))
-    if date_range and date_freq:
-        ax=plt.gca()
-        ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
-        plt.xticks(pd.date_range(date_start,date_end,freq=date_freq))
+    if not isinstance(maxticks,bool):    
+        date_start=df2.index[0]
+        date_end=df2.index[-1]
+        if date_range and not date_freq:
+            ax=plt.gca()
+            ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
+            plt.xticks(pd.date_range(date_start,date_end))
+        if not date_range and date_freq:
+            ax=plt.gca()
+            ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
+            plt.xticks(pd.date_range(freq=date_freq))
+        if date_range and date_freq:
+            ax=plt.gca()
+            ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
+            plt.xticks(pd.date_range(date_start,date_end,freq=date_freq))
     
     lwadjust=linewidth_adjust(df2)        
     plt.plot(df2.index,df2[colname2],label=label2,linestyle='-.',linewidth=lwadjust)
@@ -3109,10 +3160,12 @@ def plot_2lines(df01,colname1,label1, \
     plt.legend(loc='best',fontsize=legend_txt_size)
     
     # 使用 AutoDateLocator 自动选择最佳间隔，目的是显示最后一个日期，亲测有效！！！
-    import matplotlib.dates as mdates
-    ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))
-    
-    plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
+    if not isinstance(maxticks,bool):  
+        import matplotlib.dates as mdates
+        ax=plt.gca()
+        ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))
+
+        plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
     try:
         plt.gca().set_facecolor(facecolor)
     except:
@@ -3140,6 +3193,11 @@ def df_smooth(df):
     注意2：order阶数仅对'spline'和'polynomial'方法有效，其中'polynomial'方法的阶数只能为奇数。
     """
     
+    # df索引项若非日期型，不适合采用本函数进行插值
+    import pandas as pd
+    if not pd.api.types.is_datetime64_any_dtype(df.index):
+        return df
+    
     #如果样本个数多于100个，其实没必要进行平滑，因为看不出效果
     if len(df) >= 100: return df
     
@@ -3213,6 +3271,11 @@ def df_smooth_manual(df,method='linear',resample_freq='D',order=3):
     注意3：pchip方法经常失败，可改为cubic
     """
     
+    # df索引项若非日期型，不适合采用本函数进行插值
+    import pandas as pd
+    if not pd.api.types.is_datetime64_any_dtype(df.index):
+        return df
+    
     #如果样本个数多于100个，没必要进行平滑，完全看不出效果
     if len(df) >= 100: return df
     

siat/market_china.py

@@ -176,7 +176,8 @@ def market_profile_china(market='SSE'):
             
         info1t=info.T
         info1t['全貌']=info1t['股票']
-        info1t['主板']=info1t['主板A股']+info1t['主板B股']+info1t['中小板']
+        #info1t['主板']=info1t['主板A股']+info1t['主板B股']+info1t['中小板']
+        info1t['主板']=info1t['主板A股']+info1t['主板B股']
         info1t['创业板']=info1t['创业板A股']
         
         infot2=info1t.T