Skip to content

Q
qgroundcontrol
Unverified Commit e42fd916 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #6999 from DonLakeFlyer/RadioSetup 

Radio setup: Rework ui
parents dff4c0ef 75f419d6
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 77 deletions
src/AutoPilotPlugins/Common/RadioComponent.qml
View file @ e42fd916
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
* *
****************************************************************************/ ****************************************************************************/
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.11
import QGroundControl 1.0 import QGroundControl 1.0
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
...@@ -348,9 +348,8 @@ SetupPage { ...@@ -348,9 +348,8 @@ SetupPage {
} }
Connections { Connections {
target: controller target: controller
onThrottleChannelRCValueChanged: throttleLoader.item.rcValue = rcValue
onThrottleChannelRCValueChanged: throttleLoader.item.rcValue = rcValue
} }
} }
} // Column - Attitude Control labels } // Column - Attitude Control labels
...@@ -362,15 +361,13 @@ SetupPage { ...@@ -362,15 +361,13 @@ SetupPage {
QGCButton { QGCButton {
id: skipButton id: skipButton
text: qsTr("Skip") text: qsTr("Skip")
onClicked: controller.skipButtonClicked()
onClicked: controller.skipButtonClicked()
} }
QGCButton { QGCButton {
id: cancelButton id: cancelButton
text: qsTr("Cancel") text: qsTr("Cancel")
onClicked: controller.cancelButtonClicked()
onClicked: controller.cancelButtonClicked()
} }
QGCButton { QGCButton {
...@@ -395,11 +392,6 @@ SetupPage { ...@@ -395,11 +392,6 @@ SetupPage {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
} }
Item {
width: 10
height: defaultTextHeight * 4
}
Rectangle { Rectangle {
width: parent.width width: parent.width
height: 1 height: 1
...@@ -409,42 +401,50 @@ SetupPage { ...@@ -409,42 +401,50 @@ SetupPage {
QGCLabel { text: qsTr("Additional Radio setup:") } QGCLabel { text: qsTr("Additional Radio setup:") }
QGCButton { GridLayout {
id: bindButton id: switchSettingsGrid
text: qsTr("Spektrum Bind") anchors.left: parent.left
anchors.right: parent.right
onClicked: showDialog(spektrumBindDialogComponent, dialogTitle, radioPage.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel) columns: 2
} columnSpacing: ScreenTools.defaultFontPixelWidth
QGCButton { Repeater {
text: qsTr("Copy Trims") model: QGroundControl.multiVehicleManager.activeVehicle.px4Firmware ?
onClicked: showDialog(copyTrimsDialogComponent, dialogTitle, radioPage.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel) (QGroundControl.multiVehicleManager.activeVehicle.multiRotor ?
} [ "RC_MAP_AUX1", "RC_MAP_AUX2", "RC_MAP_PARAM1", "RC_MAP_PARAM2", "RC_MAP_PARAM3"] :
[ "RC_MAP_FLAPS", "RC_MAP_AUX1", "RC_MAP_AUX2", "RC_MAP_PARAM1", "RC_MAP_PARAM2", "RC_MAP_PARAM3"]) :
0
Repeater { RowLayout {
model: QGroundControl.multiVehicleManager.activeVehicle.px4Firmware ? Layout.fillWidth: true
(QGroundControl.multiVehicleManager.activeVehicle.multiRotor ?
[ "RC_MAP_AUX1", "RC_MAP_AUX2", "RC_MAP_PARAM1", "RC_MAP_PARAM2", "RC_MAP_PARAM3"] :
[ "RC_MAP_FLAPS", "RC_MAP_AUX1", "RC_MAP_AUX2", "RC_MAP_PARAM1", "RC_MAP_PARAM2", "RC_MAP_PARAM3"]) :
0
Row { property Fact fact: controller.getParameterFact(-1, modelData)
spacing: ScreenTools.defaultFontPixelWidth
property Fact fact: controller.getParameterFact(-1, modelData)
QGCLabel { QGCLabel {
anchors.baseline: optCombo.baseline Layout.fillWidth: true
text: fact.shortDescription + ":" text: fact.shortDescription
}
FactComboBox {
width: ScreenTools.defaultFontPixelWidth * 15
fact: parent.fact
indexModel: false
}
} }
}
}
FactComboBox { RowLayout {
id: optCombo QGCButton {
width: ScreenTools.defaultFontPixelWidth * 15 id: bindButton
fact: parent.fact text: qsTr("Spektrum Bind")
indexModel: false onClicked: showDialog(spektrumBindDialogComponent, dialogTitle, radioPage.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel)
}
} }
} // Repeater
QGCButton {
text: qsTr("Copy Trims")
onClicked: showDialog(copyTrimsDialogComponent, dialogTitle, radioPage.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel)
}
}
} // Column - Left Column } // Column - Left Column
Item { Item {
...@@ -458,7 +458,7 @@ SetupPage { ...@@ -458,7 +458,7 @@ SetupPage {
id: rightColumn id: rightColumn
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
width: Math.min(radioPage.defaultTextWidth * 35, availableWidth * 0.4) width: ScreenTools.defaultFontPixelWidth * 40
spacing: ScreenTools.defaultFontPixelHeight / 2 spacing: ScreenTools.defaultFontPixelHeight / 2
Row { Row {
...@@ -491,7 +491,8 @@ SetupPage { ...@@ -491,7 +491,8 @@ SetupPage {
} }
RCChannelMonitor { RCChannelMonitor {
width: parent.width width: parent.width
twoColumn: true
} }
} // Column - Right Column } // Column - Right Column
} // Item } // Item
......
src/comm/MockLink.cc
View file @ e42fd916
...@@ -1220,16 +1220,10 @@ void MockLink::_sendRCChannels(void) ...@@ -1220,16 +1220,10 @@ void MockLink::_sendRCChannels(void)
_mavlinkChannel, _mavlinkChannel,
&msg, &msg,
0, // time_boot_ms 0, // time_boot_ms
8, // chancount 16, // chancount
1500, // chan1_raw 1500, 1500, 1500, 1500, 1500, 1500, 1500, 1500, // channel 1-8
1500, // chan2_raw 1500, 1500, 1500, 1500, 1500, 1500, 1500, 1500, // channel 9-16
1500, // chan3_raw UINT16_MAX, UINT16_MAX,
1500, // chan4_raw
1500, // chan5_raw
1500, // chan6_raw
1500, // chan7_raw
1500, // chan8_raw
UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX,
0); // rssi 0); // rssi
respondWithMavlinkMessage(msg); respondWithMavlinkMessage(msg);
......
src/ui/MainWindow.cc
View file @ e42fd916
...@@ -131,9 +131,6 @@ MainWindow::MainWindow() ...@@ -131,9 +131,6 @@ MainWindow::MainWindow()
emit initStatusChanged(tr("Setting up user interface"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141)); emit initStatusChanged(tr("Setting up user interface"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
_ui.setupUi(this); _ui.setupUi(this);
// Make sure tool bar elements all fit before changing minimum width
setMinimumWidth(1024);
setMinimumHeight(620);
configureWindowName(); configureWindowName();
// Setup central widget with a layout to hold the views // Setup central widget with a layout to hold the views
......
src/ui/MainWindow.ui
View file @ e42fd916
...@@ -10,12 +10,6 @@ ...@@ -10,12 +10,6 @@
<height>600</height> <height>600</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>640</width>
<height>400</height>
</size>
</property>
<property name="baseSize"> <property name="baseSize">
<size> <size>
<width>1100</width> <width>1100</width>
...@@ -31,20 +25,7 @@ ...@@ -31,20 +25,7 @@
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>
</property> </property>
<widget class="QWidget" name="centralWidget"> <widget class="QWidget" name="centralWidget"/>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>150</height>
</size>
</property>
</widget>
<widget class="QMenuBar" name="menuBar"> <widget class="QMenuBar" name="menuBar">
<property name="geometry"> <property name="geometry">
<rect> <rect>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment