metradar 0.1.6__py3-none-any.whl → 0.1.8.2__py3-none-any.whl

metradar/{draw_radar_comp_func.py → graph/draw_radar_comp_func.py}

@@ -1,13 +1,19 @@
+
+
+# _*_ coding: utf-8 _*_
+
 '''
 画雷达综合图主程序
 
 '''
 
+
+from metradar.io.decode_fmt_pyart import read_cnrad_fmt
 import pyart
 import os
 import numpy as np
 import numpy.ma as MA
-
+from metradar.io.decode_pup_rose import READ_ROSE
 import matplotlib.pyplot as plt
 import cartopy.crs as ccrs
 
@@ -18,28 +24,36 @@ from matplotlib.font_manager import FontProperties
 import pandas as pd 
 from metpy.calc import wind_components
 from metpy.units import units
-from parse_pal import parse_pro
+from metradar.util.parse_pal import parse_pro
 from matplotlib.colorbar import ColorbarBase
 import matplotlib.patheffects as path_effects
 from matplotlib import patheffects
 import matplotlib.transforms as transforms 
 from matplotlib.transforms import offset_copy
-from oa_dig_func import Object_Analyst
+from metradar.core.oa_dig_func import Object_Analyst
 import warnings
 warnings.filterwarnings('ignore')
 import matplotlib as mpl
-from get_cross_section_from_pyart import get_cross_radar
-# from adjustText import adjust_text
+
+from metradar.core.get_cross_section import get_cross_radar
 import matplotlib
-matplotlib.use('Agg')
-# matplotlib.use('MacOSX')
+# matplotlib.use('Agg')
+
 from matplotlib import ticker
 import xarray as xr
+from metradar.config import CONFIG
+
+# 资源文件路径
+RESOURCES_PATH = CONFIG.get('SETTING','RESOURCES_PATH')
+MAP_PATH = RESOURCES_PATH + '/maps'
+
 
 # 初始化参数字典，用于存储绘图所需的所有参数
 def ini_params():
     param={'radarfile_path':None, # 雷达文件路径
             'radarfile_name':None, # 雷达文件名 
+            'rose_cr_path':None, # ROSE组合反射率因子文件路径
+            'rose_cr_name':None, # ROSE组合反射率因子文件名
             'mosaicfile_path':None,# 反射率拼图文件路径
             'mosaicfile_name':None, # 反射率拼图文件名
             'pic_path':None, # 图片保存路径
@@ -48,12 +62,14 @@ def ini_params():
             'aws_min_file_name':None, # aws分钟数据文件名
             'aws_hour_file_path':None, # aws小时数据文件路径
             'aws_hour_file_name':None,# aws小时数据文件名
-
+            'rose_cr_path':None, # ROSE组合反射率因子文件路径
+            'rose_cr_name':None, # ROSE组合反射率因子文件名
             'aws_min_delta_t_file_path':None, # aws小时变温数据文件路径
             'aws_min_delta_t_file_name':None,# aws小时变温数据文件名
             'aws_min_delta_p_file_path':None, # aws小时变压数据文件路径
             'aws_min_delta_p_file_name':None,# aws小时变压数据文件名
-
+            'wind_bar_width_inner':None,#wind bar 里线宽
+            'wind_bar_width_outter':None,#wind bar 外线宽
             'gis_name':None, # 站点名称
             'gis_lats':None, # 站点纬度
             'gis_lons':None, # 站点经度
@@ -87,7 +103,6 @@ def ini_params():
             'thred_ref':0, # 回波强度阈值
             'radarname': 'XX',# 雷达站名
             
-            
         }
     return param
 
@@ -107,6 +122,8 @@ class DRAW_RADAR_OTHER:
         pass
         self.radarfile_path=params['radarfile_path']
         self.radarfile_name=params['radarfile_name']
+        self.rose_cr_path=params['rose_cr_path']
+        self.rose_cr_name=params['rose_cr_name']
         self.mosaicfile_path=params['mosaicfile_path']
         self.mosaicfile_name=params['mosaicfile_name']
         self.aws_min_file_path=params['aws_min_file_path']
@@ -126,6 +143,8 @@ class DRAW_RADAR_OTHER:
         self.nlat=params['nlat']
         self.wlon=params['wlon']
         self.elon=params['elon']
+        self.wind_bar_width_inner=params['wind_bar_width_inner']
+        self.wind_bar_width_outter=params['wind_bar_width_outter']
         self.ref_colorfile=params['ref_colorfile']
         self.vel_colorfile=params['vel_colorfile']
         self.cc_colorfile=params['cc_colorfile']
@@ -177,18 +196,16 @@ class DRAW_RADAR_OTHER:
 
         self.ratio = (self.nlat - self.slat)/(self.elon-self.wlon)
 
-        # self.paintsize_y=(self.paintsize_x*self.ratio)
-
         
         # 设置坐标轴字体大小
-        # matplotlib.rc('xtick', labelsize=self.fontsize_tick) 
-        # matplotlib.rc('ytick', labelsize=self.fontsize_tick)
+
         mpl.rcParams['font.size'] = self.fontsize_tick
         mpl.rcParams['font.weight'] = 'bold'
-        mpl.rcParams['font.family'] = 'Times New Roman'
+        # mpl.rcParams['font.family'] = 'Times New Roman'
         mpl.rcParams['xtick.direction'] = 'in'  # 'out'  'inout'
         mpl.rcParams['ytick.direction'] = 'in'  # 'out'  'inout'
 
+
         self.cref=None
         self.voltime = None
         
@@ -223,7 +240,7 @@ class DRAW_RADAR_OTHER:
         if not os.path.exists(self.radarfile_path + os.sep + self.radarfile_name):
             print(self.radarfile_path + os.sep + self.radarfile_name + ' not exists!')
             return False
-        self.radar = pyart.io.read_nexrad_archive(self.radarfile_path + os.sep + self.radarfile_name)
+        self.radar = read_cnrad_fmt(self.radarfile_path + os.sep + self.radarfile_name)
         # self.radar.fields.keys()
         self.display = pyart.graph.RadarMapDisplay(self.radar)
         self.gatefilter_ref = pyart.correct.GateFilter(self.radar)
@@ -253,12 +270,9 @@ class DRAW_RADAR_OTHER:
         # st = time.time()
         if self.radar is None:
             return False
-        # self.gatefilter_ref = pyart.correct.GateFilter(self.radar)
-        # self.gatefilter_ref.exclude_below('reflectivity', thred, exclude_masked=True, op='and', inclusive=True)
+   
         self.crs_data = get_cross_radar(self.radar,param_crs)
         pass
-        # et = time.time()
-        # print('get cross data costs %.1f seconds!'%(et-st))
 
     def draw_crs(self,subdir='垂直剖面',varname=None,brefresh=False,thred=None,):
         # check 
@@ -287,8 +301,7 @@ class DRAW_RADAR_OTHER:
             return False
 
         colordata = parse_pro(colorfile)
