shancx 1.9.33.216__tar.gz → 1.9.33.220__tar.gz

{shancx-1.9.33.216 → shancx-1.9.33.220}/PKG-INFO

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

{shancx-1.9.33.216 → shancx-1.9.33.220}/setup.py

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

{shancx-1.9.33.216 → shancx-1.9.33.220}/shancx/Plot/plotGlobal.py

@@ -11,7 +11,7 @@ import cartopy.feature as cfeature
 from cartopy.mpl.ticker import LongitudeFormatter, LatitudeFormatter
 from hjnwtx.colormap import cmp_hjnwtx
 import os
-def plotGlobal(b, latArr1, lonArr1, cmap='summer', title='Global QPF Data Visualization',saveDir = "./plotGlobal",ty=None ):
+def plotGlobal(b, latArr1, lonArr1, cmap='summer', title='Global QPF Data Visualization',saveDir = "./plotGlobal",ty=None,name="plotGlobal" ):
     now_str = datetime.datetime.now().strftime("%Y%m%d%H%M%S") 
     plt.figure(figsize=(20, 10), dpi=100)
     ax = plt.axes(projection=ccrs.PlateCarree())
@@ -28,14 +28,29 @@ def plotGlobal(b, latArr1, lonArr1, cmap='summer', title='Global QPF Data Visual
         "pre": cmp_hjnwtx["pre_tqw"],
         None: 'summer'
     }.get(ty)
+
+    minmax = {
+        "radar": [0,80],
+        "pre": [0,20],
+        None: [np.nanmin(b),np.nanmax(b)]
+    }.get(ty)
+
+    setlabel = {
+        "radar": 'Composite Reflectivity (Radar)\nUnit: (dBZ)',
+        "pre": 'Precipitation\nUnit: (mm)',
+        None: 'Data'
+    }.get(ty)
+
     img = ax.pcolormesh(lon_grid[::stride, ::stride], 
                        lat_grid[::stride, ::stride],
                        b[::stride, ::stride],
                        cmap=cmap,  
                        shading='auto',
+                       vmin=minmax[0],
+                       vmax=minmax[1],
                        transform=ccrs.PlateCarree())
     cbar = plt.colorbar(img, ax=ax, orientation='vertical', pad=0.05, shrink=0.6)
-    cbar.set_label('Value Scale', fontsize=12)
+    cbar.set_label(setlabel, fontsize=12)
     ax.set_xticks(np.arange(-180, 181, 30), crs=ccrs.PlateCarree())
     ax.set_yticks(np.arange(-90, 91, 15), crs=ccrs.PlateCarree())
     ax.xaxis.set_major_formatter(LongitudeFormatter(zero_direction_label=True))
