Merge pull request '光电吊舱系统控制、载荷公用、可见光页面按钮功能实现' (#2) from cyh into main

Reviewed-on: CaoYuhui/PayloadAPP#2
pull/3/head
CaoYuhui 8 months ago
commit 2096b29e79

@ -1,10 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<<<<<<< Updated upstream
<!-- Written by QtCreator 13.0.2, 2024-07-07T17:08:17. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
<value type="QByteArray">{759415a8-4594-451e-a962-883a838b346f}</value>
=======
<!-- Written by QtCreator 13.0.2, 2024-07-07T20:01:12. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
<value type="QByteArray">{a4cfdcc4-9e92-4192-b732-d379deab22e3}</value>
>>>>>>> Stashed changes
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
@ -83,6 +91,9 @@
<valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
<value type="bool" key="ClangTools.UseGlobalSettings">true</value>
</valuemap>
<valuemap type="QVariantMap" key="CppEditor.QuickFix">
<value type="bool" key="UseGlobalSettings">true</value>
</valuemap>
</valuemap>
</data>
<data>
@ -97,8 +108,13 @@
<value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="int" key="EnableQmlDebugging">0</value>
<<<<<<< Updated upstream
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:\MyProject\PayloadAPP\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">F:/MyProject/PayloadAPP/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
=======
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QT\Custom_projects\Project_14\PayloadAPP\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
>>>>>>> Stashed changes
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -136,8 +152,13 @@
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<<<<<<< Updated upstream
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:\MyProject\PayloadAPP\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">F:/MyProject/PayloadAPP/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Release</value>
=======
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QT\Custom_projects\Project_14\PayloadAPP\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Release</value>
>>>>>>> Stashed changes
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -175,7 +196,221 @@
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="int" key="QtQuickCompiler">0</value>
</valuemap>
<<<<<<< Updated upstream
<value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
=======
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QT\Custom_projects\Project_14\PayloadAPP\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Profile</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="int" key="QtQuickCompiler">0</value>
<value type="int" key="SeparateDebugInfo">0</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">部署</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">部署</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
<value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
<value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
<value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
<value type="int" key="Analyzer.Valgrind.Callgrind.CostFormat">0</value>
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
<valuelist type="QVariantList" key="CustomOutputParsers"/>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
<value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/QT/Custom_projects/Project_14/PayloadAPP/PayloadAPP.pro</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">D:/QT/Custom_projects/Project_14/PayloadAPP/PayloadAPP.pro</value>
<value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.Target.1</variable>
<valuemap type="QVariantMap">
<value type="QString" key="DeviceType">Desktop</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 6.7.2 MSVC2019 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 6.7.2 MSVC2019 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt6.672.win64_msvc2019_64_kit</value>
<value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QT\Custom_projects\Project_14\PayloadAPP\build\Desktop_Qt_6_7_2_MSVC2019_64bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_7_2_MSVC2019_64bit-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QT\Custom_projects\Project_14\PayloadAPP\build\Desktop_Qt_6_7_2_MSVC2019_64bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_7_2_MSVC2019_64bit-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="int" key="QtQuickCompiler">0</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QT\Custom_projects\Project_14\PayloadAPP\build\Desktop_Qt_6_7_2_MSVC2019_64bit-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_7_2_MSVC2019_64bit-Profile</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="int" key="QtQuickCompiler">0</value>
<value type="int" key="SeparateDebugInfo">0</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
>>>>>>> Stashed changes
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
@ -200,20 +435,28 @@
<value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
<value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<<<<<<< Updated upstream
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:F:/MyProject/PayloadAPP/PayloadAPP.pro</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">F:/MyProject/PayloadAPP/PayloadAPP.pro</value>
=======
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/QT/Custom_projects/Project_14/PayloadAPP/PayloadAPP.pro</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">D:/QT/Custom_projects/Project_14/PayloadAPP/PayloadAPP.pro</value>
>>>>>>> Stashed changes
<value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<<<<<<< Updated upstream
<value type="QString" key="RunConfiguration.WorkingDirectory.default">F:/MyProject/PayloadAPP/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
=======
>>>>>>> Stashed changes
</valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.TargetCount</variable>
<value type="qlonglong">1</value>
<value type="qlonglong">2</value>
</data>
<data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>

@ -0,0 +1,307 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<qtcreator>
<data>
<variable>EnvironmentId</variable>
<value type="QByteArray">{c21801a3-ae2b-45ac-9dbf-ccd10de58748}</value>
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
<value type="qlonglong">0</value>
</data>
<data>
<variable>ProjectExplorer.Project.EditorSettings</variable>
<valuemap type="QVariantMap">
<value type="bool" key="EditorConfiguration.AutoIndent">true</value>
<value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
<value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
<value type="QString" key="language">Cpp</value>
<valuemap type="QVariantMap" key="value">
<value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
</valuemap>
</valuemap>
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
<value type="QString" key="language">QmlJS</value>
<valuemap type="QVariantMap" key="value">
<value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
</valuemap>
</valuemap>
<value type="qlonglong" key="EditorConfiguration.CodeStyle.Count">2</value>
<value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
<value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
<value type="int" key="EditorConfiguration.IndentSize">4</value>
<value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
<value type="int" key="EditorConfiguration.MarginColumn">80</value>
<value type="bool" key="EditorConfiguration.MouseHiding">true</value>
<value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
<value type="int" key="EditorConfiguration.PaddingMode">1</value>
<value type="int" key="EditorConfiguration.PreferAfterWhitespaceComments">0</value>
<value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value>
<value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
<value type="bool" key="EditorConfiguration.ShowMargin">false</value>
<value type="int" key="EditorConfiguration.SmartBackspaceBehavior">2</value>
<value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
<value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
<value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
<value type="int" key="EditorConfiguration.TabSize">8</value>
<value type="bool" key="EditorConfiguration.UseGlobal">true</value>
<value type="bool" key="EditorConfiguration.UseIndenter">false</value>
<value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
<value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
<value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
<value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
<value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value>
<value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
<value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value>
<value type="bool" key="EditorConfiguration.tintMarginArea">true</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.PluginSettings</variable>
<valuemap type="QVariantMap">
<valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks">
<value type="bool" key="AutoTest.Framework.Boost">true</value>
<value type="bool" key="AutoTest.Framework.CTest">false</value>
<value type="bool" key="AutoTest.Framework.Catch">true</value>
<value type="bool" key="AutoTest.Framework.GTest">true</value>
<value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
<value type="bool" key="AutoTest.Framework.QtTest">true</value>
</valuemap>
<valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
<value type="int" key="AutoTest.RunAfterBuild">0</value>
<value type="bool" key="AutoTest.UseGlobal">true</value>
<valuemap type="QVariantMap" key="ClangTools">
<value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
<value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
<value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
<value type="int" key="ClangTools.ParallelJobs">10</value>
<value type="bool" key="ClangTools.PreferConfigFile">true</value>
<valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
<valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
<valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
<value type="bool" key="ClangTools.UseGlobalSettings">true</value>
</valuemap>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
<value type="QString" key="DeviceType">Desktop</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 6.5.3 MSVC2019 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 6.5.3 MSVC2019 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt6.653.win64_msvc2019_64_kit</value>
<value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QTdemo\playerApp\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QTdemo/playerApp/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QTdemo\playerApp\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QTdemo/playerApp/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="int" key="QtQuickCompiler">0</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QTdemo\playerApp\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QTdemo/playerApp/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Profile</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="int" key="QtQuickCompiler">0</value>
<value type="int" key="SeparateDebugInfo">0</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.3">
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QTdemo\playerApp\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QTdemo/playerApp/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">4</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">部署</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">部署</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
<value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
<value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
<value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
<value type="int" key="Analyzer.Valgrind.Callgrind.CostFormat">0</value>
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
<valuelist type="QVariantList" key="CustomOutputParsers"/>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
<value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/QTdemo/playerApp/PayloadAPP.pro</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">D:/QTdemo/playerApp/PayloadAPP.pro</value>
<value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/QTdemo/playerApp/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.TargetCount</variable>
<value type="qlonglong">1</value>
</data>
<data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
<value type="int">22</value>
</data>
<data>
<variable>Version</variable>
<value type="int">22</value>
</data>
</qtcreator>

@ -51,7 +51,31 @@ void GDDCdlg::initParam()
{
m_DCcmdBuffer.resize(cmdLength);
memset(TJDCCmdBuffer,0,10);
ui->comboBox_1_1->addItem("自定义模板");
ui->comboBox_1_1->addItem("16*16");
ui->comboBox_1_1->addItem("32*32");
ui->comboBox_1_1->addItem("64*64");
ui->comboBox_1_1->addItem("128*128");
ui->comboBox_1_2->addItem("红外");
ui->comboBox_1_2->addItem("可见光");
ui->comboBox_1_2->addItem("可见/红外上下分屏(暂不支持)");
ui->comboBox_1_2->addItem("红外显示,可见光画中画");
ui->comboBox_1_2->addItem("可见光显示,红外画中画");
ui->comboBox_1_2->addItem("红外/可见光左右分屏(暂不支持)");
ui->comboBox_2_1->addItem("隐藏");
ui->comboBox_2_1->addItem("部分显示");
ui->comboBox_2_1->addItem("全部显示(默认)");
//ui->comboBox_2_1->addItem("OSD显示内容设置");
//ui->comboBox_2_1->addItem("OSD显示颜色和中英文设置");
param_pushButton_3_9 = false;
ui->comboBox_3_1->addItem("");
ui->comboBox_3_1->addItem("");
ui->comboBox_3_1->addItem("");
ui->comboBox_3_1->addItem("");
}
//初始化udp通信
@ -139,3 +163,541 @@ void GDDCdlg::on_pushButton_11_released()
clearTJDCCmdBuffer();
}
//授时
void GDDCdlg::on_pushButton_1_1_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x20;
}
void GDDCdlg::on_pushButton_1_1_released()
{
clearTJDCCmdBuffer();
}
//目标模板设置
void GDDCdlg::on_pushButton_1_2_pressed()
{
uint chose = ui->comboBox_1_1->currentIndex();
if(chose==0)
{
uint str = ui->lineEdit_1_1->text().toUInt();
uint str2 = ui->lineEdit_1_2->text().toUInt();
TJDCCmdBuffer[0]=(std::byte)0x23;
TJDCCmdBuffer[2]=(std::byte)str;
TJDCCmdBuffer[3]=(std::byte)str2;
}
else
{
TJDCCmdBuffer[0]=(std::byte)chose;
}
}
void GDDCdlg::on_pushButton_1_2_released()
{
clearTJDCCmdBuffer();
}
//目标模板设置
void GDDCdlg::on_pushButton_1_3_pressed()
{
uint selection = ui->comboBox_1_2->currentIndex();
TJDCCmdBuffer[0]=(std::byte)0x25;
TJDCCmdBuffer[1]=(std::byte)selection;
}
void GDDCdlg::on_pushButton_1_3_released()
{
clearTJDCCmdBuffer();
}
/*待解决*/
//吊舱IP设置
void GDDCdlg::on_pushButton_1_4_pressed()
{
int ip = ui->lineEdit_1_3->text().toInt();
TJDCCmdBuffer[0]=(std::byte)0x29;
TJDCCmdBuffer[1]=(std::byte)ip;
}
void GDDCdlg::on_pushButton_1_4_released()
{
clearTJDCCmdBuffer();
}
//图像切换
void GDDCdlg::on_pushButton_2_1_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x31;
}
void GDDCdlg::on_pushButton_2_1_released()
{
clearTJDCCmdBuffer();
}
//抓图
void GDDCdlg::on_pushButton_2_2_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x32;
}
void GDDCdlg::on_pushButton_2_2_released()
{
clearTJDCCmdBuffer();
}
//开始连续抓图
void GDDCdlg::on_pushButton_2_3_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x32;
TJDCCmdBuffer[1]=(std::byte)0x01;
}
void GDDCdlg::on_pushButton_2_3_released()
{
clearTJDCCmdBuffer();
}
//停止连续抓图
void GDDCdlg::on_pushButton_2_4_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x32;
TJDCCmdBuffer[1]=(std::byte)0x02;
}
void GDDCdlg::on_pushButton_2_4_released()
{
clearTJDCCmdBuffer();
}
/*待解决*/
//选点跟踪
void GDDCdlg::on_pushButton_2_5_pressed()
{
}
void GDDCdlg::on_pushButton_2_5_released()
{
clearTJDCCmdBuffer();
}
//取消跟踪
void GDDCdlg::on_pushButton_2_6_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x3B;
}
void GDDCdlg::on_pushButton_2_6_released()
{
clearTJDCCmdBuffer();
}
//开始录像
void GDDCdlg::on_pushButton_2_7_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x33;
TJDCCmdBuffer[1]=(std::byte)0x01;
}
void GDDCdlg::on_pushButton_2_7_released()
{
clearTJDCCmdBuffer();
}
//停止录像
void GDDCdlg::on_pushButton_2_8_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x33;
TJDCCmdBuffer[1]=(std::byte)0x02;
}
void GDDCdlg::on_pushButton_2_8_released()
{
clearTJDCCmdBuffer();
}
//单次测距
void GDDCdlg::on_pushButton_2_9_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x3D;
}
void GDDCdlg::on_pushButton_2_9_released()
{
clearTJDCCmdBuffer();
}
//开始连续测距
void GDDCdlg::on_pushButton_2_10_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x3E;
TJDCCmdBuffer[1]=(std::byte)0x01;
}
void GDDCdlg::on_pushButton_2_10_released()
{
clearTJDCCmdBuffer();
}
//停止连续测距
void GDDCdlg::on_pushButton_2_11_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x3F;
}
void GDDCdlg::on_pushButton_2_11_released()
{
clearTJDCCmdBuffer();
}
//字符叠加设置
void GDDCdlg::on_pushButton_2_12_pressed()
{
uint sel = ui->comboBox_2_1->currentIndex();
TJDCCmdBuffer[0]=(std::byte)0x37;
TJDCCmdBuffer[1]=(std::byte)sel;
}
void GDDCdlg::on_pushButton_2_12_released()
{
clearTJDCCmdBuffer();
}
//增益+
void GDDCdlg::on_pushButton_3_1_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x41;
TJDCCmdBuffer[1]=(std::byte)0x05;
TJDCCmdBuffer[2]=(std::byte)0x01;
}
void GDDCdlg::on_pushButton_3_1_released()
{
clearTJDCCmdBuffer();
}
//增益-
void GDDCdlg::on_pushButton_3_2_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x41;
TJDCCmdBuffer[1]=(std::byte)0x05;
TJDCCmdBuffer[2]=(std::byte)0x02;
}
void GDDCdlg::on_pushButton_3_2_released()
{
clearTJDCCmdBuffer();
}
//自动增益
void GDDCdlg::on_pushButton_3_3_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x41;
TJDCCmdBuffer[1]=(std::byte)0x05;
TJDCCmdBuffer[2]=(std::byte)0x03;
}
void GDDCdlg::on_pushButton_3_3_released()
{
clearTJDCCmdBuffer();
}
//变倍+
void GDDCdlg::on_pushButton_3_4_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x45;
TJDCCmdBuffer[1]=(std::byte)0x01;
}
void GDDCdlg::on_pushButton_3_4_released()
{
clearTJDCCmdBuffer();
TJDCCmdBuffer[0]=(std::byte)0x45;
TJDCCmdBuffer[1]=(std::byte)0x00;
}
//变倍-
void GDDCdlg::on_pushButton_3_5_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x45;
TJDCCmdBuffer[1]=(std::byte)0x02;
}
void GDDCdlg::on_pushButton_3_5_released()
{
clearTJDCCmdBuffer();
TJDCCmdBuffer[0]=(std::byte)0x45;
TJDCCmdBuffer[1]=(std::byte)0x00;
}
//可见光镜头初始化
void GDDCdlg::on_pushButton_3_6_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x41;
TJDCCmdBuffer[1]=(std::byte)0x03;
}
void GDDCdlg::on_pushButton_3_6_released()
{
clearTJDCCmdBuffer();
}
//电子稳像开
void GDDCdlg::on_pushButton_3_7_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x41;
TJDCCmdBuffer[1]=(std::byte)0x04;
TJDCCmdBuffer[2]=(std::byte)0x01;
}
void GDDCdlg::on_pushButton_3_7_released()
{
clearTJDCCmdBuffer();
}
//电子稳像关
void GDDCdlg::on_pushButton_3_8_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x41;
TJDCCmdBuffer[1]=(std::byte)0x04;
TJDCCmdBuffer[2]=(std::byte)0x02;
}
void GDDCdlg::on_pushButton_3_8_released()
{
clearTJDCCmdBuffer();
}
//低照度模式
void GDDCdlg::on_pushButton_3_9_pressed()
{
if(param_pushButton_3_9)
{
TJDCCmdBuffer[0]=(std::byte)0x4A;
TJDCCmdBuffer[1]=(std::byte)0x00;
}
else
{
TJDCCmdBuffer[0]=(std::byte)0x4A;
TJDCCmdBuffer[1]=(std::byte)0x01;
}
}
void GDDCdlg::on_pushButton_3_9_released()
{
clearTJDCCmdBuffer();
}
//自动ICR开
void GDDCdlg::on_pushButton_3_10_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x41;
TJDCCmdBuffer[1]=(std::byte)0x03;
TJDCCmdBuffer[2]=(std::byte)0x01;
}
void GDDCdlg::on_pushButton_3_10_released()
{
clearTJDCCmdBuffer();
}
//自动ICR关
void GDDCdlg::on_pushButton_3_11_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x41;
TJDCCmdBuffer[1]=(std::byte)0x03;
TJDCCmdBuffer[2]=(std::byte)0x02;
}
void GDDCdlg::on_pushButton_3_11_released()
{
clearTJDCCmdBuffer();
}
//恢复默认
void GDDCdlg::on_pushButton_3_12_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x3F;
}
void GDDCdlg::on_pushButton_3_12_released()
{
clearTJDCCmdBuffer();
}
//恢复出厂设置
void GDDCdlg::on_pushButton_3_13_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x41;
TJDCCmdBuffer[1]=(std::byte)0x06;
}
void GDDCdlg::on_pushButton_3_13_released()
{
clearTJDCCmdBuffer();
}
//亮度+
void GDDCdlg::on_pushButton_3_14_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x41;
TJDCCmdBuffer[1]=(std::byte)0x02;
TJDCCmdBuffer[2]=(std::byte)0x01;
}
void GDDCdlg::on_pushButton_3_14_released()
{
clearTJDCCmdBuffer();
}
//亮度-
void GDDCdlg::on_pushButton_3_15_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x41;
TJDCCmdBuffer[1]=(std::byte)0x02;
TJDCCmdBuffer[2]=(std::byte)0x02;
}
void GDDCdlg::on_pushButton_3_15_released()
{
clearTJDCCmdBuffer();
}
//自动亮度
void GDDCdlg::on_pushButton_3_16_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x41;
TJDCCmdBuffer[1]=(std::byte)0x02;
TJDCCmdBuffer[2]=(std::byte)0x03;
}
void GDDCdlg::on_pushButton_3_16_released()
{
clearTJDCCmdBuffer();
}
// //亮度输入设置
// void GDDCdlg::on_pushButton_3_17_pressed()
// {
// TJDCCmdBuffer[0]=(std::byte)0x3F;
// }
// void GDDCdlg::on_pushButton_3_17_released()
// {
// clearTJDCCmdBuffer();
// }
//对比度+
void GDDCdlg::on_pushButton_3_18_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x41;
TJDCCmdBuffer[1]=(std::byte)0x01;
TJDCCmdBuffer[2]=(std::byte)0x01;
}
void GDDCdlg::on_pushButton_3_18_released()
{
clearTJDCCmdBuffer();
}
//对比度-
void GDDCdlg::on_pushButton_3_19_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x41;
TJDCCmdBuffer[1]=(std::byte)0x01;
TJDCCmdBuffer[2]=(std::byte)0x02;
}
void GDDCdlg::on_pushButton_3_19_released()
{
clearTJDCCmdBuffer();
}
//自动对比度
void GDDCdlg::on_pushButton_3_20_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x41;
TJDCCmdBuffer[1]=(std::byte)0x01;
TJDCCmdBuffer[2]=(std::byte)0x03;
}
void GDDCdlg::on_pushButton_3_20_released()
{
clearTJDCCmdBuffer();
}
// //对比度输入设置
// void GDDCdlg::on_pushButton_3_21_pressed()
// {
// TJDCCmdBuffer[0]=(std::byte)0x3F;
// }
// void GDDCdlg::on_pushButton_3_21_released()
// {
// clearTJDCCmdBuffer();
// }
//焦距+
void GDDCdlg::on_pushButton_3_22_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x45;
TJDCCmdBuffer[1]=(std::byte)0x03;
}
void GDDCdlg::on_pushButton_3_22_released()
{
clearTJDCCmdBuffer();
TJDCCmdBuffer[0]=(std::byte)0x45;
TJDCCmdBuffer[1]=(std::byte)0x00;
}
//焦距-
void GDDCdlg::on_pushButton_3_23_pressed()
{
TJDCCmdBuffer[0]=(std::byte)0x45;
TJDCCmdBuffer[1]=(std::byte)0x04;
}
void GDDCdlg::on_pushButton_3_23_released()
{
clearTJDCCmdBuffer();
TJDCCmdBuffer[0]=(std::byte)0x45;
TJDCCmdBuffer[1]=(std::byte)0x00;
}
//焦距输入设置
void GDDCdlg::on_pushButton_3_24_pressed()
{
uint data = ui->lineEdit_3_1->text().toUInt()*10;
TJDCCmdBuffer[0]=(std::byte)0x4C;
TJDCCmdBuffer[1]=(std::byte)data;
TJDCCmdBuffer[2]=(std::byte)(data>>8);
}
void GDDCdlg::on_pushButton_3_24_released()
{
clearTJDCCmdBuffer();
}
//透雾模式设置
void GDDCdlg::on_pushButton_3_25_pressed()
{
uint sel = ui->comboBox_3_1->currentIndex();
TJDCCmdBuffer[0]=(std::byte)0x4A;
TJDCCmdBuffer[1]=(std::byte)sel;
}
void GDDCdlg::on_pushButton_3_25_released()
{
clearTJDCCmdBuffer();
}
// //停止连续测距
// void GDDCdlg::on_pushButton_4_1_pressed()
// {
// TJDCCmdBuffer[0]=(std::byte)0x3F;
// }
// void GDDCdlg::on_pushButton_4_1_released()
// {
// clearTJDCCmdBuffer();
// }
// //停止连续测距
// void GDDCdlg::on_pushButton_4_2_pressed()
// {
// TJDCCmdBuffer[0]=(std::byte)0x3D;
// }
// void GDDCdlg::on_pushButton_4_2_released()
// {
// clearTJDCCmdBuffer();
// }
// //停止连续测距
// void GDDCdlg::on_pushButton_4_3_pressed()
// {
// TJDCCmdBuffer[0]=(std::byte)0x3F;
// }
// void GDDCdlg::on_pushButton_4_4_released()
// {
// clearTJDCCmdBuffer();
// }
// //停止连续测距
// void GDDCdlg::on_pushButton_4_5_pressed()
// {
// TJDCCmdBuffer[0]=(std::byte)0x3F;
// }
// void GDDCdlg::on_pushButton_4_5_released()
// {
// clearTJDCCmdBuffer();
// }
// //停止连续测距
// void GDDCdlg::on_pushButton_4_6_pressed()
// {
// TJDCCmdBuffer[0]=(std::byte)0x3F;
// }
// void GDDCdlg::on_pushButton_4_6_released()
// {
// clearTJDCCmdBuffer();
// }

