From c4208a134f0d9a1e110688a31b5048e2bf5f4d96 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 21 四月 2023 18:37:08 +0800
Subject: [PATCH] 1

---
 ExportMap/Sources/xyz.py |   41 ++++++++++++++++-------------------------
 1 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/ExportMap/Sources/xyz.py b/ExportMap/Sources/xyz.py
index 1f62db5..d1ecb35 100644
--- a/ExportMap/Sources/xyz.py
+++ b/ExportMap/Sources/xyz.py
@@ -28,10 +28,10 @@
     parser = argparse.ArgumentParser(description='ArgUtils')
     parser.add_argument("-src", type=str, default=get_full_path(), required=False)
     parser.add_argument("-qgz", type=str, default=r"xyz.qgz", required=False)
-    parser.add_argument("-file", type=str, default=r"D:\xyz\china\tif.txt", required=False)
-    parser.add_argument("-out", type=str, default=r"D:\xyz\china\png", required=False)
-    parser.add_argument("-min", type=int, default=4, required=False)
-    parser.add_argument("-max", type=int, default=8, required=False)
+    parser.add_argument("-file", type=str, default=r"D:\xyz\dom0.2m\tif.txt", required=False)
+    parser.add_argument("-out", type=str, default=r"D:\xyz\dom0.2m\png", required=False)
+    parser.add_argument("-min", type=int, default=12, required=False)
+    parser.add_argument("-max", type=int, default=18, required=False)
     parser.add_argument("-noData", type=int, default=0, required=False)
 
     return parser.parse_args()
@@ -101,35 +101,26 @@
             min.transform(transform)
             max.transform(transform)
 
-            if min.x() < ex.xmin:
-                ex.xmin = min.x()
-            if min.y() < ex.ymin:
-                ex.ymin = min.y()
-            if max.x() > ex.xmax:
-                ex.xmax = max.x()
-            if max.y() > ex.ymax:
-                ex.ymax = max.y()
+            setRectBound(ex, min.x(), min.y(), max.x(), max.y())
 
         else:
-            if rect.xMinimum() < ex.xmin:
-                ex.xmin = rect.xMinimum()
-            if rect.yMinimum() < ex.ymin:
-                ex.ymin = rect.yMinimum()
-            if rect.xMaximum() > ex.xmax:
-                ex.xmax = rect.xMaximum()
-            if rect.yMaximum() > ex.ymax:
-                ex.ymax = rect.yMaximum()
+            setRectBound(ex, rect.xMinimum(), rect.yMinimum(), rect.xMaximum(), rect.yMaximum())
 
     # -3640.3675,1734588.1947,2434663.1477,3677421.7047 [EPSG:32643]
     # 123543.6722,2730986.0671,2732253.9315,3552923.0518 [EPSG:32643]
     return str(ex.xmin) + "," + str(ex.xmax) + "," + str(ex.ymin) + "," + str(ex.ymax) + ' [' + args.authid + "]"
 
 
-# 鑾峰彇鍧愭爣鐐�
-def setNewRect(ex, xmin, ymin, xmax, ymax):
-    p = QgsPoint(x, y)
-
-    return p
+# 璁剧疆鐭╁舰杈圭晫
+def setRectBound(ex, xmin, ymin, xmax, ymax):
+    if xmin < ex.xmin:
+        ex.xmin = xmin
+    if ymin < ex.ymin:
+        ex.ymin = ymin
+    if xmax > ex.xmax:
+        ex.xmax = xmax
+    if ymax > ex.ymax:
+        ex.ymax = ymax
 
 
 def getExtent2(prj, args):

--
Gitblit v1.9.3