@@ -45,15 +60,108 @@ def plotGlobal(b, latArr1, lonArr1, cmap='summer', title='Global QPF Data Visual
     ax.set_global()     
     plt.tight_layout()
     os.makedirs(saveDir, exist_ok=True)
-    plt.savefig(f"./{saveDir}/plotScatter_glob{now_str}.png", dpi=300, bbox_inches="tight")  
+    plt.savefig(f"./{saveDir}/plotGlobal_glob{now_str}_{name}.png", dpi=300, bbox_inches="tight")  
     plt.close()
     
 """
 plotGlobal(b, latArr1, lonArr1, 
                 title='Global Meteorological Data',ty="radar")
-
 """
 
+import ssl
+import urllib.request
+ssl._create_default_https_context = ssl._create_unverified_context
+import datetime
+import numpy as np
+import matplotlib.pyplot as plt
+import cartopy.crs as ccrs
+import cartopy.feature as cfeature
+from cartopy.mpl.ticker import LongitudeFormatter, LatitudeFormatter
+from hjnwtx.colormap import cmp_hjnwtx
+import os
+def plotGlobalTtf(b, latArr1, lonArr1, cmap='summer', title='Global QPF Data Visualization', saveDir="./plotGlobal", ty=None, name=1,font_path=None):
+    now_str = datetime.datetime.now().strftime("%Y%m%d%H%M%S") 
+    import matplotlib.pyplot as plt
+    import matplotlib
+    import matplotlib.font_manager as fm
+    font_path = "/mnt/wtx_weather_forecast/scx/sever7/微软雅黑.ttf" if font_path is None else font_path
+    font_kwargs = {}    
+    if os.path.exists(font_path):
+        try:
+            fm.fontManager.addfont(font_path)
+            font_prop = fm.FontProperties(fname=font_path)
+            font_name = font_prop.get_name()
+            plt.rcParams['font.family'] = 'sans-serif'
+            plt.rcParams['font.sans-serif'] = [font_name]
+            plt.rcParams['axes.unicode_minus'] = False
+            font_kwargs = {'fontproperties': font_prop}
+            print(f"成功加载字体: {font_name}")            
+        except Exception as e:
+            print(f"加载指定字体失败: {e}")
+            # 尝试使用系统字体
+            try:
+                plt.rcParams['font.sans-serif'] = ['SimHei', 'Microsoft YaHei', 'DejaVu Sans']
+                plt.rcParams['axes.unicode_minus'] = False
+            except:
+                pass
+    else:
+        print(f"警告: 字体文件不存在: {font_path}")
+        try:
+            plt.rcParams['font.sans-serif'] = ['SimHei', 'Microsoft YaHei', 'DejaVu Sans']
+            plt.rcParams['axes.unicode_minus'] = False
+        except:
+            pass    
+    plt.figure(figsize=(20, 10), dpi=100)
+    ax = plt.axes(projection=ccrs.PlateCarree())
+    ax.add_feature(cfeature.LAND, facecolor='none')  # 陆地无色
+    ax.add_feature(cfeature.OCEAN, facecolor='none')  # 海洋无色
+    ax.add_feature(cfeature.COASTLINE, linewidth=0.8, edgecolor='black')  # 海岸线黑色
+    ax.add_feature(cfeature.BORDERS, linestyle='-', linewidth=0.5, edgecolor='black')  # 国界线黑色
+    ax.add_feature(cfeature.LAKES, alpha=0.3, facecolor='none', edgecolor='gray')  # 湖泊无色，灰色边界
+    ax.add_feature(cfeature.RIVERS, edgecolor='gray', linewidth=0.5)  # 河流灰色
+    lon_grid, lat_grid = np.meshgrid(lonArr1, latArr1)
+    stride = 10  # 每10个点取1个
+    cmap = {
+        "radar": cmp_hjnwtx["radar_nmc"],
+        "pre": cmp_hjnwtx["pre_tqw"],
+        None: 'summer'
+    }.get(ty)
+    minmax = {
+        "radar": [0,80],
+        "pre": [0,20],
+        None: [np.nanmin(b),np.nanmax(b)]
+    }.get(ty)
+
+    setlabel = {
+        "radar": '雷达组合反射率\n单位：（dbz）',
+        "pre": '降雨量\n单位：（mm）',
+        None: '数据'
+    }.get(ty)
+    img = ax.pcolormesh(lon_grid[::stride, ::stride], 
+                       lat_grid[::stride, ::stride],
+                       b[::stride, ::stride],
+                       cmap=cmap,  
+                       shading='auto',
+                       transform=ccrs.PlateCarree(), vmin=minmax[0], vmax=minmax[1])
+    cbar = plt.colorbar(img, ax=ax, orientation='vertical', pad=0.05, shrink=0.6)
+    if font_kwargs:
+        cbar.set_label(setlabel, fontsize=12, **font_kwargs)
+    ax.set_xticks(np.arange(-180, 181, 30), crs=ccrs.PlateCarree())
+    ax.set_yticks(np.arange(-90, 91, 15), crs=ccrs.PlateCarree())
+    ax.xaxis.set_major_formatter(LongitudeFormatter(zero_direction_label=True))
+    ax.yaxis.set_major_formatter(LatitudeFormatter())
+    ax.gridlines(color='gray', linestyle=':', alpha=0.5)
+    ax.set_title(title, fontsize=16, pad=20)    
+    ax.set_global()     
+    plt.tight_layout()
+    os.makedirs(saveDir, exist_ok=True)
+    plt.savefig(f"./{saveDir}/plotScatter_glob{now_str}_{ty}_{name}.png", dpi=300, bbox_inches="tight")  
+    plt.close()
+    
+'''
+plotGlobal(satH9[0], latArrsatH9, lonArrsatH9, title=f'全球气象雷达组合反射率分布图',saveDir="./plotGlobal", ty="radar",name = "")
+'''
+
 import datetime
 import numpy as np
 import matplotlib.pyplot as plt
@@ -89,16 +197,31 @@ def plotGlobalPlus(b, latArr1, lonArr1, cmap='summer', title='Global QPF Data Vi
     cmap = {
         "radar": cmp_hjnwtx["radar_nmc"],
         "pre": cmp_hjnwtx["pre_tqw"],
-        None: cmap
-    }.get(ty, cmap)
+        None: 'summer'
+    }.get(ty)
+
+    minmax = {
+        "radar": [0,80],
+        "pre": [0,20],
+        None: [np.nanmin(b),np.nanmax(b)]
+    }.get(ty)
+
+    setlabel = {
+        "radar": 'Composite Reflectivity (Radar)\nUnit: (dBZ)',
+        "pre": 'Precipitation\nUnit: (mm)',
+        None: 'Data'
+    }.get(ty)
+
     img = ax.pcolormesh(lon_grid[::stride, ::stride], 
                        lat_grid[::stride, ::stride],
                        b[::stride, ::stride],
                        cmap=cmap,  
                        shading='auto',
+                       vmin = minmax[0],
+                       vmax = minmax[1],
                        transform=ccrs.PlateCarree())
     cbar = plt.colorbar(img, ax=ax, orientation='vertical', pad=0.05, shrink=0.6)
-    cbar.set_label('Value Scale', fontsize=12)
+    cbar.set_label(setlabel , fontsize=12)
     ax.set_xticks(np.arange(-180, 181, 30), crs=ccrs.PlateCarree())
     ax.set_yticks(np.arange(-90, 91, 15), crs=ccrs.PlateCarree())
     ax.xaxis.set_major_formatter(LongitudeFormatter(zero_direction_label=True))
@@ -113,6 +236,7 @@ def plotGlobalPlus(b, latArr1, lonArr1, cmap='summer', title='Global QPF Data Vi
     plt.close()    
     print(f"图像已保存到: {save_path}")
     return save_path
+    
 """
 if __name__ == "__main__":
     plotGlobal(
@@ -126,6 +250,7 @@ if __name__ == "__main__":
               )
 """
 
+
 import ssl
 import urllib.request
 ssl._create_default_https_context = ssl._create_unverified_context
@@ -240,10 +365,10 @@ def plotBorder(UTCstr, nclon, nclat, cr, fig_title,savepath="./plotBorder", data
     cb.set_ticklabels([str(level) for level in clevels[:-1]], fontproperties=myfont)
     for label in ax.get_xticklabels() + ax.get_yticklabels():
         label.set_fontproperties(myfont)
-    mkDir(figpath)
     plt.savefig(figpath, dpi=300, bbox_inches='tight') 
     print(f"{fig_title.split('_')[0]}绘制完成: {figpath}")
     plt.close()
+
 """
 latArr = np.linspace(27, -13, 2000 )
 lonArr = np.linspace(70, 150, 4000) 
@@ -322,48 +447,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.216 → shancx-1.9.33.220}/shancx/Read.py

@@ -55,18 +55,4 @@ if __name__ == "__main__":
         lonArr = lonMat[0]
         """    
 
-import numpy as np
-from pathlib import Path
-def npsavez(output, data):
-    output = output.replace('.npy', '.npz')
-    output_path = Path(output).with_suffix('.npz')
-    output_path.parent.mkdir(parents=True, exist_ok=True)
-    np.savez_compressed(output_path, data=data)
-    print(f"{output_path} done")
-def nploadz(output_path):
-    return np.load(Path(output_path).with_suffix('.npz'))['data']
-
-"""
-savez(output, data)
-nploadz(output_path)
-"""
+ 

shancx-1.9.33.220/shancx/npz.py

@@ -0,0 +1,15 @@
+import numpy as np
+from pathlib import Path
+def npzSave(output, data):
+    output = output.replace('.npy', '.npz')
+    output_path = Path(output).with_suffix('.npz')
+    output_path.parent.mkdir(parents=True, exist_ok=True)
+    np.savez_compressed(output_path, data=data)
+    print(f"{output_path} done")
+def npzLoad(output_path):
+    return np.load(Path(output_path).with_suffix('.npz'))['data']
+
+"""
+npzSave(output, data)
+npzLoad(output_path)
+"""

{shancx-1.9.33.216 → shancx-1.9.33.220}/shancx.egg-info/PKG-INFO

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

{shancx-1.9.33.216 → shancx-1.9.33.220}/shancx.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ shancx/geosProj.py
 shancx/getResponse.py
 shancx/info.py
 shancx/netdfJU.py
+shancx/npz.py
 shancx/sendM.py
 shancx/wait.py
 shancx.egg-info/PKG-INFO