@ -22,11 +22,109 @@ public:
explicit GDDCdlg(QWidget *parent = nullptr);
~GDDCdlg();
public:
bool param_pushButton_3_9;
private slots:
/*系统控制*/
void on_pushButton_11_pressed();
void on_pushButton_11_released();
void on_pushButton_1_1_pressed();
void on_pushButton_1_1_released();
void on_pushButton_1_2_pressed();
void on_pushButton_1_2_released();
void on_pushButton_1_3_pressed();
void on_pushButton_1_3_released();
void on_pushButton_1_4_pressed();
void on_pushButton_1_4_released();
/*载荷公用*/
void on_pushButton_2_1_pressed();
void on_pushButton_2_1_released();
void on_pushButton_2_2_pressed();
void on_pushButton_2_2_released();
void on_pushButton_2_3_pressed();
void on_pushButton_2_3_released();
void on_pushButton_2_4_pressed();
void on_pushButton_2_4_released();
void on_pushButton_2_5_pressed();
void on_pushButton_2_5_released();
void on_pushButton_2_6_pressed();
void on_pushButton_2_6_released();
void on_pushButton_2_7_pressed();
void on_pushButton_2_7_released();
void on_pushButton_2_8_pressed();
void on_pushButton_2_8_released();
void on_pushButton_2_9_pressed();
void on_pushButton_2_9_released();
void on_pushButton_2_10_pressed();
void on_pushButton_2_10_released();
void on_pushButton_2_11_pressed();
void on_pushButton_2_11_released();
void on_pushButton_2_12_pressed();
void on_pushButton_2_12_released();
/*可见光*/
void on_pushButton_3_1_pressed();
void on_pushButton_3_1_released();
void on_pushButton_3_2_pressed();
void on_pushButton_3_2_released();
void on_pushButton_3_3_pressed();
void on_pushButton_3_3_released();
void on_pushButton_3_4_pressed();
void on_pushButton_3_4_released();
void on_pushButton_3_5_pressed();
void on_pushButton_3_5_released();
void on_pushButton_3_6_pressed();
void on_pushButton_3_6_released();
void on_pushButton_3_7_pressed();
void on_pushButton_3_7_released();
void on_pushButton_3_8_pressed();
void on_pushButton_3_8_released();
void on_pushButton_3_9_pressed();
void on_pushButton_3_9_released();
void on_pushButton_3_10_pressed();
void on_pushButton_3_10_released();
void on_pushButton_3_11_pressed();
void on_pushButton_3_11_released();
void on_pushButton_3_12_pressed();
void on_pushButton_3_12_released();
void on_pushButton_3_13_pressed();
void on_pushButton_3_13_released();
void on_pushButton_3_14_pressed();
void on_pushButton_3_14_released();
void on_pushButton_3_15_pressed();
void on_pushButton_3_15_released();
void on_pushButton_3_16_pressed();
void on_pushButton_3_16_released();
// void on_pushButton_3_17_pressed();
// void on_pushButton_3_17_released();
void on_pushButton_3_18_pressed();
void on_pushButton_3_18_released();
void on_pushButton_3_19_pressed();
void on_pushButton_3_19_released();
void on_pushButton_3_20_pressed();
void on_pushButton_3_20_released();
// void on_pushButton_3_21_pressed();
// void on_pushButton_3_21_released();
void on_pushButton_3_22_pressed();
void on_pushButton_3_22_released();
void on_pushButton_3_23_pressed();
void on_pushButton_3_23_released();
void on_pushButton_3_24_pressed();
void on_pushButton_3_24_released();
void on_pushButton_3_25_pressed();
void on_pushButton_3_25_released();
/*红外*/
// void on_pushButton_4_1_pressed();
// void on_pushButton_4_1_released();
// void on_pushButton_4_2_pressed();
// void on_pushButton_4_2_released();
// void on_pushButton_4_3_pressed();
// void on_pushButton_4_3_released();
// void on_pushButton_4_4_pressed();
// void on_pushButton_4_4_released();
// void on_pushButton_4_5_pressed();
// void on_pushButton_4_5_released();
// void on_pushButton_4_6_pressed();
// void on_pushButton_4_6_released();
private:
Ui::GDDCdlg *ui;
QTimer *GDDCControlTimer;

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save