-        
-        # self.crs_ratio = self.crs_data['vertical_km'] / self.crs_data['horizontal_km'] * 0.8
+
         self.crs_ratio = 0.6
         self.crs_paintsize_y = self.crs_paintsize_x * self.crs_ratio
         self.crs_fig = plt.figure(figsize=(self.crs_paintsize_x,self.crs_paintsize_y))
@@ -328,29 +341,26 @@ class DRAW_RADAR_OTHER:
     def draw_title_crs(self,varname='reflectivity'):
         if not self.bdraw_title_crs:
             return None
-        # titlestr = 'Cross section of ' + varname + ' '
-        [x,y,z]=pyart.core.antenna_to_cartesian(self.crs_start_range, self.crs_start_azi, elevations=0)
-        [start_lon,start_lat]=pyart.core.cartesian_to_geographic_aeqd(x,y,self.g_rad_lon,self.g_rad_lat)
-        [x,y,z]=pyart.core.antenna_to_cartesian(self.crs_end_range, self.crs_end_azi, elevations=0)
-        [end_lon,end_lat]=pyart.core.cartesian_to_geographic_aeqd(x,y,self.g_rad_lon,self.g_rad_lat)
-        self.crs_startlat = start_lat
-        self.crs_startlon = start_lon
-        self.crs_endlat = end_lat
-        self.crs_endlon = end_lon
+        x,y,z=pyart.core.antenna_to_cartesian(self.crs_start_range, self.crs_start_azi, elevations=0)
+        start_lon,start_lat=pyart.core.cartesian_to_geographic_aeqd(x,y,self.g_rad_lon,self.g_rad_lat)
+        x,y,z=pyart.core.antenna_to_cartesian(self.crs_end_range, self.crs_end_azi, elevations=0)
+        end_lon,end_lat=pyart.core.cartesian_to_geographic_aeqd(x,y,self.g_rad_lon,self.g_rad_lat)
+        self.crs_startlat = start_lat[0]
+        self.crs_startlon = start_lon[0]
+        self.crs_endlat = end_lat[0]
+        self.crs_endlon = end_lon[0]
         titlestr = 'A(%.2f,%.2f)->B(%.2f,%.2f) '%(self.crs_startlon,self.crs_startlat,self.crs_endlon,self.crs_endlat)
         tstr=''
         if self.voltime is None:
             tstr = self.timestr
         else:
             tstr = self.voltime
-        # titlestr += tstr + ' UTC'
         plt.title('%s'%(titlestr),fontproperties=self.font_title,loc='right',verticalalignment='top')
 
     def draw_crs_colorbar(self,fig=None,colorfile=None,tickstep=5,orientation = 'vertical',cb_ratio=0.618):
         # 画色标
         ax_pos = self.crs_ax.get_position().bounds
         cbar_axes = [ax_pos[0]+ ax_pos[2]+0.005,(ax_pos[1]+ax_pos[1]+ax_pos[3])/2-ax_pos[3]*cb_ratio/2,0.02,ax_pos[3]*cb_ratio]
-        # cbar_axes = self.crs_cbaxes_pos
         cb_ax = self.crs_fig.add_axes(cbar_axes)
         colordata = parse_pro(colorfile)
         
@@ -366,15 +376,12 @@ class DRAW_RADAR_OTHER:
             cb_ax.hlines(tick_pos, colordata['norm'].vmin, colordata['norm'].vmin + 0.3*xrange, color="black",linewidth=0.5)
             cb_ax.hlines(tick_pos, colordata['norm'].vmin + 0.7*xrange, colordata['norm'].vmax, color="black",linewidth=0.5)
   
-            # cb_ax.text(1.02,tick_pos, str(int(tick_pos)),color=[1,1,1],
-            #     path_effects=[path_effects.Stroke(linewidth=self.stroke_line_width, foreground='black'),
-            #     path_effects.Normal()],
-            #     va="center", ha="left",font=self.font_colorbar)
+  
 
             cb_ax.text(1.04,tick_pos, str(int(tick_pos)),va="center", ha="left",fontsize=5) # font=self.font_colorbar
 
         cb_ax.text(1.8, 1.035, colordata['units'], transform=cb_ax.transAxes,va="center", ha="center", fontsize=5 ) # font=self.font_colorbar 
-                        # color=[1,1,1],path_effects=[path_effects.Stroke(linewidth=self.stroke_line_width, foreground='black'),path_effects.Normal()],
+                  
         
 
     def add_crs_line(self,ax=None):
@@ -387,23 +394,24 @@ class DRAW_RADAR_OTHER:
             print('warning: ax is None in function add_crs_line!')
             return False
 
-        [x,y,z]=pyart.core.antenna_to_cartesian(self.crs_start_range, self.crs_start_azi, elevations=0)
-        [start_lon,start_lat]=pyart.core.cartesian_to_geographic_aeqd(x,y,self.g_rad_lon,self.g_rad_lat)
-        [x,y,z]=pyart.core.antenna_to_cartesian(self.crs_end_range, self.crs_end_azi, elevations=0)
-        [end_lon,end_lat]=pyart.core.cartesian_to_geographic_aeqd(x,y,self.g_rad_lon,self.g_rad_lat)
-        self.crs_startlat = start_lat
-        self.crs_startlon = start_lon
-        self.crs_endlat = end_lat
-        self.crs_endlon = end_lon
+        x,y,z=pyart.core.antenna_to_cartesian(self.crs_start_range, self.crs_start_azi, elevations=0)
+        start_lon,start_lat=pyart.core.cartesian_to_geographic_aeqd(x,y,self.g_rad_lon,self.g_rad_lat)
+        x,y,z=pyart.core.antenna_to_cartesian(self.crs_end_range, self.crs_end_azi, elevations=0)
+        end_lon,end_lat=pyart.core.cartesian_to_geographic_aeqd(x,y,self.g_rad_lon,self.g_rad_lat)
+        self.crs_startlat = start_lat[0]
+        self.crs_startlon = start_lon[0]
+        self.crs_endlat = end_lat[0]
+        self.crs_endlon = end_lon[0]
 
         simble_color=[0,0,0]
