From 3ab8c19a5287e5bc221639d341fde6751eef09fa Mon Sep 17 00:00:00 2001
From: Pos <pierpaolo.mancini@mail.polimi.it>
Date: Sat, 24 Jul 2021 14:30:11 +0200
Subject: [PATCH] Fixed command pad int input fields
---
Core/xmlobject.cpp | 2 +-
Modules/CommandPad/commandpadmodule.ui | 28 ++++++++--------
SkywardHub.pro.user | 45 +++++++++++++-------------
3 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/Core/xmlobject.cpp b/Core/xmlobject.cpp
index 9a8ff19a..bbe8bda6 100644
--- a/Core/xmlobject.cpp
+++ b/Core/xmlobject.cpp
@@ -249,7 +249,7 @@ bool XmlObject::getFloatAttribute(const QString &name, float &value) const
QString val = getAttribute(name);
bool ok;
if(val != ""){
- int temp = val.toFloat(&ok);
+ float temp = val.toFloat(&ok);
if(ok){
value = temp;
return true;
diff --git a/Modules/CommandPad/commandpadmodule.ui b/Modules/CommandPad/commandpadmodule.ui
index 789d9a0e..047d4fe9 100644
--- a/Modules/CommandPad/commandpadmodule.ui
+++ b/Modules/CommandPad/commandpadmodule.ui
@@ -270,9 +270,9 @@
</spacer>
</item>
<item>
- <widget class="QSpinBox" name="deploymentAltitude_spinBox">
+ <widget class="QDoubleSpinBox" name="deploymentAltitude_spinBox">
<property name="maximum">
- <number>99999</number>
+ <double>99999.990000000005239</double>
</property>
</widget>
</item>
@@ -308,9 +308,9 @@
</spacer>
</item>
<item>
- <widget class="QSpinBox" name="refTemperature_spinBox">
+ <widget class="QDoubleSpinBox" name="refTemperature_spinBox">
<property name="maximum">
- <number>99999</number>
+ <double>99999.990000000005239</double>
</property>
</widget>
</item>
@@ -346,9 +346,9 @@
</spacer>
</item>
<item>
- <widget class="QSpinBox" name="referenceAltitude_spinBox">
+ <widget class="QDoubleSpinBox" name="referenceAltitude_spinBox">
<property name="maximum">
- <number>99999</number>
+ <double>99999.990000000005239</double>
</property>
</widget>
</item>
@@ -384,9 +384,9 @@
</spacer>
</item>
<item>
- <widget class="QSpinBox" name="aerobrakeAngle_spinBox">
+ <widget class="QDoubleSpinBox" name="aerobrakeAngle_spinBox">
<property name="maximum">
- <number>99999</number>
+ <double>99999.990000000005239</double>
</property>
</widget>
</item>
@@ -439,9 +439,9 @@
</widget>
</item>
<item>
- <widget class="QSpinBox" name="initialOrientationYaw_spinBox">
+ <widget class="QDoubleSpinBox" name="initialOrientationYaw_spinBox">
<property name="maximum">
- <number>9999</number>
+ <double>99999.990000000005239</double>
</property>
</widget>
</item>
@@ -456,9 +456,9 @@
</widget>
</item>
<item>
- <widget class="QSpinBox" name="initialOrientationPitch_spinBox">
+ <widget class="QDoubleSpinBox" name="initialOrientationPitch_spinBox">
<property name="maximum">
- <number>9999</number>
+ <double>99999.990000000005239</double>
</property>
</widget>
</item>
@@ -473,9 +473,9 @@
</widget>
</item>
<item>
- <widget class="QSpinBox" name="initialOrientationRoll_spinBox">
+ <widget class="QDoubleSpinBox" name="initialOrientationRoll_spinBox">
<property name="maximum">
- <number>9999</number>
+ <double>99999.990000000005239</double>
</property>
</widget>
</item>
diff --git a/SkywardHub.pro.user b/SkywardHub.pro.user
index 0cb2cc50..486c89b6 100644
--- a/SkywardHub.pro.user
+++ b/SkywardHub.pro.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.14.2, 2021-07-21T17:14:25. -->
+<!-- Written by QtCreator 4.14.2, 2021-07-24T14:29:40. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -88,16 +88,16 @@
<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 5.15.1 MinGW 32-bit</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.1 MinGW 32-bit</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5151.win32_mingw81_kit</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.1 MinGW 64-bit</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.1 MinGW 64-bit</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5151.win64_mingw81_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" 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">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Debug</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Debug</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Debug</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-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>
@@ -135,8 +135,8 @@
<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">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Release</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Release</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Release</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-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>
@@ -176,8 +176,8 @@
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="int" key="EnableQmlDebugging">0</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Profile</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Profile</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Profile</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-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>
@@ -298,7 +298,7 @@
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Debug</value>
+ <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Debug</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
@@ -307,16 +307,16 @@
<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 5.15.1 MinGW 64-bit</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.1 MinGW 64-bit</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5151.win64_mingw81_kit</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.1 MinGW 32-bit</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.1 MinGW 32-bit</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5151.win32_mingw81_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" 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">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Debug</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Debug</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Debug</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-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>
@@ -354,8 +354,8 @@
<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">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Release</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Release</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Release</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-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>
@@ -395,8 +395,8 @@
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="int" key="EnableQmlDebugging">0</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Profile</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Profile</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Profile</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-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>
@@ -510,10 +510,11 @@
<valuelist type="QVariantList" key="CustomOutputParsers"/>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
- <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Master/Progetti/Programmazione/Skyward/SkywardHub/SkywardHub.pro</value>
+ <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/Master/Progetti/Programmazione/Skyward/SkywardHub/SkywardHub.pro</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+ <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
</valuemap>
--
GitLab