Skip to content

Commit c9903f9

Browse files
f5sohf5soh
committed
LP-399 Use checkboxes for status and settingsComplete - Tooltip changes
1 parent bbaa1b3 commit c9903f9

2 files changed

Lines changed: 57 additions & 69 deletions

File tree

‎ground/gcs/src/plugins/config/autotune.ui‎

Lines changed: 57 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@
534534
</sizepolicy>
535535
</property>
536536
<property name="toolTip">
537-
<string>Throttle level to hover (%)</string>
537+
<string>Throttle level needed to hover, in percent. How the multirotor is under/over powered.</string>
538538
</property>
539539
<property name="frame">
540540
<bool>true</bool>
@@ -915,50 +915,35 @@
915915
</property>
916916
</widget>
917917
</item>
918-
<item row="0" column="3">
919-
<widget class="QLabel" name="label_19">
920-
<property name="text">
921-
<string>Complete</string>
922-
</property>
923-
<property name="alignment">
924-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
925-
</property>
926-
</widget>
927-
</item>
928918
<item row="0" column="4">
929-
<widget class="QLineEdit" name="stateComplete">
930-
<property name="enabled">
931-
<bool>true</bool>
919+
<widget class="QCheckBox" name="stateComplete">
920+
<property name="toolTip">
921+
<string>Automatically checked for a good complete tune or unchecked for incomplete or bad tune.</string>
932922
</property>
933-
<property name="sizePolicy">
934-
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
935-
<horstretch>0</horstretch>
936-
<verstretch>0</verstretch>
937-
</sizepolicy>
923+
<property name="layoutDirection">
924+
<enum>Qt::LeftToRight</enum>
938925
</property>
939-
<property name="minimumSize">
940-
<size>
941-
<width>0</width>
942-
<height>0</height>
943-
</size>
926+
<property name="text">
927+
<string/>
944928
</property>
945-
<property name="acceptDrops">
946-
<bool>false</bool>
929+
<property name="checkable">
930+
<bool>true</bool>
947931
</property>
948-
<property name="toolTip">
949-
<string>Automatically set True for a good complete tune or False for incomplete or bad</string>
932+
<property name="objrelation" stdset="0">
933+
<stringlist>
934+
<string>objname:SystemIdentState</string>
935+
<string>fieldname:Complete</string>
936+
</stringlist>
950937
</property>
938+
</widget>
939+
</item>
940+
<item row="0" column="3">
941+
<widget class="QLabel" name="label_2">
951942
<property name="text">
952-
<string>False</string>
953-
</property>
954-
<property name="frame">
955-
<bool>true</bool>
943+
<string>Complete</string>
956944
</property>
957945
<property name="alignment">
958-
<set>Qt::AlignCenter</set>
959-
</property>
960-
<property name="readOnly">
961-
<bool>true</bool>
946+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
962947
</property>
963948
</widget>
964949
</item>
@@ -1077,7 +1062,7 @@
10771062
</size>
10781063
</property>
10791064
<property name="toolTip">
1080-
<string>Smooth - Quick value for PID calc based on AutoTune measurements.</string>
1065+
<string>Smooth - Normal - Quick PID response desired for PID calc based on AutoTune measurements.</string>
10811066
</property>
10821067
<property name="decimals">
10831068
<number>1</number>
@@ -1124,6 +1109,9 @@
11241109
<height>16777215</height>
11251110
</size>
11261111
</property>
1112+
<property name="toolTip">
1113+
<string>Smooth PID response, preferred for photography</string>
1114+
</property>
11271115
<property name="styleSheet">
11281116
<string notr="true">background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
11291117
color: rgb(255, 255, 255);
@@ -1159,6 +1147,9 @@ font:bold;</string>
11591147
<height>16777215</height>
11601148
</size>
11611149
</property>
1150+
<property name="toolTip">
1151+
<string>Quick PID response, preferred for racing</string>
1152+
</property>
11621153
<property name="styleSheet">
11631154
<string notr="true">background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
11641155
color: rgb(255, 255, 255);
@@ -1183,7 +1174,7 @@ font:bold;</string>
11831174
</size>
11841175
</property>
11851176
<property name="toolTip">
1186-
<string>Smooth - Quick value for PID calc based on AutoTune measurements.</string>
1177+
<string>Smooth - Normal - Quick PID response desired for PID calc based on AutoTune measurements.</string>
11871178
</property>
11881179
<property name="minimum">
11891180
<number>-10</number>
@@ -1239,6 +1230,9 @@ font:bold;</string>
12391230
<height>16777215</height>
12401231
</size>
12411232
</property>
1233+
<property name="toolTip">
1234+
<string>Normal PID response</string>
1235+
</property>
12421236
<property name="styleSheet">
12431237
<string notr="true">background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
12441238
color: rgb(255, 255, 255);
@@ -1317,7 +1311,7 @@ font:bold;</string>
13171311
<item row="3" column="1">
13181312
<widget class="QComboBox" name="SmoothQuickSource">
13191313
<property name="toolTip">
1320-
<string>Choose Accessory or FMS 3x toggle method with 3, 5, 7 positions.</string>
1314+
<string>How the SmoothQuick slider is controlled, using Accessory or FMS 3x toggle method with 3, 5, 7 positions. Allow testing smooth/quick PID sets after a AutoTune flight.</string>
13211315
</property>
13221316
<property name="objrelation" stdset="0">
13231317
<stringlist>
@@ -1680,7 +1674,7 @@ font:bold;</string>
16801674
</property>
16811675
<property name="minimumSize">
16821676
<size>
1683-
<width>0</width>
1677+
<width>110</width>
16841678
<height>0</height>
16851679
</size>
16861680
</property>
@@ -1885,22 +1879,6 @@ font:bold;</string>
18851879
</property>
18861880
</widget>
18871881
</item>
1888-
<item row="1" column="3">
1889-
<widget class="QLabel" name="label">
1890-
<property name="minimumSize">
1891-
<size>
1892-
<width>110</width>
1893-
<height>0</height>
1894-
</size>
1895-
</property>
1896-
<property name="text">
1897-
<string>Complete</string>
1898-
</property>
1899-
<property name="alignment">
1900-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
1901-
</property>
1902-
</widget>
1903-
</item>
19041882
<item row="1" column="7" colspan="5">
19051883
<layout class="QHBoxLayout" name="horizontalLayout_3">
19061884
<item>
@@ -1965,25 +1943,37 @@ font:bold;</string>
19651943
</layout>
19661944
</item>
19671945
<item row="1" column="4">
1968-
<widget class="QComboBox" name="settingsComplete">
1969-
<property name="sizePolicy">
1970-
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
1971-
<horstretch>0</horstretch>
1972-
<verstretch>0</verstretch>
1973-
</sizepolicy>
1974-
</property>
1946+
<widget class="QCheckBox" name="settingsComplete">
19751947
<property name="toolTip">
1976-
<string>Automatically set True for a good complete tune or False for incomplete or bad</string>
1948+
<string>Automatically checked for a good complete tune or unchecked for incomplete or bad tune.</string>
1949+
</property>
1950+
<property name="layoutDirection">
1951+
<enum>Qt::LeftToRight</enum>
1952+
</property>
1953+
<property name="text">
1954+
<string/>
1955+
</property>
1956+
<property name="checkable">
1957+
<bool>true</bool>
19771958
</property>
19781959
<property name="objrelation" stdset="0">
1979-
<stringlist notr="true">
1960+
<stringlist>
19801961
<string>objname:SystemIdentSettings</string>
19811962
<string>fieldname:Complete</string>
1982-
<string>buttongroup:30</string>
19831963
</stringlist>
19841964
</property>
19851965
</widget>
19861966
</item>
1967+
<item row="1" column="3">
1968+
<widget class="QLabel" name="label">
1969+
<property name="text">
1970+
<string>Complete</string>
1971+
</property>
1972+
<property name="alignment">
1973+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
1974+
</property>
1975+
</widget>
1976+
</item>
19871977
</layout>
19881978
</widget>
19891979
</item>
@@ -2072,7 +2062,7 @@ font:bold;</string>
20722062
<bool>true</bool>
20732063
</property>
20742064
<property name="sizePolicy">
2075-
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
2065+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
20762066
<horstretch>0</horstretch>
20772067
<verstretch>0</verstretch>
20782068
</sizepolicy>

‎ground/gcs/src/plugins/config/configautotunewidget.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ void ConfigAutoTuneWidget::refreshWidgetsValuesImpl(UAVObject *obj)
8484
bool moduleRunning = (taskInfo->runningAutoTune() == TaskInfo_Running::True);
8585

8686
if (obj == systemIdentStateObj) {
87-
m_autotune->stateComplete->setText((systemIdentStateObj->getComplete() == SystemIdentState::COMPLETE_TRUE) ? tr("True") : tr("False"));
88-
8987
QString message;
9088
QString tooltip_message;
9189
QString color;

0 commit comments

Comments
 (0)