diff --git a/ground/gcs/src/plugins/config/stabilization.ui b/ground/gcs/src/plugins/config/stabilization.ui index 56ab3d919..1668f51b2 100644 --- a/ground/gcs/src/plugins/config/stabilization.ui +++ b/ground/gcs/src/plugins/config/stabilization.ui @@ -149,6 +149,12 @@ + + + 0 + 0 + + ArrowCursor @@ -167,16 +173,22 @@ margin-top: -1px; + + + 0 + 0 + + 0 - 340 + 400 16777215 - 340 + 400 @@ -189,287 +201,32 @@ margin-top: -1px; 0 - - - - Acro+ - - - - - - - 0 - 0 - - - - Qt::StrongFocus - - - <html><head/><body><p>Link roll &amp; pitch sliders to move together</p></body></html> - - - - - - Link Roll and Pitch - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Reset all values to GCS defaults - - - false - - - - - - Default - - - - button:default - buttongroup:77 - - - - - - - - 0 - - - - - - 0 - 25 - - - - <html><head/><body><p>The Acro + slider can be adjusted to change the amount of manual control blending.</p></body></html> - - - 0 - - - 100 - - - 1 - - - 50 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 5 - - - - objname:StabilizationSettingsBankX - fieldname:AcroInsanityFactor - scale:1 - buttongroup:77 - element:Roll - - - - - - - - - 60 - 22 - - - - - 60 - 22 - - - - 0 - - - 100 - - - 50 - - - - objname:StabilizationSettingsBankX - fieldname:AcroInsanityFactor - scale:1 - buttongroup:77 - element:Roll - - - - - - - - - 0 - 0 - - - - - 80 - 0 - - - - Roll Factor - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 25 - - - - <html><head/><body><p>The Acro + slider can be adjusted to change the amount of manual control blending.</p></body></html> - - - 0 - - - 100 - - - 1 - - - 50 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 5 - - - - objname:StabilizationSettingsBankX - fieldname:AcroInsanityFactor - scale:1 - buttongroup:77 - element:Pitch - - - - - - - - - 60 - 22 - - - - - 60 - 22 - - - - 0 - - - 100 - - - 50 - - - - objname:StabilizationSettingsBankX - fieldname:AcroInsanityFactor - scale:1 - buttongroup:77 - element:Pitch - - - - - - - - - 0 - 0 - - - - - 80 - 0 - - - - Pitch Factor - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - + + 9 + + + 10 + + + true + + + + 0 + 0 + + + + + 0 + 0 + + - 300 + 260 16777215 @@ -627,11 +384,29 @@ margin-top: -1px; - + 0 0 + + + 220 + 220 + + + + + 0 + 0 + + + + + 0 + 0 + + <html><head/><body><p>This graph shows the Expo curves for all axis. The color of the curves corresponds with the colors of the slider labels below.</p></body></html> @@ -934,7 +709,7 @@ margin-top: -1px; - 550 + 450 0 @@ -1015,7 +790,7 @@ margin-top: -1px; 0 - 0 + 6 @@ -1063,7 +838,7 @@ margin-top: -1px; 80 - 16 + 0 @@ -1638,11 +1413,11 @@ border-radius: 5; 80 - 16 + 0 - Rate yaw + Rate Yaw Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2251,7 +2026,7 @@ border-radius: 5; 100 - 800 + 1000 400 @@ -2323,7 +2098,7 @@ border-radius: 5; 80 - 16 + 0 @@ -3003,6 +2778,288 @@ border-radius: 5; + + + + + 0 + 0 + + + + Acro+ + + + + + + + 0 + 0 + + + + Qt::StrongFocus + + + <html><head/><body><p>Link roll &amp; pitch sliders to move together</p></body></html> + + + + + + Link Roll and Pitch + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Reset all values to GCS defaults + + + false + + + + + + Default + + + + button:default + buttongroup:77 + + + + + + + + 0 + + + + + + 0 + 25 + + + + <html><head/><body><p>The Acro + slider can be adjusted to change the amount of manual control blending.</p></body></html> + + + 0 + + + 100 + + + 1 + + + 50 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 5 + + + + objname:StabilizationSettingsBankX + fieldname:AcroInsanityFactor + scale:1 + buttongroup:77 + element:Roll + + + + + + + + + 60 + 22 + + + + + 60 + 22 + + + + 0 + + + 100 + + + 50 + + + + objname:StabilizationSettingsBankX + fieldname:AcroInsanityFactor + scale:1 + buttongroup:77 + element:Roll + + + + + + + + + 0 + 0 + + + + + 80 + 0 + + + + Roll Factor + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 25 + + + + <html><head/><body><p>The Acro + slider can be adjusted to change the amount of manual control blending.</p></body></html> + + + 0 + + + 100 + + + 1 + + + 50 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 5 + + + + objname:StabilizationSettingsBankX + fieldname:AcroInsanityFactor + scale:1 + buttongroup:77 + element:Pitch + + + + + + + + + 60 + 22 + + + + + 60 + 22 + + + + 0 + + + 100 + + + 50 + + + + objname:StabilizationSettingsBankX + fieldname:AcroInsanityFactor + scale:1 + buttongroup:77 + element:Pitch + + + + + + + + + 0 + 0 + + + + + 80 + 0 + + + + Pitch Factor + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + @@ -9024,7 +9081,7 @@ response (deg/s) 0 - 1000000.000000000000000 + 2000.000000000000000 1.000000000000000 @@ -9077,7 +9134,7 @@ response (deg/s) 0 - 1000000.000000000000000 + 2000.000000000000000 1.000000000000000 @@ -9694,7 +9751,7 @@ border-radius: 5; 0 - 1000000.000000000000000 + 2000.000000000000000 1.000000000000000 @@ -10352,7 +10409,7 @@ border-radius: 5; 0 - 1000000.000000000000000 + 2000.000000000000000 1.000000000000000 @@ -10405,7 +10462,7 @@ border-radius: 5; 0 - 1000000.000000000000000 + 2000.000000000000000 1.000000000000000 @@ -10458,7 +10515,7 @@ border-radius: 5; 0 - 1000000.000000000000000 + 2000.000000000000000 1.000000000000000