粗糙度的BaseTool替换

surfaceRoughness_oh2004/SoilMoistureMain.py

@@ -313,6 +313,12 @@ class MoistureMain:
         out_path1 = os.path.join(tem_folder, "trans_geo_projcs.tif")
         out_path2 = os.path.join(tem_folder, "trans_projcs_geo.tif")
         par_dict = CreateDict(image_path, self.processinfo, out_path1, out_path2).calu_nature(start)
+
+        # TODO:从原始文件的xml中获取得到方位角信息 SurfaceRoughness\Temporary\preprocessing\影像名\ 文件夹下 -ortho.meta.xml
+        Azimuth=self.__processing_paras['META']
+        par_dict.update({"imageinfo_SatelliteAzimuth": "None"})
+
+
         model_xml_path = os.path.join(tem_folder, "creat_standard.meta.xml")  # 输出xml路径
 
         id_min = 0

surfaceRoughness_oh2004/SurfaceRoughness.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <Root>
   <TaskID>CSAR_202107275419_0001-0</TaskID>
-  <WorkSpace>D:\micro\WorkSpace\</WorkSpace>
+  <WorkSpace>K:\mircoData\OutTest\</WorkSpace>
   <AlgCompt>
     <DataTransModel>File</DataTransModel>
     <Artificial>ElementAlg</Artificial>
@@ -38,7 +38,7 @@
         <ParaType>File</ParaType>
         <DataType>tar.gz</DataType>
 		<ParaSource>Man</ParaSource>
-		<ParaValue>E:\MicroWorkspace\Micro\neimenggu\GF3_MDJ_QPSI_031847_E116.4_N43.9_20220828_L1A_AHV_L10006708819-ortho.tar.gz</ParaValue>
+		<ParaValue>K:\mircoData\surfaceRoughnessData\GF3_MDJ_QPSI_031847_E116.4_N43.9_20220828_L1A_AHV_L10006708819-ortho.tar.gz</ParaValue>
         <EnModification>True</EnModification> 
         <EnMultipleChoice>False</EnMultipleChoice> 
         <Control>File</Control> 
@@ -68,7 +68,7 @@
         <ParaType>File</ParaType>
         <DataType>tif</DataType>
 		<ParaSource>Man</ParaSource>
-		<ParaValue>E:\MicroWorkspace\Micro\neimenggu\N50_40_2020LC030_geo.tif</ParaValue>
+		<ParaValue>K:\mircoData\surfaceRoughnessData\N50_40_2020LC030_geo.tif</ParaValue>
         <EnModification>True</EnModification> 
         <EnMultipleChoice>False</EnMultipleChoice> 
         <Control>File</Control> 
@@ -98,7 +98,7 @@
         <ParaType>File</ParaType>
         <DataType>tif</DataType>
 		<ParaSource>Man</ParaSource>
-		<ParaValue>E:\MicroWorkspace\Micro\neimenggu\L9NDVI.tif</ParaValue>
+		<ParaValue>K:\mircoData\surfaceRoughnessData\L9NDVI.tif</ParaValue>
         <EnModification>True</EnModification> 
         <EnMultipleChoice>False</EnMultipleChoice> 
         <Control>File</Control> 
@@ -130,7 +130,7 @@
         <ParaType>File</ParaType>
         <DataType>tar.gz</DataType>
 		<ParaSource>Man</ParaSource>
-        <ParaValue>D:\micro\WorkSpace\SurfaceRoughness\Output\SurfaceRoughnessProduct.tar.gz</ParaValue>
+        <ParaValue>K:\mircoData\OutTest\SurfaceRoughness\Output\SurfaceRoughnessProduct.tar.gz</ParaValue>
       </Parameter>
     </Outputs>
   </AlgCompt>

surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.exe.recipe

@@ -2,7 +2,7 @@
 <Project>
   <ProjectOutputs>
     <ProjectOutput>
-      <FullPath>D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\SIMOrthoProgram.exe</FullPath>
+      <FullPath>D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\SIMOrthoProgram.exe</FullPath>
     </ProjectOutput>
   </ProjectOutputs>
   <ContentFiles />

surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/SIMOrthoProgram.lastbuildstate

@@ -1,2 +1,2 @@
-PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.33.31629:TargetPlatformVersion=10.0.19041.0:VcpkgTriplet=x64-windows:
-Release|x64|D:\MicroSAR\C-SAR\SIMOrthoProgram\|
+PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0:VcpkgTriplet=x64-windows:
+Debug|x64|D:\WorkProject\mircoCplus\simorthoprogram\|

surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.vcxproj.FileListAbsolute.txt

@@ -1,44 +1,40 @@
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\SIMOrthoProgram.vcxproj.CopyComplete
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\SIMOrthoProgram.exe
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\concrt140.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\msvcp140.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\msvcp140_1.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\msvcp140_2.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\msvcp140_atomic_wait.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\msvcp140_codecvt_ids.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\vccorlib140.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\vcruntime140.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\vcruntime140_1.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\vcamp140.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\vcomp140.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\boost_filesystem-vc143-mt-x64-1_79.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\gdal.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\zlib1.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\libcrypto-3-x64.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\libssl-3-x64.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\liblzma.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\qhull_r.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\jpeg62.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\tiff.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\geotiff.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\proj.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\sqlite3.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\libcurl.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\libpng16.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\zstd.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\gif.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\netcdf.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\hdf5_hl.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\hdf5.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\webp.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\LIBPQ.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\pcre2-8.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\libexpat.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\libxml2.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\iconv-2.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\geos_c.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\geos.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\json-c.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\openjp2.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\spatialite.dll
-D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\freexl.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\SIMOrthoProgram.vcxproj.CopyComplete
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\SIMOrthoProgram.exe
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\boost_filesystem-vc142-mt-x64-1_83.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\gdal.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\zlib1.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libcrypto-3-x64.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libssl-3-x64.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\liblzma.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\qhull_r.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\jpeg62.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\tiff.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\geotiff.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\proj.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\sqlite3.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libcurl.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libpng16.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\Lerc.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\zstd.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\gif.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\netcdf.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\hdf5_hl.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\hdf5.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libwebp.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libsharpyuv.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\LIBPQ.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\pcre2-8.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libexpat.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libxml2.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\iconv-2.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\geos_c.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\geos.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\json-c.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\openjp2.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\spatialite.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\freexl-1.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\minizip.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\opencv_core4.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\opencv_imgcodecs4.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\opencv_imgproc4.dll
+D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libwebpdecoder.dll