From b93b3a846468f0031a49d7689b645b894268f787 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 21 十二月 2022 17:53:53 +0800
Subject: [PATCH] 1
---
ExportMap/cs/ExportUtil.cs | 2 +-
JavaCode/SysTemplate/Mapper.java | 2 +-
ExportMap/Sources/render.py | 4 ++--
ExportMap/Sources/LF.qpt | 22 ++++++++++++----------
4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/ExportMap/Sources/LF.qpt b/ExportMap/Sources/LF.qpt
index 8cdf107..18dc13e 100644
--- a/ExportMap/Sources/LF.qpt
+++ b/ExportMap/Sources/LF.qpt
@@ -1,4 +1,4 @@
-<Layout name="LF" units="mm" printResolution="300" worldFileMap="{4e649c5d-cabe-431f-a385-d69809d87ebf}">
+<Layout name="LF" units="mm" printResolution="{dpi}" worldFileMap="{4e649c5d-cabe-431f-a385-d69809d87ebf}">
<Snapper snapToGuides="1" tolerance="5" snapToItems="1" snapToGrid="0"/>
<Grid offsetY="0" offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10"/>
<PageCollection>
@@ -76,7 +76,7 @@
<customproperties/>
</LayoutObject>
</LayoutItem>
- <LayoutItem opacity="1" size="76.0244,9.39831,mm" labelText="涓浗鐭虫补澶╃劧姘旂閬撳伐绋嬫湁闄愬叕鍙�" templateUuid="{13528ba9-5ea4-45e3-b56e-a975eb046d54}" referencePoint="0" frameJoinStyle="miter" position="212.337,195.29,mm" halign="4" positionLock="false" blendMode="0" background="false" uuid="{13528ba9-5ea4-45e3-b56e-a975eb046d54}" marginY="0" outlineWidthM="0.3,mm" positionOnPage="212.337,195.29,mm" visibility="1" marginX="0" itemRotation="0" type="65641" id="鍏徃" groupUuid="" zValue="8" htmlState="0" excludeFromExports="0" frame="false" valign="128">
+ <LayoutItem opacity="1" size="76.0244,9.39831,mm" labelText="涓浗 x x x x x x x 宸ョ▼鏈夐檺鍏徃" templateUuid="{13528ba9-5ea4-45e3-b56e-a975eb046d54}" referencePoint="0" frameJoinStyle="miter" position="212.337,195.29,mm" halign="4" positionLock="false" blendMode="0" background="false" uuid="{13528ba9-5ea4-45e3-b56e-a975eb046d54}" marginY="0" outlineWidthM="0.3,mm" positionOnPage="212.337,195.29,mm" visibility="1" marginX="0" itemRotation="0" type="65641" id="鍏徃" groupUuid="" zValue="8" htmlState="0" excludeFromExports="0" frame="false" valign="128">
<FrameColor green="0" red="0" alpha="255" blue="0"/>
<BackgroundColor green="255" red="255" alpha="255" blue="255"/>
<LayoutObject>
@@ -92,7 +92,7 @@
<LabelFont description="瀹嬩綋,14,-1,5,50,0,0,0,0,0,甯歌" style="甯歌"/>
<FontColor green="0" red="0" alpha="255" blue="0"/>
</LayoutItem>
- <LayoutItem opacity="1" size="11.6809,10.7409,mm" mode="1" pictureRotation="0" northMode="0" templateUuid="{29298722-a58a-42f7-85d1-04564ad9366d}" anchorPoint="0" referencePoint="0" frameJoinStyle="miter" position="200.5,194.948,mm" svgBorderColor="0,0,0,255" northOffset="0" svgFillColor="255,255,255,255" positionLock="true" blendMode="0" background="false" uuid="{29298722-a58a-42f7-85d1-04564ad9366d}" outlineWidthM="0.3,mm" positionOnPage="200.5,194.948,mm" visibility="1" pictureWidth="11.4207" itemRotation="0" type="65640" id="Logo" svgBorderWidth="0.2" mapUuid="" resizeMode="0" groupUuid="" zValue="7" excludeFromExports="0" file="./logo.png" frame="false" pictureHeight="10.7409">
+ <LayoutItem opacity="1" size="11.6809,10.7409,mm" mode="1" pictureRotation="0" northMode="0" templateUuid="{29298722-a58a-42f7-85d1-04564ad9366d}" anchorPoint="0" referencePoint="0" frameJoinStyle="miter" position="200.5,194.948,mm" svgBorderColor="0,0,0,255" northOffset="0" svgFillColor="255,255,255,255" positionLock="true" blendMode="0" background="false" uuid="{29298722-a58a-42f7-85d1-04564ad9366d}" outlineWidthM="0.3,mm" positionOnPage="200.5,194.948,mm" visibility="1" pictureWidth="11.4207" itemRotation="0" type="65640" id="Logo" svgBorderWidth="0.2" mapUuid="" resizeMode="0" groupUuid="" zValue="7" excludeFromExports="0" file="{sourcesPath}\logo.png" frame="false" pictureHeight="10.7409">
<FrameColor green="0" red="0" alpha="255" blue="0"/>
<BackgroundColor green="255" red="255" alpha="255" blue="255"/>
<LayoutObject>
@@ -120,7 +120,7 @@
<customproperties/>
</LayoutObject>
</LayoutItem>
- <LayoutItem opacity="1" size="129.364,11.1743,mm" labelText="绠￠亾鍩虹澶ф暟鎹钩鍙帮紙DW1-1锛�" templateUuid="{81ccb104-2767-491d-8296-cd4ccbebed3e}" referencePoint="0" frameJoinStyle="miter" position="84.816,2.42978,mm" halign="4" positionLock="true" blendMode="0" background="false" uuid="{81ccb104-2767-491d-8296-cd4ccbebed3e}" marginY="0" outlineWidthM="0.3,mm" positionOnPage="84.816,2.42978,mm" visibility="1" marginX="0" itemRotation="0" type="65641" id="鏍囬" groupUuid="" zValue="4" htmlState="0" excludeFromExports="0" frame="false" valign="128">
+ <LayoutItem opacity="1" size="129.364,11.1743,mm" labelText="{title}" templateUuid="{81ccb104-2767-491d-8296-cd4ccbebed3e}" referencePoint="0" frameJoinStyle="miter" position="84.816,2.42978,mm" halign="4" positionLock="true" blendMode="0" background="false" uuid="{81ccb104-2767-491d-8296-cd4ccbebed3e}" marginY="0" outlineWidthM="0.3,mm" positionOnPage="84.816,2.42978,mm" visibility="1" marginX="0" itemRotation="0" type="65641" id="鏍囬" groupUuid="" zValue="4" htmlState="0" excludeFromExports="0" frame="false" valign="128">
<FrameColor green="0" red="0" alpha="255" blue="0"/>
<BackgroundColor green="255" red="255" alpha="255" blue="255"/>
<LayoutObject>
@@ -237,7 +237,7 @@
</custom-order>
</layer-tree-group>
</LayoutItem>
- <LayoutItem opacity="1" size="280,174,mm" mapRotation="0" followPreset="false" templateUuid="{4e649c5d-cabe-431f-a385-d69809d87ebf}" mapFlags="0" referencePoint="0" keepLayerSet="false" isTemporal="0" frameJoinStyle="round" position="9,18,mm" drawCanvasItems="false" positionLock="true" blendMode="0" background="true" uuid="{4e649c5d-cabe-431f-a385-d69809d87ebf}" outlineWidthM="4,px" positionOnPage="9,18,mm" labelMargin="0,mm" visibility="1" itemRotation="0" type="65639" id="鍦板浘" groupUuid="" followPresetName="" zValue="2" excludeFromExports="0" frame="true">
+ <LayoutItem opacity="1" size="280,174,mm" mapRotation="{rotation}" followPreset="false" templateUuid="{4e649c5d-cabe-431f-a385-d69809d87ebf}" mapFlags="0" referencePoint="0" keepLayerSet="false" isTemporal="0" frameJoinStyle="round" position="9,18,mm" drawCanvasItems="false" positionLock="true" blendMode="0" background="true" uuid="{4e649c5d-cabe-431f-a385-d69809d87ebf}" outlineWidthM="4,px" positionOnPage="9,18,mm" labelMargin="0,mm" visibility="1" itemRotation="0" type="65639" id="鍦板浘" groupUuid="" followPresetName="" zValue="2" excludeFromExports="0" frame="true">
<FrameColor green="0" red="0" alpha="255" blue="0"/>
<BackgroundColor green="255" red="255" alpha="255" blue="255"/>
<LayoutObject>
@@ -250,7 +250,7 @@
</dataDefinedProperties>
<customproperties/>
</LayoutObject>
- <Extent ymax="64.11233836183852475" xmin="59.05829972526095162" ymin="9.57730491702214692" xmax="146.81582480887351494"/>
+ <Extent xmin="{xmin}" ymin="{ymin}" ymax="{ymax}" xmax="{xmax}"/>
<crs>
<spatialrefsys>
<wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -546,7 +546,7 @@
</Option>
<Option type="Map">
<Option name="background" type="color" value=""/>
- <Option name="content" type="QString" value="娌冲寳鐪�"/>
+ <Option name="content" type="QString" value="{province}"/>
<Option name="foreground" type="color" value=""/>
<Option name="halign" type="int" value="1"/>
<Option name="valign" type="int" value="128"/>
@@ -562,7 +562,7 @@
</Option>
<Option type="Map">
<Option name="background" type="color" value=""/>
- <Option name="content" type="QString" value="1锛�25涓�"/>
+ <Option name="content" type="QString" value="{scale}"/>
<Option name="foreground" type="color" value=""/>
<Option name="halign" type="int" value="1"/>
<Option name="valign" type="int" value="128"/>
@@ -578,7 +578,7 @@
</Option>
<Option type="Map">
<Option name="background" type="color" value=""/>
- <Option name="content" type="QString" value="20绫�"/>
+ <Option name="content" type="QString" value="{resolution}"/>
<Option name="foreground" type="color" value=""/>
<Option name="halign" type="int" value="0"/>
<Option name="valign" type="int" value="0"/>
@@ -594,7 +594,7 @@
</Option>
<Option type="Map">
<Option name="background" type="color" value=""/>
- <Option name="content" type="QString" value="2022.11.06"/>
+ <Option name="content" type="QString" value="{date}"/>
<Option name="foreground" type="color" value=""/>
<Option name="halign" type="int" value="0"/>
<Option name="valign" type="int" value="0"/>
@@ -622,6 +622,8 @@
<property value="0" key="imageCropMarginTop"/>
<property value="false" key="imageCropToContents"/>
<property value="true" key="singleFile"/>
+ <property key="layers" value="{layers}"/>
+ <property key="imgPath" value="{imgPath}"/>
</customproperties>
<Atlas coverageLayer="" filterFeatures="0" hideCoverage="0" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="0" pageNameExpression="" enabled="0"/>
</Layout>
diff --git a/ExportMap/Sources/render.py b/ExportMap/Sources/render.py
index 1c4da43..42ddb9f 100644
--- a/ExportMap/Sources/render.py
+++ b/ExportMap/Sources/render.py
@@ -22,8 +22,8 @@
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="Test.qgz", required=False)
- parser.add_argument("-qpt", type=str, default="Test.qpt", required=False)
+ parser.add_argument("-qgz", type=str, default="LF.qgz", required=False)
+ parser.add_argument("-qpt", type=str, default="LF.qpt", required=False)
return parser.parse_args()
diff --git a/ExportMap/cs/ExportUtil.cs b/ExportMap/cs/ExportUtil.cs
index 4a50d88..02f82a8 100644
--- a/ExportMap/cs/ExportUtil.cs
+++ b/ExportMap/cs/ExportUtil.cs
@@ -229,6 +229,7 @@
xml = xml
.Replace("{dpi}", args.dpi.ToString())
.Replace("{title}", args.title)
+ .Replace("{sourcesPath}", SourcesPath)
.Replace("{rotation}", args.rotation.ToString())
.Replace("{xmin}", args.xmin.ToString())
.Replace("{ymin}", args.ymin.ToString())
@@ -239,7 +240,6 @@
.Replace("{resolution}", args.resolution)
.Replace("{date}", args.date)
.Replace("{layers}", args.layers)
- .Replace("{sourcesPath}", SourcesPath)
.Replace("{imgPath}", imgPath);
File.WriteAllText(qptFile, xml);
diff --git a/JavaCode/SysTemplate/Mapper.java b/JavaCode/SysTemplate/Mapper.java
index 480f765..33c4f89 100644
--- a/JavaCode/SysTemplate/Mapper.java
+++ b/JavaCode/SysTemplate/Mapper.java
@@ -25,7 +25,7 @@
* 鍒嗛〉鏌ヨ
*
* @param {colName} {colBak}
- * @param limit 璁板綍琛�
+ * @param limit 璁板綍鏁�
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
--
Gitblit v1.9.3