-        ax.plot([start_lon,end_lon],[start_lat,end_lat],color='k',linewidth=0.75)
-        ax.plot([start_lon,end_lon],[start_lat,end_lat],color=simble_color,linewidth=0.5)
-        ax.text(start_lon,start_lat,'A',color=simble_color,font=self.font_colorbar,
+        ax.plot([start_lon[0],end_lon[0]],[start_lat[0],end_lat[0]],color='k',linewidth=0.75)
+        ax.plot([start_lon[0],end_lon[0]],[start_lat[0],end_lat[0]],color=simble_color,linewidth=0.5)
+        ax.text(start_lon[0],start_lat[0],'A',color=simble_color,font=self.font_colorbar,
                 path_effects=[path_effects.Stroke(linewidth=0.25, foreground='black'),path_effects.Normal()])
-        ax.text(end_lon,end_lat,'B',color=simble_color,font=self.font_colorbar,
+        ax.text(end_lon[0],end_lat[0],'B',color=simble_color,font=self.font_colorbar,
                 path_effects=[path_effects.Stroke(linewidth=0.25, foreground='black'),path_effects.Normal()])
 
+    # 从拼图文件中读取组合反射率
     def get_cref_from_mosaicfile(self,):
         
         data = None
@@ -425,21 +433,49 @@ class DRAW_RADAR_OTHER:
 
         return True
 
+    # 从ROSE产品中读取组合反射率因子数据
+    def get_cref_from_rose(self,):
+        
+        rose_reader = READ_ROSE()
+        data = None
+        if not os.path.exists(self.rose_cr_path + os.sep + self.rose_cr_name):
+            print(self.rose_cr_path + os.sep + self.rose_cr_name + ' does not exists!')
+            return False
+        try:
+            data = rose_reader.read_cr(self.rose_cr_path, self.rose_cr_name)
+        except:
+            print(self.rose_cr_path + os.sep + self.rose_cr_name + ' read error!')
+            self.cref=None
+            return False
+        cref = data.data
+        
+        self.cref = cref.transpose()
+        self.cref = MA.masked_array(self.cref, mask=self.cref==-32)
+        self.grid_lat,self.grid_lon=np.meshgrid(data.lat.data,data.lon.data)
 
-    def get_cref_from_radar(self,grid_origin=[30,110]):
-        self.xlims=[-100,100]
-        self.ylims=[-100,100]
-        self.zlims=[1,15]
-        self.xreso=500
-        self.yreso=500
-        self.zreso=500
+        return True
+    
+    # 从单站雷达基数据中获取组合反射率因子，先进行三维插值，再求CR
+    def get_cref_from_radar(self,xlimits=[-50,50], ylimits=[-50,50], zlimits=[1,15], xreso=1000, yreso=1000, zreso=500, grid_origin=None):
+        print('enter get_cref_from_radar function!')
+        
+        self.xlims=xlimits # km
+        self.ylims=ylimits # km
+        self.zlims=zlimits # km
+        self.xreso=xreso #m
+        self.yreso=yreso #m
+        self.zreso=zreso #m
         self.g_xlim = (self.xlims[0]*1000,self.xlims[1]*1000)
         self.g_ylim = (self.ylims[0]*1000,self.ylims[1]*1000)
         self.g_zlim = (self.zlims[0]*1000,self.zlims[1]*1000)
         self.g_numx = int(len(range(self.xlims[0],self.xlims[1]))*1000/self.xreso+1) # x方向格点数
         self.g_numy = int(len(range(self.ylims[0],self.ylims[1]))*1000/self.yreso+1) # y方向格点数
         self.g_numz = int(len(range(self.zlims[0],self.zlims[1]))*1000/self.zreso+1) # z方向格点数
-
+        if grid_origin is None:
+            grid_origin = (self.radar.latitude['data'][0], self.radar.longitude['data'][0])
+        print('grid shape:',(self.g_numz, self.g_numy, self.g_numx))
+        print('grid limits:',(self.g_zlim, self.g_ylim, self.g_xlim))
+        print('grid origin:',grid_origin)
         self.grid=pyart.map.grid_from_radars(
             (self.radar,),
             grid_origin=grid_origin,
@@ -452,7 +488,9 @@ class DRAW_RADAR_OTHER:
 
         self.cref = np.nanmax(xrdata.reflectivity.data[0],axis=0) 
         self.cref = self.cref.transpose()
-        self.grid_lat,self.grid_lon=np.meshgrid(xrdata.lat.data,xrdata.lon.data)
+        self.grid_lat = xrdata.lat.data
+        self.grid_lon = xrdata.lon.data
+        
 
     def draw_cref(self,):
         cmapdic= parse_pro(self.ref_colorfile)
@@ -554,10 +592,6 @@ class DRAW_RADAR_OTHER:
         plt.setp(cntr.labelTexts, path_effects=[
             patheffects.withStroke(linewidth=2, foreground="w")])
 
-        # for txobj in cntr.labelTexts:
-        #     pos = txobj.get_position()
-        #     txt = txobj.get_text()
-        #     print(pos, txt)
 
     # 画露点温度场客观分析等值线
     def draw_drewpoint(self,zorder=2):
@@ -597,7 +631,6 @@ class DRAW_RADAR_OTHER:
         
         dpt2m = oa_class.do_oa_base(params)
 
-        # levels = list(range(-40, 50, 0.5))
         levels = np.arange(-40,50,0.5)
        
         cntr = self.ax1.contour(dpt2m.lon.values,dpt2m.lat.values,dpt2m.dpt2m.values,
@@ -623,7 +656,6 @@ class DRAW_RADAR_OTHER:
         aws_lons=awsdata['Lon'].values
         aws_2minspd=awsdata['WIN_S_Avg_2mi'].values
         aws_2mindir=awsdata['WIN_D_Avg_2mi'].values
-        # u,v=wind_components(aws_2minspd,aws_2mindir)
 
         validflag=[]
         for nn in range(len(aws_lats)):
@@ -641,14 +673,13 @@ class DRAW_RADAR_OTHER:
       
         cntr = self.ax1.contour(vtx_div.lon.values,vtx_div.lat.values,vtx_div.vtx_10m.values,
                                 levels=levels,colors='k',zorder=zorder)
-        
-        plt.setp(cntr.collections, path_effects=[
-            patheffects.withStroke(linewidth=2, foreground="w")])
-        clbls = self.ax1.clabel(cntr,fmt="%2.1f",use_clabeltext=True,fontsize=self.fontsize_colorbar)
-
+        for artist in cntr.get_children():
+            if isinstance(artist, matplotlib.collections.PathCollection):
+                artist.set_path_effects([patheffects.withStroke(linewidth=self.linewidth_cntr, foreground="w")])
+                clbls = self.ax1.clabel(artist,fmt="%2.1f",use_clabeltext=True,fontsize=self.fontsize_colorbar)
+                
         plt.setp(cntr.labelTexts, path_effects=[
-            patheffects.withStroke(linewidth=2, foreground="w")])
-
+            patheffects.withStroke(linewidth=self.linewidth_cntr, foreground="w")])
         
     def draw_ppi(self,fieldname='reflectivity',tilt=0,colorfile=None,**kwargs):
         cmapdic = parse_pro(colorfile)
@@ -659,11 +690,12 @@ class DRAW_RADAR_OTHER:
             print('tilt should be int and >=0') 
             return False
         
+        
         self.display.plot_ppi_map(fieldname, tilt,cmap=cmapdic['cmap'],gatefilter=self.gatefilter_ref,
                             min_lon=self.wlon, max_lon=self.elon, norm=cmapdic['norm'],ax=self.ax1,
-                            min_lat=self.slat, max_lat=self.nlat,lon_lines=[-110,],lat_lines=[-90,],title_flag=False,
-                            fig=self.fig, lat_0=self.g_rad_lat,colorbar_flag=False,
-                            lon_0=self.g_rad_lon,**kwargs)
+                            min_lat=self.slat, max_lat=self.nlat,title_flag=False,
+                            fig=self.fig, lat_0=self.g_rad_lat,lon_0=self.g_rad_lon,colorbar_flag=False,
+                            **kwargs)
 
     def draw_wind_barb(self,zorder=1):
         # 画风场
@@ -687,8 +719,8 @@ class DRAW_RADAR_OTHER:
             if aws_2minspd[nn] > 999000 or aws_2mindir[nn] > 999000 or aws_2minspd[nn] < 1:
                 continue
             u,v=wind_components(float(2)*units('m/s'),int(aws_2mindir[nn])*units.deg)
-            plt.barbs(aws_lons[nn],aws_lats[nn],u.magnitude*2.5,v.magnitude*2.5,length=5,barbcolor='black',linewidth=2,zorder=zorder) 
-            plt.barbs(aws_lons[nn],aws_lats[nn],u.magnitude*2.5,v.magnitude*2.5,length=5,barbcolor='white',linewidth=1,zorder=zorder) 
+            plt.barbs(aws_lons[nn],aws_lats[nn],u.magnitude*2.5,v.magnitude*2.5,length=5,barbcolor='black',linewidth=self.wind_bar_width_outter,zorder=zorder) 
+            plt.barbs(aws_lons[nn],aws_lats[nn],u.magnitude*2.5,v.magnitude*2.5,length=5,barbcolor='white',linewidth=self.wind_bar_width_inner,zorder=zorder) 
 
     
     def draw_wind_quiver(self,zorder=1):
@@ -765,18 +797,14 @@ class DRAW_RADAR_OTHER:
             for tick_pos in tick_poss:
                 ax2.vlines(tick_pos, 0, 0.2, transform=trans, color="black")
                 ax2.vlines(tick_pos, 0.85, 1, transform=trans, color="black")
-                # bbox=dict(facecolor="white", alpha=0.8, edgecolor="black")
-                # ax2.text(tick_pos, 0.5, str(int(tick_pos)),color=[1,1,1],path_effects=[path_effects.Stroke(linewidth=1, foreground='black'),path_effects.Normal()],
-                #     va="center", ha="center", transform=trans, fontsize = self.fontsize1)
+
                 ax2.text(tick_pos, 1.4, str(int(tick_pos)),va="center", ha="center", transform=trans, fontsize = self.fontsize_colorbar)
-            # ax2.text(1.02, 0.5, cmapdic['units'], transform=ax2.transAxes,va="center", ha="center", 
-            #                 color=[1,1,1],path_effects=[path_effects.Stroke(linewidth=1, foreground='black'),path_effects.Normal()],fontsize = self.fontsize_colorbar)
+    
             ax2.text(1.02, 0.5, cmapdic['units'], transform=ax2.transAxes,va="center", ha="center",fontsize = self.fontsize_colorbar)
             
 
         # 垂直色标
         if orientation == 'vertical':
-            # cbar_axes = [self.map_panel_axes[0]+ self.map_panel_axes[2] + 0.01,self.map_panel_axes[1],0.03,self.map_panel_axes[3]]
             ax_pos = self.ax1.get_position().bounds
             cbar_axes = [ax_pos[0]+ ax_pos[2]+0.01,(ax_pos[1]+ax_pos[1]+ax_pos[3])/2-ax_pos[3]*cb_ratio/2,0.02,ax_pos[3]*cb_ratio]
             cb_ax = self.fig.add_axes(cbar_axes)
@@ -784,8 +812,6 @@ class DRAW_RADAR_OTHER:
             
             cbar = ColorbarBase(cb_ax, orientation=orientation, norm=colordata['norm'], cmap=colordata['cmap'],extend='both')
             cbar.set_ticks([])
-            # cb_ax.axis('tight')
-
             trans = transforms.blended_transform_factory(cb_ax.transData, cb_ax.transAxes)
             tick_poss=np.arange(colordata['norm'].vmin, colordata['norm'].vmax, tickstep)
             xrange = colordata['norm'].vmax - colordata['norm'].vmin
@@ -794,15 +820,11 @@ class DRAW_RADAR_OTHER:
                 cb_ax.hlines(tick_pos, colordata['norm'].vmin, colordata['norm'].vmin + 0.3*xrange, color="black",linewidth=0.5)
                 cb_ax.hlines(tick_pos, colordata['norm'].vmin + 0.7*xrange, colordata['norm'].vmax, color="black",linewidth=0.5)
     
-                # cb_ax.text(1.02,tick_pos, str(int(tick_pos)),color=[1,1,1],
-                #     path_effects=[path_effects.Stroke(linewidth=self.stroke_line_width, foreground='black'),
-                #     path_effects.Normal()],
-                #     va="center", ha="left",font=self.font_colorbar)
 
                 cb_ax.text(1.04,tick_pos, str(int(tick_pos)),va="center", ha="left",fontsize=5) # font=self.font_colorbar
 
             cb_ax.text(1.85, 1.035, colordata['units'], transform=cb_ax.transAxes,va="center", ha="center", fontsize=5 ) # ,font=self.font_colorbar
-                            # color=[1,1,1],path_effects=[path_effects.Stroke(linewidth=self.stroke_line_width, foreground='black'),path_effects.Normal()],
+                       
         
     
     def draw_gisinfo(self,):
@@ -811,7 +833,6 @@ class DRAW_RADAR_OTHER:
         aa = (np.array(self.gis_lats)<self.nlat) & (np.array(self.gis_lats) > self.slat)
         bb = (np.array(self.gis_lons)<self.elon) & (np.array(self.gis_lons) > self.wlon)
         cc = aa & bb
-        # cc = cc.values
 
         alltxt=[]
         for nn in range(len(self.gis_name)):
@@ -823,65 +844,51 @@ class DRAW_RADAR_OTHER:
                 markersize=1, alpha=0.8, transform=ccrs.PlateCarree())
             txt_lon = curlon
             txt_lat = curlat
