shancx 1.9.33.215__tar.gz → 1.9.33.217__tar.gz

{shancx-1.9.33.215 → shancx-1.9.33.217}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shancx
-Version: 1.9.33.215
+Version: 1.9.33.217
 Summary: A simple timer decorator
 Home-page: https://gitee.com/shancx
 Author: shancx

{shancx-1.9.33.215 → shancx-1.9.33.217}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 setup(
     name="shancx",
-    version="1.9.33.215",
+    version="1.9.33.217",
     packages=find_packages(),
     description="A simple timer decorator",
     long_description=open("README.md").read(),

{shancx-1.9.33.215 → shancx-1.9.33.217}/shancx/Plot/plotGlobal.py

@@ -180,7 +180,6 @@ def plotScatter(df1, title = "Total number ",saveDir="plotScatter", map_backgrou
 plotScatter(df2,title = f" Total number of stations ", saveDir="scatter_maps")
 """
 
-
 import ssl
 import urllib.request
 ssl._create_default_https_context = ssl._create_unverified_context
@@ -191,8 +190,11 @@ import cartopy.crs as ccrs
 import cartopy.feature as cfeature
 from cartopy.mpl.ticker import LongitudeFormatter, LatitudeFormatter
 from hjnwtx.colormap import cmp_hjnwtx
-def plotfigPlus(UTCstr, nclon, nclat, cr, fig_title, datatype,myfont,shp_file="./"):
+from shancx import crDir
+def plotBorder(UTCstr, nclon, nclat, cr, fig_title,savepath="./plotBorder", datatype=None,font_path=None,shp_file="./"):
+    myfont = mpl.font_manager.FontProperties(fname = font_path, size = 12) 
     figpath = f"{savepath}/fig/{UTCstr[:4]}/{UTCstr[:8]}/{fig_title}.PNG"
+    crDir(figpath)
     lonmin = np.min(nclon)
     lonmax = np.max(nclon)
     latmin = np.min(nclat)
@@ -245,12 +247,11 @@ def plotfigPlus(UTCstr, nclon, nclat, cr, fig_title, datatype,myfont,shp_file=".
 """
 latArr = np.linspace(27, -13, 2000 )
 lonArr = np.linspace(70, 150, 4000) 
-
 font_path = '/mnt/wtx_weather_forecast/scx/sever7/微软雅黑.ttf'
-myfont = mpl.font_manager.FontProperties(fname = font_path, size = 12) 
+
 fig_title = f"实况雷达回波_{UTCstr}_test"          
 baseCR[:,900:3700] = CR
-plotfigPlus(UTCstr,lonArr,latArr,baseCR,fig_title,datatype="radar",myfont=myfont) 
+plotBorder(UTCstr,lonArr,latArr,baseCR,fig_title,datatype="radar",font_path=font_path) 
 fig_title = f"卫星反演雷达回波_{UTCstr}"
 """
 
@@ -321,48 +322,4 @@ fig_title = f"卫星反演雷达回波_{UTCstr}"
 # base[20:1070,75:1625] = satCR
 plot_fig(data,result['lats'],result['lons'],fig_title,datatype="radar")
 """
-
-
-import numpy as np
-import matplotlib.pyplot as plt
-import cartopy.crs as ccrs
-import cartopy.feature as cfeature
-from mpl_toolkits.axes_grid1 import make_axes_locatable
-import datetime
-from shancx import crDir
-def plotBorder(matrix,name='plotBorder',saveDir="plotBorder",extent=None,title='Matrix Plot', xlabel='X-axis', ylabel='Y-axis', color_label='Value', cmap='viridis'):
-    if extent is None:  
-        lat_min, lat_max = -3, 13
-        lon_min, lon_max = -0, 28
-    else:
-        lat_min, lat_max, lon_min, lon_max = extent
-    now_str = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
-    fig = plt.figure(figsize=(12, 8))
-    ax = fig.add_subplot(1, 1, 1, projection=ccrs.PlateCarree())
-    ax.set_extent([lon_min, lon_max, lat_min, lat_max], crs=ccrs.PlateCarree())
-    im = ax.imshow(
-        matrix,
-        extent=[lon_min, lon_max, lat_min, lat_max],
-        origin='upper', 
-        cmap='viridis',  
-        transform=ccrs.PlateCarree()
-    )
-    ax.add_feature(cfeature.COASTLINE, linewidth=0.5)
-    ax.add_feature(cfeature.BORDERS, linestyle=':', linewidth=0.5)
-    states = cfeature.NaturalEarthFeature(
-        category='cultural',
-        name='admin_1_states_provinces_lines',
-        scale='50m',
-        facecolor='none'
-    )
-    ax.add_feature(states, edgecolor='red', linewidth=0.5)
-    divider = make_axes_locatable(ax)
-    cax = divider.append_axes("right", size="5%", pad=0.1, axes_class=plt.Axes)
-    cbar = plt.colorbar(im, cax=cax, label='Data Values')
-    ax.set_title('Sat data Boundaries', fontsize=14)
-    plt.tight_layout()   
-    outpath = f'./{saveDir}/{name}_{now_str}.png' if name=="plotBorder" else f"./{saveDir}/{name}.png"
-    crDir(outpath)
-    plt.savefig(outpath)
-    plt.close()
-
+ 

{shancx-1.9.33.215 → shancx-1.9.33.217}/shancx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shancx
-Version: 1.9.33.215
+Version: 1.9.33.217
 Summary: A simple timer decorator
 Home-page: https://gitee.com/shancx
 Author: shancx