From 595751a3c37eff44b7608898101a54b1174f02ee Mon Sep 17 00:00:00 2001
From: chenzenghui <3045316072@qq.com>
Date: Mon, 22 Sep 2025 17:28:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9B=AE=E6=A0=87=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/SpacetySliceDataTools.iml                  |  2 +-
 .idea/misc.xml                                   |  2 +-
 .idea/vcs.xml                                    |  6 ++++++
 .../PredictProcessRaster_AC.py                   | 16 ++++++++--------
 .../SplitShipPortRasterTools_AC.py               |  4 ++--
 5 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/SpacetySliceDataTools.iml b/.idea/SpacetySliceDataTools.iml
index 00c1037..920c0be 100644
--- a/.idea/SpacetySliceDataTools.iml
+++ b/.idea/SpacetySliceDataTools.iml
@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.9" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="spacetySliceEnv" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6cc7a06..c93279a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
   <component name="Black">
     <option name="sdkName" value="spacetySliceEnv" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="spacetySliceEnv" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/generatorRasterSlicesTools/PredictProcessRaster_AC.py b/generatorRasterSlicesTools/PredictProcessRaster_AC.py
index 3f360a1..247b8e7 100644
--- a/generatorRasterSlicesTools/PredictProcessRaster_AC.py
+++ b/generatorRasterSlicesTools/PredictProcessRaster_AC.py
@@ -64,7 +64,7 @@ def preProcessTiFF(tiffpath,txtpath,preFolderPath):
 
 def processMJPort(srcFolderPath,outMJPortSumTxtPath,outMJPortFolderPath,MLCShapeFilePath,JLCShapeFilePath,MJLCShapeFilePath):
     programpath = r"R:\TYSAR-德清院\A-预处理-未标注\A0-算法版本\AA\SpacetySliceDataTools\generatorRasterSlicesTools\SplitShipPortRasterTools_AC.py"
-    cmdtxt=r"{} {} -s {} -o {} -f {} -m {} -j {} --jmlc {}".format(
+    cmdtxt=r"{} {} -s {} -o {} -f {} -m {} -j {} -jm {}".format(
         spacetySliceEnvPathExEPath,programpath,
         srcFolderPath,outMJPortSumTxtPath,outMJPortFolderPath,
         MLCShapeFilePath, JLCShapeFilePath, MJLCShapeFilePath
@@ -146,13 +146,13 @@ def preProcessShipPortTools(srcFolderPath,targetFolderPath,outTargetFolderPath):
         pass
 
     writeoutlog(logPath, "\nprocess finished \n")
-    moverTip,moveflag=moveDir(targetFolderPath, outTargetFolderPath)
-    writeoutlog(logPath, moverTip)
+    # moverTip,moveflag=moveDir(targetFolderPath, outTargetFolderPath)
+    # writeoutlog(logPath, moverTip)
     writeoutlog(logPath, "====================================================================================\n")
-    if moveflag:
-        pass
-    else:
-        exit(3)
+    # if moveflag:
+    #     pass
+    # else:
+    #     exit(3)
 
 
 if __name__ == '__main__':
@@ -173,7 +173,7 @@ if __name__ == '__main__':
     srcFolderPath = r"R:\TYSAR-德清院\TYSAR-条带模式(SM)\港口\20250826-不分类\0-原图"
     preFolderPath = r"D:\TYSAR-德清院\TYSAR-条带模式(SM)\港口\20250826-不分类\A-预处理\AB-图像预处理"
     targetfolderPath = r"R:\TYSAR-德清院\TYSAR-条带模式(SM)\港口\20250826-不分类\A-预处理\AB-图像预处理"
-    preProcessShipPortTools(srcFolderPath, preFolderPath, targetfolderPath,logPath)
+    preProcessShipPortTools(srcFolderPath, preFolderPath, targetfolderPath)
 
 
 
diff --git a/generatorRasterSlicesTools/SplitShipPortRasterTools_AC.py b/generatorRasterSlicesTools/SplitShipPortRasterTools_AC.py
index 07f6146..54e0bcf 100644
--- a/generatorRasterSlicesTools/SplitShipPortRasterTools_AC.py
+++ b/generatorRasterSlicesTools/SplitShipPortRasterTools_AC.py
@@ -270,7 +270,7 @@ def getParams():
     parser.add_argument('-f', '--folderOutpath',type=str,help=r'PortfolderOutpath', default=r'D:\TYSAR-德清院\TYSAR-条带模式(SM)\港口\20250903-不分类\A-预处理\PortPoints')
     parser.add_argument('-m', '--mLC',type=str,help=r'MLC', default=r'D:\TYSAR-德清院\目标点位信息更新\0828目标点位\港口（民船）.shp')
     parser.add_argument('-j', '--jLC',type=str,help=r'JLC' ,default=r'D:\TYSAR-德清院\目标点位信息更新\0828目标点位\军港.shp')
-    parser.add_argument('-jm', '--jmlc',type=str,help=r'MJLC', default=r'D:\TYSAR-德清院\目标点位信息更新\0828目标点位\军民一体港口.shp')
+    parser.add_argument('-jm', '--jmlc',type=str,help=r'JMLC', default=r'D:\TYSAR-德清院\目标点位信息更新\0828目标点位\军民一体港口.shp')
     args = parser.parse_args()
     return args
 
@@ -282,7 +282,7 @@ if __name__ == '__main__':
         folderOutpath=parser.folderOutpath
         mLCPath=parser.mLC
         jLCPath=parser.jLC
-        jmLCPath=parser.jmLC
+        jmLCPath=parser.jmlc
         print('srcfolder=',srcfolder)
         print('outfile=',outfilepath)
         print('outfolder=',folderOutpath)