-            if self.gis_name[nn] == '农博园':
-                txt_lon = curlon + 0.05
-                txt_lat = curlat + 0.01
-            elif self.gis_name[nn] == '吉林农大':
-                txt_lon = curlon + 0.06
-                txt_lat = curlat - 0.015
             texts = self.ax1.text(txt_lon, txt_lat, self.gis_name[nn], clip_on=True,
                             verticalalignment='center', horizontalalignment='right',
                             transform=text_transform, fontproperties=self.font_gis, color='white',
                             path_effects=[path_effects.Stroke(linewidth=1, foreground='black'),path_effects.Normal()])
-        #     alltxt.append(texts)
-        # adjust_text(alltxt)
-
-    def add_china_map_2cartopy(self, ax, name='province', facecolor='none',
-                           edgecolor='c', lw=1, **kwargs):
-            """
-            Draw china boundary on cartopy map.
-
-            :param ax: matplotlib axes instance.
-            :param name: map name.
-            :param facecolor: fill color, default is none.
-            :param edgecolor: edge color.
-            :param lw: line width.
-            :return: None
-            """
-
-            # map name
-            names = {'nation': "bou1_4p", 'province': "bou2_4p",
-                    'county': "BOUNT_poly", 'river': "hyd1_4l",
-                    'river_high': "hyd2_4l"}
-
-            # get shape filename
-            shpfile = "./resources/maps/" + names[name] + ".shp"
-
-            # add map
-            ax.add_geometries(
-                Reader(shpfile).geometries(), ccrs.PlateCarree(),
-                path_effects=[path_effects.Stroke(linewidth=lw+0.2, foreground='white'),path_effects.Normal()],
-                facecolor=facecolor, edgecolor=edgecolor, lw=lw, **kwargs)
+
+
+    def add_china_map_2cartopy(self, ax, name='province',edgecolor='k', lw=0.8,facecolor='none',transform=None, **kwargs):
+        """
+        Draw china boundary on cartopy map.
+
+        :param ax: matplotlib axes instance.
+        :param name: map name.
+        :param facecolor: fill color, default is none.
+        :param edgecolor: edge color.
+        :param lw: line width.
+        :return: None
+        """
+
+        # map name
+        names = {'nation': "bou1_4p", 'province': "bou2_4p",
+                'county': "BOUNT_poly", 'river': "hyd1_4l",
+                'river_high': "hyd2_4l"}
+
+        # get shape filename
+        shpfile = MAP_PATH + os.sep + names[name] + ".shp"
+
+        # add map
+        ax.add_geometries(
+            Reader(shpfile).geometries(), ccrs.PlateCarree(),
+            path_effects=[path_effects.Stroke(linewidth=lw+0.3, foreground='white'),path_effects.Normal()],
+            facecolor=facecolor, edgecolor=edgecolor, lw=lw, **kwargs)
 
     def draw_basemap(self,):
         # Setting projection and ploting the second tilt
         projection = ccrs.PlateCarree()
