From ebbda8b35efa2193155704dd71edf133d2abd90d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 15 三月 2023 19:04:05 +0800
Subject: [PATCH] 1
---
ExportMap/cs/XYZUtils.cs | 8 ++++++--
ExportMap/cs/Tool.cs | 6 +++++-
ExportMap/Sources/xyz.py | 10 +++++-----
ExportMap/Sources/说明.txt | 3 +++
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/ExportMap/Sources/xyz.py b/ExportMap/Sources/xyz.py
index e237eab..916f442 100644
--- a/ExportMap/Sources/xyz.py
+++ b/ExportMap/Sources/xyz.py
@@ -27,10 +27,10 @@
print("argv = ", sys.argv[1:])
parser = argparse.ArgumentParser(description='ArgUtils')
parser.add_argument("-src", type=str, default=get_full_path(), required=False)
- parser.add_argument("-qgz", type=str, default="xyz.qgz", required=False)
- parser.add_argument("-file", type=str, default=r"D:\xyz\dq.txt", required=False)
- parser.add_argument("-out", type=str, default=r"D:\xyz\tiles\dq", required=False)
- parser.add_argument("-min", type=int, default=4, required=False)
+ parser.add_argument("-qgz", type=str, default=r"xyz.qgz", required=False)
+ 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)
return parser.parse_args()
@@ -161,7 +161,7 @@
print("FileName: " + prj.fileName())
loadLayers(prj, args)
- prj.write(args.file.replace(".txt", ".qgz"))
+ # prj.write(args.file.replace(".txt", ".qgz"))
args.ext = getExtent(prj)
createXYZ(args)
diff --git "a/ExportMap/Sources/\350\257\264\346\230\216.txt" "b/ExportMap/Sources/\350\257\264\346\230\216.txt"
index 5390377..d50e277 100644
--- "a/ExportMap/Sources/\350\257\264\346\230\216.txt"
+++ "b/ExportMap/Sources/\350\257\264\346\230\216.txt"
@@ -33,6 +33,9 @@
>>> import qgis.core
================================================================================ 鎵ц
+C:\Program Files\QGIS 3.16\bin
+C:\Program Files\QGIS 3.16\apps\Python37
+
C:\Program Files\QGIS 3.16\apps\qgis-ltr\python\plugins\processing\algs\qgis\TilesXYZ.py
"C:\Program Files\QGIS 3.16\bin\qgis_process-qgis-ltr.bat"
qgis_process.exe help qgis:tilesxyzdirectory
diff --git a/ExportMap/cs/Tool.cs b/ExportMap/cs/Tool.cs
index e3da3fe..bb84810 100644
--- a/ExportMap/cs/Tool.cs
+++ b/ExportMap/cs/Tool.cs
@@ -178,7 +178,11 @@
LogOut.Info("cmd = " + cmd);
si.AutoFlush = true;
- if (isPy) si.WriteLine("\"C:\\Program Files\\QGIS 3.16\\bin\\qgis_process-qgis-ltr.bat\""); // python-qgis-ltr.bat
+ if (isPy)
+ {
+ 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\""); // python-qgis-ltr.bat
+ }
si.WriteLine(cmd);
si.WriteLine("exit");
diff --git a/ExportMap/cs/XYZUtils.cs b/ExportMap/cs/XYZUtils.cs
index e0816c4..1d859e5 100644
--- a/ExportMap/cs/XYZUtils.cs
+++ b/ExportMap/cs/XYZUtils.cs
@@ -36,6 +36,7 @@
{
get
{
+ //return Path.Combine(ExportUtil.SourcesPath, "xyz.qgz");
return "xyz.qgz";
}
}
@@ -62,7 +63,9 @@
if (File.Exists(tifFile)) File.Delete(tifFile);
- return args.id;
+ string viewFile = Path.Combine(xyzPath, "view.html");
+
+ return File.Exists(viewFile) ? args.id : 0;
}
/// <summary>
@@ -87,7 +90,8 @@
List<string> files = new List<string>();
foreach (SysMeta meta in list)
{
- files.Add(Path.Combine(uploadFolder, meta.path));
+ string filePath = Path.Combine(uploadFolder, meta.path);
+ if (File.Exists(filePath)) files.Add(filePath);
}
string str = string.Join("\n", files);
--
Gitblit v1.9.3