From bcaeb8fe7a47c905cd89f272b0d84931f01d856c Mon Sep 17 00:00:00 2001 From: chenzenghui <3045316072@qq.com> Date: Mon, 24 Feb 2025 17:24:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug:=20=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E6=98=AF=E7=BC=96=E8=AF=91=E5=B7=A5=E7=A8=8B=E8=87=AA=E8=BA=AB?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ALLRelease/ALLRelease.vcxproj | 57 ++++++++++ BaseCommonLibrary/BaseCommonLibrary.vcxproj | 89 +++++++++++++++ .../BaseTool/ImageOperatorBase.cpp | 1 - GPUBaseLib/GPUBaseLib.vcxproj | 66 +++++++++++ ImageshowTool/ImageshowTool.vcxproj | 86 +++++++++++++++ LAMPDataProcess.sln | 42 +++++++ LAMPDataProcessEXE/LAMPDataProcessEXE.vcxproj | 81 ++++++++++++++ .../RasterMainWidgetGUI.vcxproj | 79 ++++++++++++++ .../RasterProcessTool.vcxproj | 103 ++++++++++++++++++ Toolbox/BaseToolbox/BaseToolbox.vcxproj | 86 +++++++++++++++ .../LAMPScatterTool/LAMPScatterTool.vcxproj | 86 +++++++++++++++ .../QSimulationLookTableDialog.cpp | 2 + .../SimulationSARTool.vcxproj | 90 +++++++++++++++ 13 files changed, 867 insertions(+), 1 deletion(-) diff --git a/ALLRelease/ALLRelease.vcxproj b/ALLRelease/ALLRelease.vcxproj index ecf4b96..7f1cd19 100644 --- a/ALLRelease/ALLRelease.vcxproj +++ b/ALLRelease/ALLRelease.vcxproj @@ -1,10 +1,18 @@ + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -45,6 +53,12 @@ v143 Unicode + + Application + true + v143 + Unicode + Application false @@ -52,6 +66,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -66,9 +87,15 @@ + + + + + + @@ -110,6 +137,18 @@ true + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + Level3 @@ -128,6 +167,24 @@ true + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp14 + stdc11 + + + Console + true + true + true + + diff --git a/BaseCommonLibrary/BaseCommonLibrary.vcxproj b/BaseCommonLibrary/BaseCommonLibrary.vcxproj index ab8faf5..e6163eb 100644 --- a/BaseCommonLibrary/BaseCommonLibrary.vcxproj +++ b/BaseCommonLibrary/BaseCommonLibrary.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -47,6 +55,12 @@ v143 Unicode + + DynamicLibrary + true + v143 + Unicode + DynamicLibrary false @@ -54,6 +68,13 @@ true Unicode + + DynamicLibrary + false + v143 + true + Unicode + @@ -65,11 +86,19 @@ core;gui;widgets + + core;gui;widgets + core;xml;sql;opengl;gui;svg;xmlpatterns;widgets;location;positioning;openglextensions;charts false tools_qt5 + + core;xml;sql;opengl;gui;svg;xmlpatterns;widgets;location;positioning;openglextensions;charts + false + tools_qt5 + @@ -88,16 +117,29 @@ + + + + + + + + ./BaseTool;$(IncludePath) true true + + ./BaseTool;$(IncludePath) + true + true + Level3 @@ -150,6 +192,22 @@ false + + + Level3 + true + _DEBUG;BASECOMMONLIBRARY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + true + + + Windows + true + false + + Level3 @@ -179,6 +237,35 @@ compute_82,sm_82 + + + Level3 + true + true + true + NDEBUG;BASECOMMONLIBRARY_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;BASECONSTVARIABLE_API;_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING;%(PreprocessorDefinitions) + true + NotUsing + pch.h + true + true + StreamingSIMDExtensions2 + true + stdcpp14 + stdc11 + + + Windows + true + true + DebugFull + false + + + true + compute_82,sm_82 + + @@ -211,8 +298,10 @@ Create + Create Create Create + Create Create diff --git a/BaseCommonLibrary/BaseTool/ImageOperatorBase.cpp b/BaseCommonLibrary/BaseTool/ImageOperatorBase.cpp index 70d318f..b8f9cac 100644 --- a/BaseCommonLibrary/BaseTool/ImageOperatorBase.cpp +++ b/BaseCommonLibrary/BaseTool/ImageOperatorBase.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include "FileOperator.h" diff --git a/GPUBaseLib/GPUBaseLib.vcxproj b/GPUBaseLib/GPUBaseLib.vcxproj index 8178f71..2a63d30 100644 --- a/GPUBaseLib/GPUBaseLib.vcxproj +++ b/GPUBaseLib/GPUBaseLib.vcxproj @@ -1,10 +1,18 @@ + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -57,6 +65,12 @@ v143 Unicode + + Application + true + v143 + Unicode + DynamicLibrary false @@ -64,6 +78,13 @@ true Unicode + + DynamicLibrary + false + v143 + true + Unicode + @@ -79,15 +100,26 @@ + + + + + + ..\BaseCommonLibrary;..\BaseCommonLibrary\BaseTool;..\BaseCommonLibrary\ToolAbstract;.;$(VC_IncludePath);$(WindowsSDK_IncludePath) true true + + ..\BaseCommonLibrary;..\BaseCommonLibrary\BaseTool;..\BaseCommonLibrary\ToolAbstract;.;$(VC_IncludePath);$(WindowsSDK_IncludePath) + true + true + Level3 @@ -128,6 +160,18 @@ true + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + Level3 @@ -150,6 +194,28 @@ compute_86,sm_86 + + + Level3 + true + true + true + NDEBUG;_CONSOLE;GPUBASELIB_API;%(PreprocessorDefinitions) + true + stdcpp14 + stdc11 + + + Console + true + true + true + + + true + compute_86,sm_86 + + diff --git a/ImageshowTool/ImageshowTool.vcxproj b/ImageshowTool/ImageshowTool.vcxproj index d6a75ad..bc17649 100644 --- a/ImageshowTool/ImageshowTool.vcxproj +++ b/ImageshowTool/ImageshowTool.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug x64 + + Release + ARM + Release x64 @@ -14,7 +22,9 @@ {8C8CA066-A93A-4098-9A46-B855EFEAADF2} QtVS_v304 10.0 + 10.0 10.0 + 10.0 $(MSBuildProjectDirectory)\QtMsBuild @@ -24,6 +34,12 @@ true Unicode + + DynamicLibrary + v143 + true + Unicode + DynamicLibrary v143 @@ -31,6 +47,13 @@ true Unicode + + DynamicLibrary + v143 + false + true + Unicode + @@ -40,11 +63,21 @@ core debug + + tools_qt5 + core + debug + tools_qt5 core;xml;opengl;gui;xmlpatterns;widgets;location;printsupport;charts;datavisualization release + + tools_qt5 + core;xml;opengl;gui;xmlpatterns;widgets;location;printsupport;charts;datavisualization + release + @@ -54,10 +87,18 @@ + + + + + + + + @@ -68,6 +109,13 @@ true true + + ..\BaseCommonLibrary;..\BaseCommonLibrary\BaseTool;..\BaseCommonLibrary\ToolAbstract;..\GPUBaseLib\GPUTool;.\Imageshow;$(VC_IncludePath);$(WindowsSDK_IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(ProjectName) + true + true + true @@ -76,6 +124,14 @@ stdc11 + + + true + true + stdcpp14 + stdc11 + + true @@ -89,6 +145,19 @@ true + + + true + IMAGESHOWTOOL_LIB;%(PreprocessorDefinitions) + Level3 + true + true + + + Windows + true + + true @@ -106,6 +175,23 @@ true + + + true + IMAGESHOWTOOL_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Level3 + true + true + true + true + + + Windows + DebugFull + true + true + + diff --git a/LAMPDataProcess.sln b/LAMPDataProcess.sln index 07b966f..089c1ce 100644 --- a/LAMPDataProcess.sln +++ b/LAMPDataProcess.sln @@ -40,88 +40,130 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageshowTool", "ImageshowT EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|ARM = Release|ARM Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7EF67DAA-DBC0-4B7F-80E8-11B4D2CB7EC2}.Debug|ARM.ActiveCfg = Debug|ARM + {7EF67DAA-DBC0-4B7F-80E8-11B4D2CB7EC2}.Debug|ARM.Build.0 = Debug|ARM {7EF67DAA-DBC0-4B7F-80E8-11B4D2CB7EC2}.Debug|x64.ActiveCfg = Debug|x64 {7EF67DAA-DBC0-4B7F-80E8-11B4D2CB7EC2}.Debug|x64.Build.0 = Debug|x64 {7EF67DAA-DBC0-4B7F-80E8-11B4D2CB7EC2}.Debug|x86.ActiveCfg = Debug|x64 {7EF67DAA-DBC0-4B7F-80E8-11B4D2CB7EC2}.Debug|x86.Build.0 = Debug|x64 + {7EF67DAA-DBC0-4B7F-80E8-11B4D2CB7EC2}.Release|ARM.ActiveCfg = Release|ARM + {7EF67DAA-DBC0-4B7F-80E8-11B4D2CB7EC2}.Release|ARM.Build.0 = Release|ARM {7EF67DAA-DBC0-4B7F-80E8-11B4D2CB7EC2}.Release|x64.ActiveCfg = Release|x64 {7EF67DAA-DBC0-4B7F-80E8-11B4D2CB7EC2}.Release|x64.Build.0 = Release|x64 {7EF67DAA-DBC0-4B7F-80E8-11B4D2CB7EC2}.Release|x86.ActiveCfg = Release|x64 {7EF67DAA-DBC0-4B7F-80E8-11B4D2CB7EC2}.Release|x86.Build.0 = Release|x64 + {872ECD6F-30E3-4A1B-B17C-15E87D373FF6}.Debug|ARM.ActiveCfg = Debug|ARM + {872ECD6F-30E3-4A1B-B17C-15E87D373FF6}.Debug|ARM.Build.0 = Debug|ARM {872ECD6F-30E3-4A1B-B17C-15E87D373FF6}.Debug|x64.ActiveCfg = Debug|x64 {872ECD6F-30E3-4A1B-B17C-15E87D373FF6}.Debug|x64.Build.0 = Debug|x64 {872ECD6F-30E3-4A1B-B17C-15E87D373FF6}.Debug|x86.ActiveCfg = Debug|Win32 {872ECD6F-30E3-4A1B-B17C-15E87D373FF6}.Debug|x86.Build.0 = Debug|Win32 + {872ECD6F-30E3-4A1B-B17C-15E87D373FF6}.Release|ARM.ActiveCfg = Release|ARM + {872ECD6F-30E3-4A1B-B17C-15E87D373FF6}.Release|ARM.Build.0 = Release|ARM {872ECD6F-30E3-4A1B-B17C-15E87D373FF6}.Release|x64.ActiveCfg = Release|x64 {872ECD6F-30E3-4A1B-B17C-15E87D373FF6}.Release|x64.Build.0 = Release|x64 {872ECD6F-30E3-4A1B-B17C-15E87D373FF6}.Release|x86.ActiveCfg = Release|Win32 {872ECD6F-30E3-4A1B-B17C-15E87D373FF6}.Release|x86.Build.0 = Release|Win32 + {070C157E-3C30-4E2B-A80C-CBC7B74DF03F}.Debug|ARM.ActiveCfg = Debug|ARM + {070C157E-3C30-4E2B-A80C-CBC7B74DF03F}.Debug|ARM.Build.0 = Debug|ARM {070C157E-3C30-4E2B-A80C-CBC7B74DF03F}.Debug|x64.ActiveCfg = Debug|x64 {070C157E-3C30-4E2B-A80C-CBC7B74DF03F}.Debug|x64.Build.0 = Debug|x64 {070C157E-3C30-4E2B-A80C-CBC7B74DF03F}.Debug|x86.ActiveCfg = Debug|x64 {070C157E-3C30-4E2B-A80C-CBC7B74DF03F}.Debug|x86.Build.0 = Debug|x64 + {070C157E-3C30-4E2B-A80C-CBC7B74DF03F}.Release|ARM.ActiveCfg = Release|ARM + {070C157E-3C30-4E2B-A80C-CBC7B74DF03F}.Release|ARM.Build.0 = Release|ARM {070C157E-3C30-4E2B-A80C-CBC7B74DF03F}.Release|x64.ActiveCfg = Release|x64 {070C157E-3C30-4E2B-A80C-CBC7B74DF03F}.Release|x64.Build.0 = Release|x64 {070C157E-3C30-4E2B-A80C-CBC7B74DF03F}.Release|x86.ActiveCfg = Release|x64 {070C157E-3C30-4E2B-A80C-CBC7B74DF03F}.Release|x86.Build.0 = Release|x64 + {D603A623-132D-4304-AB03-638FC438F084}.Debug|ARM.ActiveCfg = Debug|ARM + {D603A623-132D-4304-AB03-638FC438F084}.Debug|ARM.Build.0 = Debug|ARM {D603A623-132D-4304-AB03-638FC438F084}.Debug|x64.ActiveCfg = Debug|x64 {D603A623-132D-4304-AB03-638FC438F084}.Debug|x64.Build.0 = Debug|x64 {D603A623-132D-4304-AB03-638FC438F084}.Debug|x86.ActiveCfg = Debug|x64 {D603A623-132D-4304-AB03-638FC438F084}.Debug|x86.Build.0 = Debug|x64 + {D603A623-132D-4304-AB03-638FC438F084}.Release|ARM.ActiveCfg = Release|ARM + {D603A623-132D-4304-AB03-638FC438F084}.Release|ARM.Build.0 = Release|ARM {D603A623-132D-4304-AB03-638FC438F084}.Release|x64.ActiveCfg = Release|x64 {D603A623-132D-4304-AB03-638FC438F084}.Release|x64.Build.0 = Release|x64 {D603A623-132D-4304-AB03-638FC438F084}.Release|x86.ActiveCfg = Release|x64 {D603A623-132D-4304-AB03-638FC438F084}.Release|x86.Build.0 = Release|x64 + {ED06DFCD-4B9F-41F7-8F25-1823C2398142}.Debug|ARM.ActiveCfg = Debug|ARM + {ED06DFCD-4B9F-41F7-8F25-1823C2398142}.Debug|ARM.Build.0 = Debug|ARM {ED06DFCD-4B9F-41F7-8F25-1823C2398142}.Debug|x64.ActiveCfg = Debug|x64 {ED06DFCD-4B9F-41F7-8F25-1823C2398142}.Debug|x64.Build.0 = Debug|x64 {ED06DFCD-4B9F-41F7-8F25-1823C2398142}.Debug|x86.ActiveCfg = Debug|x64 {ED06DFCD-4B9F-41F7-8F25-1823C2398142}.Debug|x86.Build.0 = Debug|x64 + {ED06DFCD-4B9F-41F7-8F25-1823C2398142}.Release|ARM.ActiveCfg = Release|ARM + {ED06DFCD-4B9F-41F7-8F25-1823C2398142}.Release|ARM.Build.0 = Release|ARM {ED06DFCD-4B9F-41F7-8F25-1823C2398142}.Release|x64.ActiveCfg = Release|x64 {ED06DFCD-4B9F-41F7-8F25-1823C2398142}.Release|x64.Build.0 = Release|x64 {ED06DFCD-4B9F-41F7-8F25-1823C2398142}.Release|x86.ActiveCfg = Release|x64 {ED06DFCD-4B9F-41F7-8F25-1823C2398142}.Release|x86.Build.0 = Release|x64 + {8A71D19D-9AC6-42E9-81EC-9E82AF8075B8}.Debug|ARM.ActiveCfg = Debug|ARM + {8A71D19D-9AC6-42E9-81EC-9E82AF8075B8}.Debug|ARM.Build.0 = Debug|ARM {8A71D19D-9AC6-42E9-81EC-9E82AF8075B8}.Debug|x64.ActiveCfg = Debug|x64 {8A71D19D-9AC6-42E9-81EC-9E82AF8075B8}.Debug|x64.Build.0 = Debug|x64 {8A71D19D-9AC6-42E9-81EC-9E82AF8075B8}.Debug|x86.ActiveCfg = Debug|Win32 {8A71D19D-9AC6-42E9-81EC-9E82AF8075B8}.Debug|x86.Build.0 = Debug|Win32 + {8A71D19D-9AC6-42E9-81EC-9E82AF8075B8}.Release|ARM.ActiveCfg = Release|ARM + {8A71D19D-9AC6-42E9-81EC-9E82AF8075B8}.Release|ARM.Build.0 = Release|ARM {8A71D19D-9AC6-42E9-81EC-9E82AF8075B8}.Release|x64.ActiveCfg = Release|x64 {8A71D19D-9AC6-42E9-81EC-9E82AF8075B8}.Release|x64.Build.0 = Release|x64 {8A71D19D-9AC6-42E9-81EC-9E82AF8075B8}.Release|x86.ActiveCfg = Release|Win32 {8A71D19D-9AC6-42E9-81EC-9E82AF8075B8}.Release|x86.Build.0 = Release|Win32 + {4E6E79A3-048C-4FB4-BBB0-43C518A3E6D4}.Debug|ARM.ActiveCfg = Debug|ARM + {4E6E79A3-048C-4FB4-BBB0-43C518A3E6D4}.Debug|ARM.Build.0 = Debug|ARM {4E6E79A3-048C-4FB4-BBB0-43C518A3E6D4}.Debug|x64.ActiveCfg = Debug|x64 {4E6E79A3-048C-4FB4-BBB0-43C518A3E6D4}.Debug|x64.Build.0 = Debug|x64 {4E6E79A3-048C-4FB4-BBB0-43C518A3E6D4}.Debug|x86.ActiveCfg = Debug|x64 {4E6E79A3-048C-4FB4-BBB0-43C518A3E6D4}.Debug|x86.Build.0 = Debug|x64 + {4E6E79A3-048C-4FB4-BBB0-43C518A3E6D4}.Release|ARM.ActiveCfg = Release|ARM + {4E6E79A3-048C-4FB4-BBB0-43C518A3E6D4}.Release|ARM.Build.0 = Release|ARM {4E6E79A3-048C-4FB4-BBB0-43C518A3E6D4}.Release|x64.ActiveCfg = Release|x64 {4E6E79A3-048C-4FB4-BBB0-43C518A3E6D4}.Release|x64.Build.0 = Release|x64 {4E6E79A3-048C-4FB4-BBB0-43C518A3E6D4}.Release|x86.ActiveCfg = Release|x64 {4E6E79A3-048C-4FB4-BBB0-43C518A3E6D4}.Release|x86.Build.0 = Release|x64 + {B8B40C54-F7FE-4809-B6FB-8BC014570D7B}.Debug|ARM.ActiveCfg = Debug|ARM + {B8B40C54-F7FE-4809-B6FB-8BC014570D7B}.Debug|ARM.Build.0 = Debug|ARM {B8B40C54-F7FE-4809-B6FB-8BC014570D7B}.Debug|x64.ActiveCfg = Debug|x64 {B8B40C54-F7FE-4809-B6FB-8BC014570D7B}.Debug|x64.Build.0 = Debug|x64 {B8B40C54-F7FE-4809-B6FB-8BC014570D7B}.Debug|x86.ActiveCfg = Debug|Win32 {B8B40C54-F7FE-4809-B6FB-8BC014570D7B}.Debug|x86.Build.0 = Debug|Win32 + {B8B40C54-F7FE-4809-B6FB-8BC014570D7B}.Release|ARM.ActiveCfg = Release|ARM + {B8B40C54-F7FE-4809-B6FB-8BC014570D7B}.Release|ARM.Build.0 = Release|ARM {B8B40C54-F7FE-4809-B6FB-8BC014570D7B}.Release|x64.ActiveCfg = Release|x64 {B8B40C54-F7FE-4809-B6FB-8BC014570D7B}.Release|x64.Build.0 = Release|x64 {B8B40C54-F7FE-4809-B6FB-8BC014570D7B}.Release|x86.ActiveCfg = Release|Win32 {B8B40C54-F7FE-4809-B6FB-8BC014570D7B}.Release|x86.Build.0 = Release|Win32 + {E56B3878-A3DC-41A4-ABF3-B628816D0D64}.Debug|ARM.ActiveCfg = Debug|ARM + {E56B3878-A3DC-41A4-ABF3-B628816D0D64}.Debug|ARM.Build.0 = Debug|ARM {E56B3878-A3DC-41A4-ABF3-B628816D0D64}.Debug|x64.ActiveCfg = Debug|x64 {E56B3878-A3DC-41A4-ABF3-B628816D0D64}.Debug|x64.Build.0 = Debug|x64 {E56B3878-A3DC-41A4-ABF3-B628816D0D64}.Debug|x86.ActiveCfg = Debug|x64 {E56B3878-A3DC-41A4-ABF3-B628816D0D64}.Debug|x86.Build.0 = Debug|x64 + {E56B3878-A3DC-41A4-ABF3-B628816D0D64}.Release|ARM.ActiveCfg = Release|ARM + {E56B3878-A3DC-41A4-ABF3-B628816D0D64}.Release|ARM.Build.0 = Release|ARM {E56B3878-A3DC-41A4-ABF3-B628816D0D64}.Release|x64.ActiveCfg = Release|x64 {E56B3878-A3DC-41A4-ABF3-B628816D0D64}.Release|x64.Build.0 = Release|x64 {E56B3878-A3DC-41A4-ABF3-B628816D0D64}.Release|x86.ActiveCfg = Release|x64 {E56B3878-A3DC-41A4-ABF3-B628816D0D64}.Release|x86.Build.0 = Release|x64 + {8C8CA066-A93A-4098-9A46-B855EFEAADF2}.Debug|ARM.ActiveCfg = Debug|ARM + {8C8CA066-A93A-4098-9A46-B855EFEAADF2}.Debug|ARM.Build.0 = Debug|ARM {8C8CA066-A93A-4098-9A46-B855EFEAADF2}.Debug|x64.ActiveCfg = Debug|x64 {8C8CA066-A93A-4098-9A46-B855EFEAADF2}.Debug|x64.Build.0 = Debug|x64 {8C8CA066-A93A-4098-9A46-B855EFEAADF2}.Debug|x86.ActiveCfg = Debug|x64 {8C8CA066-A93A-4098-9A46-B855EFEAADF2}.Debug|x86.Build.0 = Debug|x64 + {8C8CA066-A93A-4098-9A46-B855EFEAADF2}.Release|ARM.ActiveCfg = Release|ARM + {8C8CA066-A93A-4098-9A46-B855EFEAADF2}.Release|ARM.Build.0 = Release|ARM {8C8CA066-A93A-4098-9A46-B855EFEAADF2}.Release|x64.ActiveCfg = Release|x64 {8C8CA066-A93A-4098-9A46-B855EFEAADF2}.Release|x64.Build.0 = Release|x64 {8C8CA066-A93A-4098-9A46-B855EFEAADF2}.Release|x86.ActiveCfg = Release|x64 diff --git a/LAMPDataProcessEXE/LAMPDataProcessEXE.vcxproj b/LAMPDataProcessEXE/LAMPDataProcessEXE.vcxproj index cbab17c..96d1cdf 100644 --- a/LAMPDataProcessEXE/LAMPDataProcessEXE.vcxproj +++ b/LAMPDataProcessEXE/LAMPDataProcessEXE.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug x64 + + Release + ARM + Release x64 @@ -14,7 +22,9 @@ {4E6E79A3-048C-4FB4-BBB0-43C518A3E6D4} QtVS_v304 10.0 + 10.0 10.0 + 10.0 $(MSBuildProjectDirectory)\QtMsBuild @@ -24,6 +34,12 @@ true Unicode + + Application + v143 + true + Unicode + Application v143 @@ -31,6 +47,13 @@ true Unicode + + Application + v143 + false + true + Unicode + @@ -40,11 +63,21 @@ core;gui;widgets debug + + tools_qt5 + core;gui;widgets + debug + tools_qt5 core;gui;widgets release + + tools_qt5 + core;gui;widgets + release + @@ -54,10 +87,18 @@ + + + + + + + + @@ -66,6 +107,11 @@ true true + + ..\BaseCommonLibrary;..\BaseCommonLibrary\BaseTool;..\BaseCommonLibrary\ToolAbstract;..\GPUBaseLib\GPUTool;..\RasterProcessToolWidget;..\LAMPMainWidget;..\RasterMainWidgetGUI;..\RasterMainWidgetGUI\RasterMainWidget;$(VC_IncludePath);$(WindowsSDK_IncludePath) + true + true + true @@ -73,6 +119,13 @@ stdcpp14 + + + true + stdc11 + stdcpp14 + + true @@ -85,6 +138,18 @@ true + + + true + Level3 + true + true + + + Windows + true + + true @@ -101,6 +166,22 @@ true + + + true + Level3 + true + true + true + true + + + Console + false + true + true + + diff --git a/RasterMainWidgetGUI/RasterMainWidgetGUI.vcxproj b/RasterMainWidgetGUI/RasterMainWidgetGUI.vcxproj index 00707d3..123f057 100644 --- a/RasterMainWidgetGUI/RasterMainWidgetGUI.vcxproj +++ b/RasterMainWidgetGUI/RasterMainWidgetGUI.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug x64 + + Release + ARM + Release x64 @@ -14,7 +22,9 @@ {E56B3878-A3DC-41A4-ABF3-B628816D0D64} QtVS_v304 10.0 + 10.0 10.0 + 10.0 $(MSBuildProjectDirectory)\QtMsBuild @@ -24,6 +34,12 @@ true Unicode + + Application + v143 + true + Unicode + DynamicLibrary v143 @@ -31,6 +47,13 @@ true Unicode + + DynamicLibrary + v143 + false + true + Unicode + @@ -40,11 +63,21 @@ core;gui;widgets debug + + tools_qt5 + core;gui;widgets + debug + tools_qt5 core;xml;sql;gui;help;xmlpatterns;widgets;location;bluetooth;printsupport;dbus;charts;datavisualization release + + tools_qt5 + core;xml;sql;gui;help;xmlpatterns;widgets;location;bluetooth;printsupport;dbus;charts;datavisualization + release + @@ -54,10 +87,18 @@ + + + + + + + + @@ -66,11 +107,21 @@ true true + + .;.\RasterMainWidget;..\RasterProcessToolWidget;..\RasterProcessToolWidget\ToolBoxManager;..\BaseCommonLibrary;..\BaseCommonLibrary\BaseTool;..\BaseCommonLibrary\ToolAbstract;..\GPUBaseLib\GPUTool;..\GPUBaseLib;..\RasterMainWidgetGUI;..\RasterMainWidgetGUI\RasterMainWidget;$(IncludePath) + true + true + _CRT_SECURE_NO_WARNINGS;_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING;RASTERMAINWIDGETGUI_LIB;%(PreprocessorDefinitions) + + + _CRT_SECURE_NO_WARNINGS;_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING;RASTERMAINWIDGETGUI_LIB;%(PreprocessorDefinitions) + + true @@ -83,6 +134,18 @@ true + + + true + Level3 + true + true + + + Windows + true + + true @@ -99,6 +162,22 @@ true + + + true + Level3 + true + true + true + true + + + Console + DebugFull + true + true + + diff --git a/RasterProcessToolWidget/RasterProcessTool.vcxproj b/RasterProcessToolWidget/RasterProcessTool.vcxproj index 1963324..203bb6a 100644 --- a/RasterProcessToolWidget/RasterProcessTool.vcxproj +++ b/RasterProcessToolWidget/RasterProcessTool.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug x64 + + Release + ARM + Release x64 @@ -14,7 +22,9 @@ {7EF67DAA-DBC0-4B7F-80E8-11B4D2CB7EC2} QtVS_v304 10.0 + 10.0 10.0 + 10.0 $(MSBuildProjectDirectory)\QtMsBuild RasterProcessToolWidget @@ -25,6 +35,12 @@ true Unicode + + Application + v143 + true + Unicode + DynamicLibrary v143 @@ -35,6 +51,16 @@ true false + + DynamicLibrary + v143 + false + true + Unicode + Parallel + true + false + @@ -44,11 +70,21 @@ core;gui;widgets debug + + tools_qt5 + core;gui;widgets + debug + tools_qt5 core;xml;sql;gui;help;xmlpatterns;widgets;location;bluetooth;printsupport;dbus;charts;datavisualization release + + tools_qt5 + core;xml;sql;gui;help;xmlpatterns;widgets;location;bluetooth;printsupport;dbus;charts;datavisualization + release + @@ -60,20 +96,37 @@ + + + + + + + + .\SimulationSAR;.\GF3ProcessToolbox;.\BaseTool;$(IncludePath) + + .\SimulationSAR;.\GF3ProcessToolbox;.\BaseTool;$(IncludePath) + ..\BaseCommonLibrary;..\BaseCommonLibrary\BaseTool;..\GPUBaseLib\GPUTool;..\BaseCommonLibrary\ToolAbstract;$(oneMKLIncludeDir);$(IncludePath) C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.6\lib\x64;$(ReferencePath) true true + + ..\BaseCommonLibrary;..\BaseCommonLibrary\BaseTool;..\GPUBaseLib\GPUTool;..\BaseCommonLibrary\ToolAbstract;$(oneMKLIncludeDir);$(IncludePath) + C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.6\lib\x64;$(ReferencePath) + true + true + RASTERPROCESSTOOLWIDGET_LIB;_CRT_SECURE_NO_WARNINGS;_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING;%(PreprocessorDefinitions) @@ -96,6 +149,28 @@ true + + + RASTERPROCESSTOOLWIDGET_LIB;_CRT_SECURE_NO_WARNINGS;_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING;%(PreprocessorDefinitions) + true + Disabled + false + true + EditAndContinue + Neither + stdcpp14 + stdc11 + + + Default + true + cublas.lib;%(AdditionalDependencies) + + + compute_86,sm_86 + true + + true @@ -108,6 +183,18 @@ true + + + true + Level3 + true + true + + + Windows + true + + true @@ -124,6 +211,22 @@ true + + + true + Level3 + true + true + true + true + + + Console + DebugFull + false + true + + diff --git a/Toolbox/BaseToolbox/BaseToolbox.vcxproj b/Toolbox/BaseToolbox/BaseToolbox.vcxproj index 3609a96..d2e57f9 100644 --- a/Toolbox/BaseToolbox/BaseToolbox.vcxproj +++ b/Toolbox/BaseToolbox/BaseToolbox.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug x64 + + Release + ARM + Release x64 @@ -14,7 +22,9 @@ {070C157E-3C30-4E2B-A80C-CBC7B74DF03F} QtVS_v304 10.0 + 10.0 10.0 + 10.0 $(MSBuildProjectDirectory)\QtMsBuild @@ -24,6 +34,12 @@ true Unicode + + DynamicLibrary + v143 + true + Unicode + DynamicLibrary v143 @@ -31,6 +47,13 @@ true Unicode + + DynamicLibrary + v143 + false + true + Unicode + @@ -40,11 +63,21 @@ core debug + + tools_qt5 + core + debug + tools_qt5 core;xml;opengl;gui;xmlpatterns;widgets;location;printsupport;charts release + + tools_qt5 + core;xml;opengl;gui;xmlpatterns;widgets;location;printsupport;charts + release + @@ -54,10 +87,18 @@ + + + + + + + + @@ -68,6 +109,13 @@ true true + + ..\..\BaseCommonLibrary;..\..\BaseCommonLibrary\BaseTool;..\..\BaseCommonLibrary\ToolAbstract;..\..\GPUBaseLib\GPUTool;.\BaseToolbox;..\..\RasterMainWidgetGUI\RasterMainWidget;..\..\RasterMainWidgetGUI;..\..\RasterProcessToolWidget;$(VC_IncludePath);$(WindowsSDK_IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\Toolbox\ + PluginTool_$(ProjectName) + true + true + true @@ -76,6 +124,14 @@ stdc11 + + + true + true + stdcpp14 + stdc11 + + true @@ -89,6 +145,19 @@ true + + + true + BASETOOLBOX_LIB;%(PreprocessorDefinitions) + Level3 + true + true + + + Windows + true + + true @@ -106,6 +175,23 @@ true + + + true + BASETOOLBOX_LIB;BASETOOLBOX_API;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Level3 + true + true + true + true + + + Windows + DebugFull + true + true + + diff --git a/Toolbox/LAMPScatterTool/LAMPScatterTool.vcxproj b/Toolbox/LAMPScatterTool/LAMPScatterTool.vcxproj index 1818060..846d64c 100644 --- a/Toolbox/LAMPScatterTool/LAMPScatterTool.vcxproj +++ b/Toolbox/LAMPScatterTool/LAMPScatterTool.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug x64 + + Release + ARM + Release x64 @@ -14,7 +22,9 @@ {D603A623-132D-4304-AB03-638FC438F084} QtVS_v304 10.0 + 10.0 10.0 + 10.0 $(MSBuildProjectDirectory)\QtMsBuild @@ -24,6 +34,12 @@ true Unicode + + DynamicLibrary + v143 + true + Unicode + DynamicLibrary v143 @@ -31,6 +47,13 @@ true Unicode + + DynamicLibrary + v143 + false + true + Unicode + @@ -40,11 +63,21 @@ core debug + + tools_qt5 + core + debug + tools_qt5 core;xml;opengl;gui;xmlpatterns;widgets;location;printsupport;charts release + + tools_qt5 + core;xml;opengl;gui;xmlpatterns;widgets;location;printsupport;charts + release + @@ -54,10 +87,18 @@ + + + + + + + + @@ -68,6 +109,13 @@ true true + + ..\..\BaseCommonLibrary;..\..\BaseCommonLibrary\BaseTool;..\..\BaseCommonLibrary\ToolAbstract;..\..\GPUBaseLib\GPUTool;$(VC_IncludePath);$(WindowsSDK_IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\Toolbox\ + PluginTool_$(ProjectName) + true + true + true @@ -76,6 +124,14 @@ stdc11 + + + true + true + stdcpp14 + stdc11 + + true @@ -89,6 +145,19 @@ true + + + true + LAMPSCATTERTOOL_LIB;%(PreprocessorDefinitions) + Level3 + true + true + + + Windows + true + + true @@ -106,6 +175,23 @@ true + + + true + LAMPSCATTERTOOL_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Level3 + true + true + true + true + + + Windows + DebugFull + true + true + + diff --git a/Toolbox/SimulationSARTool/PowerSimulationIncoherent/QSimulationLookTableDialog.cpp b/Toolbox/SimulationSARTool/PowerSimulationIncoherent/QSimulationLookTableDialog.cpp index 88cb828..cc682f9 100644 --- a/Toolbox/SimulationSARTool/PowerSimulationIncoherent/QSimulationLookTableDialog.cpp +++ b/Toolbox/SimulationSARTool/PowerSimulationIncoherent/QSimulationLookTableDialog.cpp @@ -303,6 +303,7 @@ void QSimulationLookTableDialog::LookTableSimulationDopplerProcess(QString DEMPa } + // ´¦Àí·Ö¿é long GPUMemoryline = floor((Memory1MB * 2.0 / 8.0 / 3.0 / demimg.width * 2000));//2GB GPUMemoryline = GPUMemoryline < 1 ? 1 : GPUMemoryline; @@ -341,6 +342,7 @@ void QSimulationLookTableDialog::LookTableSimulationDopplerProcess(QString DEMPa double fact_lamda = 1 / lamda; for (long rid = 0; rid < demimg.height; rid = rid + GPUMemoryline) { qDebug() << "computer read file : " << rid << "~" << rowcount + rid << "\t:" << demimg.height; + //double* tmep = new double[rowcount * colcount]; std::shared_ptr demX = readDataArr(demimg, rid, 0, rowcount, colcount, 1, GDALREADARRCOPYMETHOD::VARIABLEMETHOD);// ÐÐÁÐÊýÐÞ¸Ä std::shared_ptr demY = readDataArr(demimg, rid, 0, rowcount, colcount, 2, GDALREADARRCOPYMETHOD::VARIABLEMETHOD); std::shared_ptr demZ = readDataArr(demimg, rid, 0, rowcount, colcount, 3, GDALREADARRCOPYMETHOD::VARIABLEMETHOD); diff --git a/Toolbox/SimulationSARTool/SimulationSARTool.vcxproj b/Toolbox/SimulationSARTool/SimulationSARTool.vcxproj index c3872e9..e00798f 100644 --- a/Toolbox/SimulationSARTool/SimulationSARTool.vcxproj +++ b/Toolbox/SimulationSARTool/SimulationSARTool.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug x64 + + Release + ARM + Release x64 @@ -14,7 +22,9 @@ {ED06DFCD-4B9F-41F7-8F25-1823C2398142} QtVS_v304 10.0 + 10.0 10.0 + 10.0 $(MSBuildProjectDirectory)\QtMsBuild @@ -24,6 +34,12 @@ true Unicode + + DynamicLibrary + v143 + true + Unicode + DynamicLibrary v143 @@ -31,6 +47,13 @@ true Unicode + + DynamicLibrary + v143 + false + true + Unicode + @@ -40,11 +63,21 @@ core;gui;widgets debug + + tools_qt5 + core;gui;widgets + debug + tools_qt5 core;xml;opengl;gui;xmlpatterns;widgets;location;printsupport;charts release + + tools_qt5 + core;xml;opengl;gui;xmlpatterns;widgets;location;printsupport;charts + release + @@ -56,10 +89,18 @@ + + + + + + + + @@ -70,6 +111,13 @@ true true + + ..\..\BaseCommonLibrary;..\..\BaseCommonLibrary\BaseTool;..\..\BaseCommonLibrary\ToolAbstract;..\..\GPUBaseLib\GPUTool;.\SimulationSAR;.;..\..\LAMPSARProcessProgram\ToolBoxManager;..\..\RasterMainWidgetGUI\RasterMainWidget;..\..\RasterProcessToolWidget;..\..\RasterMainWidgetGUI;.\PowerSimulationIncoherent;..\..\ImageshowTool;..\..\ImageshowTool\Imageshow;$(VC_IncludePath);$(WindowsSDK_IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\Toolbox\ + PluginTool_$(ProjectName) + true + true + true @@ -82,6 +130,18 @@ compute_86,sm_86 + + + true + true + stdcpp14 + stdc11 + + + true + compute_86,sm_86 + + true @@ -95,6 +155,19 @@ true + + + true + SIMULATIONSARTOOL_LIB;%(PreprocessorDefinitions) + Level3 + true + true + + + Windows + true + + true @@ -112,6 +185,23 @@ true + + + true + SIMULATIONSARTOOL_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Level3 + true + true + true + true + + + Windows + DebugFull + true + true + +