-        # projection = ccrs.LambertConformal(central_latitude=radar.latitude['data'][0],
-        #                                    central_longitude=radar.longitude['data'][0])
-        # figsize=(4,3)
-        self.fig = plt.figure(figsize=(self.paintsize_x,self.paintsize_y))
-        # DPI = 100
-        # fig.set_size_inches(800.0/float(DPI),600.0/float(DPI))
         
+        self.fig = plt.figure(figsize=(self.paintsize_x,self.paintsize_y))
+
         self.map_panel_axes = [0.12, 0.1, .76, .8]
-        # map_panel_axes = [0.01, 0.06, 0.98, 0.88]
         self.ax1 = self.fig.add_axes(self.map_panel_axes, projection=projection)
         pass
 
     def add_chinamap(self,):
-        self.add_china_map_2cartopy(self.ax1, name='county', facecolor='none',edgecolor=self.mapcolor, lw=self.linewidth_map)
-        # self.add_china_map_2cartopy(self.ax1, name='county', facecolor='none',edgecolor=[0.8,0.8,0.8], lw=1)
-        
+        self.add_china_map_2cartopy(self.ax1, name='county',edgecolor=self.mapcolor, lw=self.linewidth_map)
+
 
     def draw_title(self,titlestr='XX雷达0.5度仰角径向速度'):
         if not self.bdraw_title_ppi:
@@ -896,8 +903,7 @@ class DRAW_RADAR_OTHER:
         plt.title('%s(%s BJT)'%(titlestr,tstr),fontproperties=self.font_title,loc='right',verticalalignment='top')
 
     def crs_finish_save(self,bshow=False,subdir='',add_str='',):
-        # self.crs_ax.axis('tight')
-        # self.crs_ax.set_xlim([0,150])
+
         
         try:
             if not os.path.exists(self.picpath + os.sep + subdir): 
@@ -908,8 +914,8 @@ class DRAW_RADAR_OTHER:
             plt.savefig(self.picpath + os.sep + subdir + os.sep + self.timestr + '.' + add_str + '.' + self.pic_format,dpi=self.dpi)
         else:
             plt.savefig(self.picpath + os.sep + subdir + os.sep + self.timestr + '.' + add_str + '.' + self.pic_format,dpi=self.dpi,bbox_inches='tight')
-        # plt.savefig(self.picpath + os.sep + subdir + os.sep + self.timestr + add_str + '.eps',dpi=self.dpi)
-        print('image saved: ' + self.picpath + os.sep + subdir + os.sep + self.timestr + '.' + add_str + '.' + self.pic_format)
+
+        print(self.picpath + os.sep + subdir + os.sep + self.timestr + '.' + add_str + '.' + self.pic_format)
         if bshow:
             plt.show()
 
@@ -946,7 +952,7 @@ class DRAW_RADAR_OTHER:
             plt.savefig(self.picpath + os.sep + subdir + os.sep + self.timestr + '.' + self.pic_format,dpi=self.dpi)
         else:
             plt.savefig(self.picpath + os.sep + subdir + os.sep + self.timestr + '.' + self.pic_format,dpi=self.dpi,bbox_inches='tight')
-        print('image saved: ' + self.picpath + os.sep + subdir + os.sep + self.timestr + '.' + self.pic_format)
+        print(self.picpath + os.sep + subdir + os.sep + self.timestr + '.' + self.pic_format)
         if bshow:
             plt.show()
 
@@ -955,7 +961,6 @@ class DRAW_RADAR_OTHER:
     def draw_vel_pre(self,subdir='径向速度+当前小时降水',tilt=1):
         # check 
         if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
-            # print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
             return False
         self.draw_basemap()
         self.draw_gisinfo()
@@ -963,7 +968,7 @@ class DRAW_RADAR_OTHER:
         self.draw_pre_1h()
         self.add_chinamap()
         ele=np.mean(self.radar.get_elevation(tilt))
-        self.draw_title('%s雷达%.1f度%s'%(self.radarname,ele, subdir))
+        self.draw_title('%s %.1f° %s'%(self.radarname,ele, subdir))
         self.draw_colorbar(colorfile=self.vel_colorfile)
         self.finish_save(subdir=subdir)
 
@@ -975,7 +980,7 @@ class DRAW_RADAR_OTHER:
         self.gatefilter_ref.exclude_below('reflectivity', thred, exclude_masked=True, op='or', inclusive=False)
 
         ele=np.mean(self.radar.get_elevation(tilt))
-        subdir='%.1f度仰角%s'%(ele,subdir)
+        subdir='%.1f_%s'%(ele,subdir)
         if not self.breplace and os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
             print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
             return False
@@ -998,7 +1003,7 @@ class DRAW_RADAR_OTHER:
         self.gatefilter_ref.exclude_below('cross_correlation_ratio', thred, exclude_masked=True, op='or', inclusive=False)
 
         ele=np.mean(self.radar.get_elevation(tilt))
-        subdir='%.1f度仰角%s'%(ele,subdir)
+        subdir='%.1f_%s'%(ele,subdir)
         if not self.breplace and os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
             print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
             return False
@@ -1022,7 +1027,7 @@ class DRAW_RADAR_OTHER:
         self.gatefilter_ref.exclude_below('cross_correlation_ratio', thred, exclude_masked=True, op='or', inclusive=False)
 
         ele=np.mean(self.radar.get_elevation(tilt))
-        subdir='%.1f度仰角%s'%(ele,subdir)
+        subdir='%.1f_%s'%(ele,subdir)
         if not self.breplace and os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
             print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
             return False
