From ced7c4ad08456544e9807907d21683f3ceeff0dc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 03 八月 2023 14:29:11 +0800
Subject: [PATCH] 1
---
ExportMap/cs/ExportUtil.cs | 2 +-
ExportMap/cs/TBUtils.cs | 4 ++--
ExportMap/cs/XYZUtils.cs | 2 +-
ExportMap/cs/OsgbUtils.cs | 2 +-
ExportMap/cs/TerraUtils.cs | 4 ++--
ExportMap/cs/LasUtils.cs | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ExportMap/cs/ExportUtil.cs b/ExportMap/cs/ExportUtil.cs
index 6b251d3..00c7851 100644
--- a/ExportMap/cs/ExportUtil.cs
+++ b/ExportMap/cs/ExportUtil.cs
@@ -142,7 +142,7 @@
CreateTemplate(args);
string cmd = string.Format("python \"{0}\" -qgz {1} -qpt {2}", PyFile, qgz, args.qpt);
- err = Tools.ExecCmd(cmd, true, true);
+ err = Tools.ExecCmd(null, cmd, true, true);
string qptFile = Path.Combine(SourcesPath, args.qpt);
if (File.Exists(qptFile)) File.Delete(qptFile);
diff --git a/ExportMap/cs/LasUtils.cs b/ExportMap/cs/LasUtils.cs
index d4e24cf..ca67a49 100644
--- a/ExportMap/cs/LasUtils.cs
+++ b/ExportMap/cs/LasUtils.cs
@@ -57,7 +57,7 @@
int idx = args.ids.IndexOf(meta.id);
string cmd = string.Format("{0}\\gocesiumtiler.exe -i \"{1}\" -o \"{2}\" -e {3} -z {4} -g -s", tilerPath, lasPath, outPath, args.srids[idx], args.zs[idx]);
- err = Tools.ExecCmd(cmd, false, false);
+ err = Tools.ExecCmd(null, cmd, false, false);
string jsonFile = findTileset(meta, outPath);
if ("laz" == meta.type && File.Exists(lasPath)) File.Delete(lasPath);
@@ -88,7 +88,7 @@
string tilerPath = Tools.GetSetting("tilerPath");
string cmd = string.Format("{0}\\laszip64.exe -i \"{1}\" -o \"{2}\"", tilerPath, lazPath, lasPath);
- Tools.ExecCmd(cmd, false, false);
+ Tools.ExecCmd(new List<string> { cmd });
return lasPath;
}
diff --git a/ExportMap/cs/OsgbUtils.cs b/ExportMap/cs/OsgbUtils.cs
index 403b9b4..8f9c457 100644
--- a/ExportMap/cs/OsgbUtils.cs
+++ b/ExportMap/cs/OsgbUtils.cs
@@ -61,7 +61,7 @@
int idx = args.ids.IndexOf(meta.id);
string cmd = string.Format("{0}\\3dtile.exe -f osgb -i \"{1}\" -o \"{2}\" -c \"{{\\\"offset\\\": {3}}}\"", d3tilesPath, osgbPath, outPath, args.zs[idx]);
- err = Tools.ExecCmd(cmd, false, false);
+ err = Tools.ExecCmd(null, cmd, false, false);
err = null;
if (null != srs) writeSRS(osgbPath, srs);
diff --git a/ExportMap/cs/TBUtils.cs b/ExportMap/cs/TBUtils.cs
index fb4e4c9..08bfc42 100644
--- a/ExportMap/cs/TBUtils.cs
+++ b/ExportMap/cs/TBUtils.cs
@@ -64,7 +64,7 @@
string cmd = string.Format("\"C:\\Program Files\\Skyline\\TerraBuilder\\TerraBuilder.exe\" -script \"{0}\"", js); // -DisablePrint
ReloadTB();
- err = Tools.ExecCmd(cmd, false, false);
+ err = Tools.ExecCmd(new List<string> { cmd });
isBusy = false;
return File.Exists(MptPath) ? MoveMpt(MptPath, sourcePath) : null;
@@ -168,7 +168,7 @@
//list.Add("taskkill /f /t /im TBFuser.exe");
//list.Add("start /d \"C:\\Program Files\\Skyline\\TerraBuilder Fuser\" TBFuser.exe /b");
- Tools.ExecCmd(list, false);
+ Tools.ExecCmd(list);
}
/// <summary>
diff --git a/ExportMap/cs/TerraUtils.cs b/ExportMap/cs/TerraUtils.cs
index 607d622..edf04e9 100644
--- a/ExportMap/cs/TerraUtils.cs
+++ b/ExportMap/cs/TerraUtils.cs
@@ -174,7 +174,7 @@
}
string cmd = string.Format("python \"{0}\" -qgz {1} -file \"{2}\" -out \"{3}\"", PyFile, Qgz, txtFile, tifFile);
- err = Tools.ExecCmd(cmd, true, false);
+ err = Tools.ExecCmd(null, cmd, true, false);
return tifFile;
}
@@ -260,7 +260,7 @@
string createLayer = string.Format("{0}\\ctb-tile.exe -l -s {4} -o \"{1}\" -f Mesh \"{2}\\{3}.tif\"", ctbPath, dirPath, dirPath, args.dircode, maxLevel);
List<string> list = new List<string>() { gdal_data, createMesh, createLayer };
- err = Tools.ExecCmd(list);
+ err = Tools.ExecCmd(null, list);
}
/// <summary>
diff --git a/ExportMap/cs/XYZUtils.cs b/ExportMap/cs/XYZUtils.cs
index 0ccf314..f5cbc2d 100644
--- a/ExportMap/cs/XYZUtils.cs
+++ b/ExportMap/cs/XYZUtils.cs
@@ -96,7 +96,7 @@
string cmd = string.Format("python \"{0}\" -qgz {1} -file \"{2}\" -out \"{3}\" -min {4} -max {5} -noData {6}", PyFile, Qgz, tifFile, xyzPath, args.min, args.max, args.noData);
//err = Tools.ExecCmd(GetCmds(batFile, cmd));
- err = Tools.ExecCmd(cmd, true, false);
+ err = Tools.ExecCmd(null, cmd, true, false);
//if (File.Exists(batFile)) File.Delete(batFile);
if (File.Exists(tifFile)) File.Delete(tifFile);
--
Gitblit v1.9.3