From a7cca6dec7f40eaf680911f2a256233c4d44a504 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 16 三月 2023 15:23:55 +0800
Subject: [PATCH] 1
---
ExportMap/cs/XYZUtils.cs | 23 ++++++++++++-----------
ExportMap/Sources/xyz.py | 3 ++-
ExportMap/Sources/说明.txt | 2 +-
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/ExportMap/Sources/xyz.py b/ExportMap/Sources/xyz.py
index 916f442..571e56d 100644
--- a/ExportMap/Sources/xyz.py
+++ b/ExportMap/Sources/xyz.py
@@ -31,7 +31,7 @@
parser.add_argument("-file", type=str, default=r"D:\xyz\zy.txt", required=False)
parser.add_argument("-out", type=str, default=r"D:\xyz\tiles\zy", 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("-max", type=int, default=15, required=False)
return parser.parse_args()
@@ -158,6 +158,7 @@
args = get_args()
prj = QgsProject.instance()
prj.read(os.path.join(args.src, args.qgz))
+ # prj.read(args.qgz)
print("FileName: " + prj.fileName())
loadLayers(prj, args)
diff --git "a/ExportMap/Sources/\350\257\264\346\230\216.txt" "b/ExportMap/Sources/\350\257\264\346\230\216.txt"
index f104e97..70fc9fe 100644
--- "a/ExportMap/Sources/\350\257\264\346\230\216.txt"
+++ "b/ExportMap/Sources/\350\257\264\346\230\216.txt"
@@ -38,7 +38,7 @@
================================================================================ 鎵ц
C:\Program Files\QGIS 3.16\bin
-C:\Program Files\QGIS 3.16\apps\Python37
+cd C:\Program Files\QGIS 3.16\apps\Python37
"C:\Program Files\QGIS 3.16\bin\python-qgis-ltr.bat"
"C:\Program Files\QGIS 3.16\bin\qgis_process-qgis-ltr.bat"
pip install Pyinstaller
diff --git a/ExportMap/cs/XYZUtils.cs b/ExportMap/cs/XYZUtils.cs
index 665740f..f2de7c3 100644
--- a/ExportMap/cs/XYZUtils.cs
+++ b/ExportMap/cs/XYZUtils.cs
@@ -61,16 +61,16 @@
string cmd = string.Format("python \"{0}\" -qgz {1} -file \"{2}\" -out \"{3}\" -min {4} -max {5}", PyFile, Qgz, tifFile, xyzPath, args.min, args.max);
- string pyText = File.ReadAllText(PyFile);
- pyText = pyText
- //.Replace("xyz.qgz", Path.Combine(ExportUtil.SourcesPath, "xyz.qgz"))
- .Replace("D:\\xyz\\zy.txt", tifFile)
- .Replace("D:\\xyz\\tiles\\zy", xyzPath)
- .Replace("=12,", "=" + args.min + ",")
- .Replace("=18,", "=" + args.max + ",");
+ //string pyText = File.ReadAllText(PyFile);
+ //pyText = pyText
+ // .Replace(@"E:\terrait\TianJin\ExportMap\ExportMap\Sources\xyz.qgz", Qgz)
+ // .Replace(@"D:\xyz\zy.txt", tifFile)
+ // .Replace(@"D:\xyz\tiles\zy", xyzPath)
+ // .Replace("=12,", "=" + args.min + ",")
+ // .Replace("=15,", "=" + args.max + ",");
- string newPy = tifFile.Replace(".txt", ".py").Replace("\\", "\\\\");
- File.WriteAllText(newPy, pyText);
+ //string newPy = tifFile.Replace(".txt", ".py").Replace("\\", "\\\\");
+ //File.WriteAllText(newPy, pyText);
//string cmd = string.Format("exec(open('{0}', 'r', encoding='utf-8').read()) & exit()", newPy);
@@ -138,8 +138,9 @@
LogOut.Info("cmd = " + cmd);
si.AutoFlush = true;
- //si.WriteLine("cd \"C:\\Program Files\\QGIS 3.16\\apps\\Python37\"");
- si.WriteLine("\"C:\\Program Files\\QGIS 3.16\\bin\\python-qgis-ltr.bat\"");
+ si.WriteLine("cd \"C:\\Program Files\\QGIS 3.16\\apps\\Python37\"");
+ si.WriteLine("\"C:\\Program Files\\QGIS 3.16\\bin\\qgis_process-qgis-ltr.bat\"");
+ //si.WriteLine("\"C:\\Program Files\\QGIS 3.16\\bin\\python-qgis-ltr.bat\"");
//si.WriteLine("exit()");
si.WriteLine(cmd);
si.WriteLine("exit");
--
Gitblit v1.9.3