@@ -1041,7 +1046,7 @@ class DRAW_RADAR_OTHER:
         if self.radar is None:
             return False
         ele=np.mean(self.radar.get_elevation(tilt))
-        subdir='%.1f度仰角%s'%(ele,subdir)
+        subdir='%.1f_%s'%(ele,subdir)
         
         if not self.breplace and os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.' + format):
             print(self.picpath + os.sep + subdir + self.timestr + '.' + format + ' already exists!')
@@ -1066,7 +1071,7 @@ class DRAW_RADAR_OTHER:
         self.add_chinamap()
         self.draw_wind_barb()
         ele=np.mean(self.radar.get_elevation(tilt))
-        self.draw_title('%s雷达%.1f度%s'%(self.radarname,ele, subdir))
+        self.draw_title('%s %.1f° %s'%(self.radarname,ele, subdir))
         self.draw_colorbar(colorfile=self.vel_colorfile)
         self.finish_save(subdir=subdir)
 
@@ -1081,30 +1086,30 @@ class DRAW_RADAR_OTHER:
         self.add_chinamap()
         self.draw_wind_quiver()
         ele=np.mean(self.radar.get_elevation(tilt))
-        self.draw_title('%s雷达%.1f度%s'%(self.radarname,ele, subdir))
+        self.draw_title('%s %.1f° %s'%(self.radarname,ele, subdir))
         self.draw_colorbar(colorfile=self.vel_colorfile)
         self.finish_save(subdir=subdir)
 
     def draw_ref_pre(self,subdir='基本反射率+当前小时降水',tilt=0):
         # check 
-        if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
-            # print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
-            return False
+        # if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
+        #     print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
+        #     return False
         self.draw_basemap()
         self.draw_gisinfo()
         self.draw_ppi(fieldname='reflectivity',tilt=tilt,colorfile=self.ref_colorfile)
         self.draw_pre_1h()
         self.add_chinamap()
         ele=np.mean(self.radar.get_elevation(tilt))
-        self.draw_title('%s雷达%.1f度%s'%(self.radarname,ele, subdir))
+        self.draw_title('%s %.1f° %s'%(self.radarname,ele, subdir))
         self.draw_colorbar(colorfile=self.ref_colorfile)
         self.finish_save(subdir=subdir)
 
     def draw_cref_pre(self,subdir='组合反射率+当前小时降水'):
         # check 
-        if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
-            # print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
-            return False
+        # if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
+        #     print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
+        #     return False
         self.draw_basemap()
         self.draw_gisinfo()
         self.draw_cref()
@@ -1116,9 +1121,9 @@ class DRAW_RADAR_OTHER:
 
     def draw_cref_wind_barb(self,subdir='组合反射率+地面自动站风场'):
         # check 
-        if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
-            print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
-            return False
+        # if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
+        #     print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
+        #     return False
         self.draw_basemap()
         self.draw_gisinfo()
         self.draw_cref()
@@ -1130,9 +1135,9 @@ class DRAW_RADAR_OTHER:
 
     def draw_cref_wind_quiver(self,subdir='组合反射率+地面流场'):
         # check 
-        if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
-            print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
-            return False
+        # if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
+        #     print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
+        #     return False
         self.draw_basemap()
         self.draw_gisinfo()
         self.draw_cref()
@@ -1144,9 +1149,9 @@ class DRAW_RADAR_OTHER:
 
     def draw_cref_pre_wind_barb(self,subdir='组合反射率+地面自动站风场+当前小时降水'):
         # check 
-        if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
-            print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
-            return False
+        # if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
+        #     print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
+        #     return False
 
         self.draw_basemap()
         self.draw_gisinfo()
@@ -1161,9 +1166,9 @@ class DRAW_RADAR_OTHER:
 
     def draw_ref_wind_barb_vortex(self,subdir='基本反射率+地面自动站风场+涡度场(等值线)',tilt=0):
         # check 
-        if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
-            print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
-            return False
+        # if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
+        #     print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
+        #     return False
         self.draw_basemap()
         self.draw_gisinfo()
         self.draw_ppi(fieldname='reflectivity',tilt=tilt,colorfile=self.ref_colorfile)
@@ -1171,15 +1176,15 @@ class DRAW_RADAR_OTHER:
         self.add_chinamap()
         self.draw_wind_barb(zorder=10)
         ele=np.mean(self.radar.get_elevation(tilt))
-        self.draw_title('%s雷达%.1f度%s'%(self.radarname,ele, subdir))
+        self.draw_title('%s %.1f° %s'%(self.radarname,ele, subdir))
         self.draw_colorbar(colorfile=self.ref_colorfile)
         self.finish_save(subdir=subdir)
     
     def draw_ref_wind_divergence(self,subdir='基本反射率+地面自动站风场+散度(等值线)',tilt=0,type='quiver'):
         # check 
-        if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
-            print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
-            return False
+        # if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
+        #     print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
+        #     return False
         self.draw_basemap()
         self.draw_gisinfo()
         self.draw_ppi(fieldname='reflectivity',tilt=tilt,colorfile=self.ref_colorfile)
@@ -1190,15 +1195,15 @@ class DRAW_RADAR_OTHER:
         elif type == 'barb':
             self.draw_wind_barb(zorder=10)
         ele=np.mean(self.radar.get_elevation(tilt))
-        self.draw_title('%s雷达%.1f度%s'%(self.radarname,ele, subdir))
+        self.draw_title('%s %.1f° %s'%(self.radarname,ele, subdir))
         self.draw_colorbar(colorfile=self.ref_colorfile)
         self.finish_save(subdir=subdir)
 
     def draw_ref_wind_barb_temperature(self,subdir='基本反射率+地面自动站风场+温度场(等值线)',tilt=0):
         # check 
-        if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
-            print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
-            return False
+        # if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
+        #     print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
+        #     return False
         self.draw_basemap()
         self.draw_gisinfo()
         self.draw_ppi(fieldname='reflectivity',tilt=tilt,colorfile=self.ref_colorfile)
@@ -1206,15 +1211,15 @@ class DRAW_RADAR_OTHER:
         self.add_chinamap()
         self.draw_wind_barb(zorder=10)
         ele=np.mean(self.radar.get_elevation(tilt))
-        self.draw_title('%s雷达%.1f度%s'%(self.radarname,ele, subdir))
+        self.draw_title('%s %.1f°%s'%(self.radarname,ele, subdir))
         self.draw_colorbar(colorfile=self.ref_colorfile)
         self.finish_save(subdir=subdir)
     
     def draw_ref_wind_barb_dewpoint(self,subdir='基本反射率+地面自动站风场+露点场(等值线)',tilt=0):
         # check 
-        if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
-            print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
-            return False
+        # if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
+        #     print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
+        #     return False
         self.draw_basemap()
         self.draw_gisinfo()
         self.draw_ppi(fieldname='reflectivity',tilt=tilt,colorfile=self.ref_colorfile)
@@ -1222,16 +1227,16 @@ class DRAW_RADAR_OTHER:
         self.add_chinamap()
         self.draw_wind_barb(zorder=10)
         ele=np.mean(self.radar.get_elevation(tilt))
