diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp index 89d866274..0ee0875ab 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp @@ -44,6 +44,7 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa // To bring old style sheet back without adding it manually do this: // Alternatively apply a global stylesheet to the QGroupBox // setStyleSheet("QGroupBox {background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255)); border: 1px outset #999; border-radius: 3; }"); + setStyleSheet("QPushButton {\nborder: 1px outset #999;\nborder-radius: 5;\nbackground-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0.28 rgba(236, 236, 236, 255), stop:1 rgba(252, 252, 252, 255));\n}\n\nQPushButton:pressed {\n\n border-style: inset;\n background-color: qlineargradient(spread:pad, x1:0.502, y1:0.664864, x2:0.502, y2:0.034, stop:0.358209 rgba(250, 250, 250, 255), stop:0.626866 rgba(235, 235, 235, 255));\n\n}\n\n\nQPushButton:hover {\n border: 1px outset #999; \nborder-color: rgb(83, 83, 83);\nborder-radius: 4;\n}"); autoLoadWidgets(); realtimeUpdates=new QTimer(this); diff --git a/ground/openpilotgcs/src/plugins/config/input.ui b/ground/openpilotgcs/src/plugins/config/input.ui index 561e0fe9f..ae1c13963 100644 --- a/ground/openpilotgcs/src/plugins/config/input.ui +++ b/ground/openpilotgcs/src/plugins/config/input.ui @@ -261,433 +261,186 @@ 0 0 - 100 - 30 + 638 + 801 - - - - 10 - 310 - 611 - 151 - - - - - - - Configure each stabilization mode for each axis - - - - - - Stabilized3 - - - Qt::AlignCenter - - - - - - - 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)); -color: rgb(255, 255, 255); -border-radius: 5; -font: bold 12px; -margin:1px; - - - Roll - - - Qt::AlignCenter - - - - - - - - 102 - 0 - - - - Qt::StrongFocus - - - - - - - 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)); -color: rgb(255, 255, 255); -border-radius: 5; -font: bold 12px; -margin:1px; - - - Pitch - - - Qt::AlignCenter - - - - - - - Qt::StrongFocus - - - - - - - Qt::StrongFocus - - - - - - - Qt::StrongFocus - - - - - - - Stabilized1 - - - Qt::AlignCenter - - - - - - - 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)); -color: rgb(255, 255, 255); -border-radius: 5; -font: bold 12px; -margin:1px; - - - Yaw - - - Qt::AlignCenter - - - - - - - Qt::StrongFocus - - - - - - - - 102 - 0 - - - - Qt::StrongFocus - - - - - - - Qt::StrongFocus - - - - - - - Qt::StrongFocus - - - - - - - Stabilized2 - - - Qt::AlignCenter - - - - - - - - 102 - 0 - - - - Qt::StrongFocus - - - - - - - - - 10 - 20 - 611 - 231 - - - - FlightMode Switch Positions - - - - false - - - - 100 - 140 - 151 - 26 - - - - Qt::StrongFocus - - - - - false - - - - 100 - 110 - 151 - 26 - - - - Qt::StrongFocus - - - Select the stabilization mode on this position (manual/stabilized/auto) - - - - - - 10 - 115 - 62 - 17 - - - - Pos. 4 - - - - - false - - - - 100 - 170 - 151 - 26 - - - - Qt::StrongFocus - - - - - - 10 - 145 - 62 - 17 - - - - Pos. 5 - - - - - - 10 - 175 - 62 - 17 - - - - Pos. 6 - - - - - false - - - - 70 - 28 - 20 - 160 - - - - Qt::StrongFocus - - - This slider moves when you move the flight mode switch + + + + + FlightMode Switch Positions + + + + + + + + + + Pos. 1 + + + + + + + Pos. 2 + + + + + + + Pos. 3 + + + + + + + Pos. 4 + + + + + + + Pos. 5 + + + + + + + Pos. 6 + + + + + + + + + false + + + Qt::StrongFocus + + + This slider moves when you move the flight mode switch on your remote. It shows currently active flight mode. Setup the flight mode channel on the RC Input tab if you have not done so already. - - - 0 - - - 5 - - - 10 - - - 0 - - - 0 - - - Qt::Vertical - - - true - - - QSlider::TicksBelow - - - 1 - - - - - - 100 - 50 - 151 - 26 - - - - Qt::StrongFocus - - - - - - 100 - 80 - 151 - 26 - - - - Qt::StrongFocus - - - - - - 100 - 20 - 151 - 26 - - - - Qt::StrongFocus - - - Select the stabilization mode on this position (manual/stabilized/auto) - - - - - - 11 - 55 - 62 - 17 - - - - Pos. 2 - - - - - - 11 - 25 - 62 - 17 - - - - Pos. 1 - - - - - - 11 - 85 - 62 - 17 - - - - Pos. 3 - - - - - - 458 - 20 - 61 - 20 - - - - Number of positions your FlightMode switch has. + + + 0 + + + 5 + + + 10 + + + 0 + + + 0 + + + Qt::Vertical + + + true + + + QSlider::TicksBelow + + + 1 + + + + + + + + + Qt::StrongFocus + + + Select the stabilization mode on this position (manual/stabilized/auto) + + + + + + + Qt::StrongFocus + + + + + + + Qt::StrongFocus + + + + + + + false + + + Qt::StrongFocus + + + Select the stabilization mode on this position (manual/stabilized/auto) + + + + + + + false + + + Qt::StrongFocus + + + + + + + false + + + Qt::StrongFocus + + + + + + + + + + + + + + + Number of flight modes: + + + + + + + Number of positions your FlightMode switch has. Default is 3. @@ -695,53 +448,261 @@ It will be 2 or 3 for most of setups, but it also can be up to 6. In that case you have to configure your radio mixers so the whole range from min to max is split into N equal intervals, and you may set arbitrary channel value for each flight mode. - - - 1 - - - 6 - - - 3 - - - - - - 277 - 22 - 171 - 16 - - - - Number of flight modes: - - - - - - 310 - 120 - 191 - 30 - - - - - 75 - true - - - - Avoid "Manual" for multirotors! - - - true - - - + + + 1 + + + 6 + + + 3 + + + + + + + + + + 75 + true + + + + Avoid "Manual" for multirotors! + + + true + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 50 + + + + + + + + + + + Configure each stabilization mode for each axis + + + + + + Stabilized3 + + + Qt::AlignCenter + + + + + + + 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)); +color: rgb(255, 255, 255); +border-radius: 5; +font: bold 12px; +margin:1px; + + + Roll + + + Qt::AlignCenter + + + + + + + + 102 + 0 + + + + Qt::StrongFocus + + + + + + + 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)); +color: rgb(255, 255, 255); +border-radius: 5; +font: bold 12px; +margin:1px; + + + Pitch + + + Qt::AlignCenter + + + + + + + Qt::StrongFocus + + + + + + + Qt::StrongFocus + + + + + + + Qt::StrongFocus + + + + + + + Stabilized1 + + + Qt::AlignCenter + + + + + + + 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)); +color: rgb(255, 255, 255); +border-radius: 5; +font: bold 12px; +margin:1px; + + + Yaw + + + Qt::AlignCenter + + + + + + + Qt::StrongFocus + + + + + + + + 102 + 0 + + + + Qt::StrongFocus + + + + + + + Qt::StrongFocus + + + + + + + Qt::StrongFocus + + + + + + + Stabilized2 + + + Qt::AlignCenter + + + + + + + + 102 + 0 + + + + Qt::StrongFocus + + + + + + + + + + Qt::Vertical + + + + 20 + 300 + + + + + @@ -774,8 +735,8 @@ channel value for each flight mode. 0 0 - 499 - 121 + 638 + 801 diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index b09ff05ca..8e8fd71cd 100755 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -24239,25 +24239,7 @@ border-radius: 5; Useful if you have accidentally changed some settings. - QPushButton { -border: 1px outset #999; -border-radius: 5; -background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0.28 rgba(236, 236, 236, 255), stop:1 rgba(252, 252, 252, 255)); -} - -QPushButton:pressed { - - border-style: inset; - background-color: qlineargradient(spread:pad, x1:0.502, y1:0.664864, x2:0.502, y2:0.034, stop:0.358209 rgba(250, 250, 250, 255), stop:0.626866 rgba(235, 235, 235, 255)); - -} - - -QPushButton:hover { - border: 1px outset #999; -border-color: rgb(83, 83, 83); -border-radius: 4; - } + Reload Board Data @@ -24288,25 +24270,7 @@ border-radius: 4; Send settings to the board but do not save to the non-volatile memory - QPushButton { -border: 1px outset #999; -border-radius: 5; -background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0.28 rgba(236, 236, 236, 255), stop:1 rgba(252, 252, 252, 255)); -} - -QPushButton:pressed { - - border-style: inset; - background-color: qlineargradient(spread:pad, x1:0.502, y1:0.664864, x2:0.502, y2:0.034, stop:0.358209 rgba(250, 250, 250, 255), stop:0.626866 rgba(235, 235, 235, 255)); - -} - - -QPushButton:hover { - border: 1px outset #999; -border-color: rgb(83, 83, 83); -border-radius: 4; - } + Apply @@ -24336,25 +24300,7 @@ border-radius: 4; Send settings to the board and save to the non-volatile memory - QPushButton { -border: 1px outset #999; -border-radius: 5; -background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0.28 rgba(236, 236, 236, 255), stop:1 rgba(252, 252, 252, 255)); -} - -QPushButton:pressed { - - border-style: inset; - background-color: qlineargradient(spread:pad, x1:0.502, y1:0.664864, x2:0.502, y2:0.034, stop:0.358209 rgba(250, 250, 250, 255), stop:0.626866 rgba(235, 235, 235, 255)); - -} - - -QPushButton:hover { - border: 1px outset #999; -border-color: rgb(83, 83, 83); -border-radius: 4; - } + Save