-        self.draw_title('%s雷达%.1f度%s'%(self.radarname,ele, subdir))
+        self.draw_title('%s %.1f° %s'%(self.radarname,ele, subdir))
         self.draw_colorbar(colorfile=self.ref_colorfile)
         self.finish_save(subdir=subdir)
 
 
     def draw_ref_pre_wind(self,subdir='基本反射率+地面自动站风场+当前小时降水',type='barb',tilt=0):
         # type == barb or quiver
-        if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
-            print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
-            return False
+        # if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
+        #     print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
+        #     return False
         self.draw_basemap()
         self.draw_gisinfo()
         self.draw_ppi(fieldname='reflectivity',tilt=tilt,colorfile=self.ref_colorfile)
@@ -1242,15 +1247,15 @@ class DRAW_RADAR_OTHER:
         self.draw_pre_1h()
         self.add_chinamap()
         ele=np.mean(self.radar.get_elevation(tilt))
-        self.draw_title('%s雷达%.1f度%s'%(self.radarname,ele, subdir))
+        self.draw_title('%s %.1f° %s'%(self.radarname,ele, subdir))
         self.draw_colorbar(colorfile=self.ref_colorfile)
         self.finish_save(subdir=subdir)
 
     def draw_ref_wind(self,subdir='基本反射率+地面自动站风场',type='barb',tilt=0):
         # type == barb or quiver
-        if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
-            print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
-            return False
+        # if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.png'):
+        #     print(self.picpath + os.sep + subdir + self.timestr + '.png' + ' already exists!')
+        #     return False
         self.draw_basemap()
         self.draw_gisinfo()
         self.draw_ppi(fieldname='reflectivity',tilt=tilt,colorfile=self.ref_colorfile)
@@ -1260,10 +1265,45 @@ class DRAW_RADAR_OTHER:
             self.draw_wind_quiver()
         self.add_chinamap()
         ele=np.mean(self.radar.get_elevation(tilt))
-        self.draw_title('%s雷达%.1f度%s'%(self.radarname,ele, subdir))
+        self.draw_title('%s %.1f° %s'%(self.radarname,ele, subdir))
         self.draw_colorbar(colorfile=self.ref_colorfile)
         self.finish_save(subdir=subdir)
 
+
+    # 叠加1小时变温
+    def draw_ref_wind_delta_t(self,subdir='基本反射率+地面自动站风场+1小时变温(等值线)',tilt=0,type='quiver'):
+        # check 
+        # if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.' + self.pic_format):
+        #     print(self.picpath + os.sep + subdir + self.timestr + '.' + self.pic_format + ' already exists!')
+        #     return False
+        self.draw_basemap()
+        self.draw_gisinfo()
+        
+        self.draw_ppi(fieldname='reflectivity',tilt=tilt,colorfile=self.ref_colorfile)
+        # self.draw_divergence(zorder=2)
+        self.draw_delta_t(zorder=2)
+        self.add_chinamap()
+        if type == 'quiver':
+            self.draw_wind_quiver(zorder=10)
+        elif type == 'barb':
+            self.draw_wind_barb(zorder=10)
+        ele=np.mean(self.radar.get_elevation(tilt))
+        self.draw_title('%s %.1f° %s'%(self.radarname,ele, subdir))
+        self.draw_colorbar(colorfile=self.ref_colorfile)
+        self.finish_save(subdir=subdir)
+    
+    # 叠加1小时变压
+    def draw_ref_wind_delta_p(self,subdir='基本反射率+地面自动站风场+1小时变压(等值线)',tilt=0,type='quiver'):
+        # check 
+        # if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + + '.' + self.pic_format):
+        #     print(self.picpath + os.sep + subdir + self.timestr + + '.' + self.pic_format + ' already exists!')
+        #     return False
+        self.draw_basemap()
+        self.draw_gisinfo()
+        self.draw_ppi(fieldname='reflectivity',tilt=tilt,colorfile=self.ref_colorfile)
+        self.draw_delta_p(zorder=2)
+        
+        
     def draw_delta_t(self,zorder=2):
         
         # 叠加1小时变温
@@ -1284,9 +1324,10 @@ class DRAW_RADAR_OTHER:
         cntr = self.ax1.contour(delta_t_data.lon.values,delta_t_data.lat.values,delta_t_data.t2m_delta_1hr.values.T,
                                 levels=levels,colors=self.contour_color,zorder=zorder,linewidths=self.linewidth_cntr)
         
-        plt.setp(cntr.collections, path_effects=[
-            patheffects.withStroke(linewidth=self.linewidth_cntr, foreground="w")])
-        clbls = self.ax1.clabel(cntr,fmt="%2.1f",use_clabeltext=True,fontsize=self.fontsize_colorbar)
+        for artist in cntr.get_children():
+            if isinstance(artist, matplotlib.collections.PathCollection):
+                artist.set_path_effects([patheffects.withStroke(linewidth=self.linewidth_cntr, foreground="w")])
+                clbls = self.ax1.clabel(artist,fmt="%2.1f",use_clabeltext=True,fontsize=self.fontsize_colorbar)
 
         plt.setp(cntr.labelTexts, path_effects=[
             patheffects.withStroke(linewidth=self.linewidth_cntr, foreground="w")])
@@ -1311,69 +1352,99 @@ class DRAW_RADAR_OTHER:
         cntr = self.ax1.contour(delta_p_data.lon.values,delta_p_data.lat.values,delta_p_data.sprs2m_delta_1hr.values.T,
                                 levels=levels,colors=self.contour_color,zorder=zorder,linewidths=self.linewidth_cntr,label='1小时变压')
         
-        plt.setp(cntr.collections, path_effects=[
-            patheffects.withStroke(linewidth=self.linewidth_cntr, foreground="w")])
-        
-        clbls = self.ax1.clabel(cntr,fmt="%2.1f",use_clabeltext=True,fontsize=self.fontsize_colorbar,inline=True)
+        for artist in cntr.get_children():
+            if isinstance(artist, matplotlib.collections.PathCollection):
+                artist.set_path_effects([patheffects.withStroke(linewidth=self.linewidth_cntr, foreground="w")])
+                clbls = self.ax1.clabel(artist,fmt="%2.1f",use_clabeltext=True,fontsize=self.fontsize_colorbar,inline=True)
 
         plt.setp(cntr.labelTexts, path_effects=[
             patheffects.withStroke(linewidth=self.linewidth_cntr, foreground="w")])
         return cntr
     
 
-    def draw_topo(self,):
-        # 读取地形数据
-        filename = './resources/topo/topo_china.nc'
-        # filename = 'resources/topo/china_dem_30m.nc'
-        basetopo = xr.open_dataset(filename)
-        #根据经纬度范围获取区域内的地形高度最大最小值
-        topo = basetopo.sel(Longitude=slice(self.wlon,self.elon),Latitude=slice(self.slat,self.nlat))
-        # topo = basetopo.sel(lon=slice(self.wlon,self.elon),lat=slice(self.slat,self.nlat))
-        topo_min = float(topo.min().topo.values)
-        topo_max = float(topo.max().topo.values)
-        # self.ax1.pcolormesh(topo['lon'].values,topo['lat'].values,topo['topo'],vmin=300,vmax=1000,cmap='pyart_Gray5')# ,levels=[250,500,750,1000],
-        self.ax1.pcolormesh(topo['Longitude'].values,topo['Latitude'].values,topo['topo'],vmin=300,vmax=1000,cmap='pyart_Gray5')# ,levels=[250,500,750,1000],
+    
+        
+        
 
-    # 叠加1小时变温
-    def draw_ref_wind_delta_t(self,subdir='基本反射率+地面自动站风场+1小时变温(等值线)',tilt=0,type='quiver'):
-        # check 
-        if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + '.' + self.pic_format):
-            print(self.picpath + os.sep + subdir + self.timestr + '.' + self.pic_format + ' already exists!')
-            return False
-        self.draw_basemap()
-        self.draw_gisinfo()
-        self.draw_topo()
-        self.draw_ppi(fieldname='reflectivity',tilt=tilt,colorfile=self.ref_colorfile)
-        # self.draw_divergence(zorder=2)
-        self.draw_delta_t(zorder=2)
-        self.add_chinamap()
-        if type == 'quiver':
-            self.draw_wind_quiver(zorder=10)
-        elif type == 'barb':
-            self.draw_wind_barb(zorder=10)
-        ele=np.mean(self.radar.get_elevation(tilt))
-        self.draw_title('%s雷达%.1f度%s'%(self.radarname,ele, subdir))
-        self.draw_colorbar(colorfile=self.ref_colorfile)
-        self.finish_save(subdir=subdir)
+if __name__ == "__main__":
     
-    # 叠加1小时变压
-    def draw_ref_wind_delta_p(self,subdir='基本反射率+地面自动站风场+1小时变压(等值线)',tilt=0,type='quiver'):
-        # check 
-        if os.path.exists(self.picpath + os.sep + subdir + os.sep +self.timestr + + '.' + self.pic_format):
-            print(self.picpath + os.sep + subdir + self.timestr + + '.' + self.pic_format + ' already exists!')
-            return False
-        self.draw_basemap()
-        self.draw_gisinfo()
-        self.draw_ppi(fieldname='reflectivity',tilt=tilt,colorfile=self.ref_colorfile)
-        self.draw_delta_p(zorder=2)
+    import pandas as pd
+    import numpy as np  
+    # 准备GIS文件
+    gisfile = '/home/wjzhu/OneDrive/PythonCode/MyWork/metradar/resources/stations/cma_city_station_info.dat'
+
+    cities = pd.read_csv(gisfile,  delimiter=r"\s+") # cma_city_station_info
+
+    cityname = np.unique(cities['city_name'])
+    stanames=[]
+    lat=[]
+    lon=[]
+
+    curdata = cities
+    for name in cityname:
+        flag2 =  curdata['city_name'] == name
+        tmp_lat = np.mean(curdata[flag2]['lat'])
+        tmp_lon = np.mean(curdata[flag2]['lon'])
+
+        stanames.append(name)
+        lon.append(tmp_lon)
+        lat.append(tmp_lat)
         
         
-        self.add_chinamap()
-        if type == 'quiver':
-            self.draw_wind_quiver(zorder=10)
-        elif type == 'barb':
-            self.draw_wind_barb(zorder=10)
-        ele=np.mean(self.radar.get_elevation(tilt))
-        self.draw_title('%s雷达%.1f度%s'%(self.radarname,ele, subdir))
-        self.draw_colorbar(colorfile=self.ref_colorfile)
-        self.finish_save(subdir=subdir)
+    # 初始化绘图参数
+    params=ini_params()
+
+    # 修改补充完善参数
+    params['radarfile_path'] = '/mnt/e/metradar_test/radar_aws/radar_fmt/2021/07/20/Z9371'
+    params['radarfile_name'] = 'Z_RADR_I_Z9371_20210720083000_O_DOR_SAD_CAP_FMT.bin.bz2'
+    params['rose_cr_path'] = '/mnt/e/metradar_test/radar_aws/pup/Z9371/CR/37'
+    params['rose_cr_name'] = 'Z9371_20210720083000Z_CR_00_37'
+    params['aws_hour_file_path'] = '/mnt/e/metradar_test/radar_aws/awsdata/aws_hourly_obs'
+    params['aws_hour_file_name'] = 'surface_aws_hourly_20210720_0900.csv'
+    params['aws_min_file_path'] = '/mnt/e/metradar_test/radar_aws/awsdata/aws_minutes_obs'
+    params['aws_min_file_name'] = 'surface_aws_minute_20210720_0824_0830.csv'
+    
+    params['pic_path'] = '/mnt/e/metradar_test/radar_aws/pic'
+    params['slat'] = 34
+    params['nlat'] = 35
+    params['wlon'] = 113
+    params['elon'] = 114
+    params['timestr'] = params['radarfile_name'].split('_')[4]
+    params['fontfile'] = '/home/wjzhu/OneDrive/PythonCode/MyWork/metradar/resources/fonts/YaHeiConsolasHybrid_1.12.ttf'
+    params['gis_lats'] = lat
+    params['gis_lons'] = lon
+    params['gis_name'] = stanames
+    params['breplace'] = True
+    params['bdraw_crs'] = False
+    params['ref_colorfile'] = '/home/wjzhu/OneDrive/PythonCode/MyWork/metradar/resources/gr2_colors/default_BR_PUP2.pal'
+    params['vel_colorfile'] = '/home/wjzhu/OneDrive/PythonCode/MyWork/metradar/resources/gr2_colors/default_BV_PUP2.pal'
+    params['figsize_width'] = 4
+    params['fontsize_gis'] = 5
+    params['fontsize_colorbar'] = 5
+    params['fontsize_title'] = 6
+    params['mapcolor'] = [0/255,0/255,0/255]
+    params['dpi'] = 300
+    params['pic_format'] = 'png'
+    params['bdraw_title_ppi'] = False
+
+
+    # 创建绘图函数
+    _draw_radar_other = DRAW_RADAR_OTHER(params)
+
+    # _draw_radar_other.read_vol_data()
+
+    # _draw_radar_other.draw_ref_alone(subdir='ref',tilt=0,thred=-5)
+    
+    # _draw_radar_other.draw_vel_alone(subdir='vel',tilt=1)
+    
+    # _draw_radar_other.draw_ref_pre(subdir='ref_pre',)
+    
+    # _draw_radar_other.draw_ref_wind_barb_vortex(subdir='ref_pre_wind_vortex',)
+    
+    # _draw_radar_other.get_cref_from_radar(xlimits=[-80,50],ylimits=[-80,50])
+    # _draw_radar_other.draw_cref_wind_barb(subdir='cref_wind_barb',)
+    # _draw_radar_other.draw_cref_pre(subdir='cref_pre',)
+    
+    _draw_radar_other.get_cref_from_rose()
+    # _draw_radar_other.draw_cref_wind_barb(subdir='cref_wind_barb',)
+    _draw_radar_other.draw_cref_pre(subdir='cref_pre',)