From af38a105df7d7b9186b34037fd14a4318d069141 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 4 Feb 2015 10:22:07 -0800 Subject: [PATCH] Re-implemented Setup View --- files/Setup/cogwheels.png | Bin 0 -> 10484 bytes qgroundcontrol.pro | 10 +- qgroundcontrol.qrc | 13 +- qml/QGroundControl/Controls/SetupButton.qml | 88 ++++++++++++ qml/QGroundControl/Controls/qmldir | 2 + src/VehicleSetup/SetupView.cc | 125 +++++++++--------- src/VehicleSetup/SetupView.h | 20 ++- src/VehicleSetup/SetupView.ui | 90 +++++++++++++ src/VehicleSetup/SetupViewButtons.qml | 88 ++++++++++++ src/VehicleSetup/SetupWidgetHolder.ui | 40 ------ ...upViewConnected.qml => VehicleSummary.qml} | 33 +---- src/test.qml | 14 +- 12 files changed, 370 insertions(+), 153 deletions(-) create mode 100644 files/Setup/cogwheels.png create mode 100644 qml/QGroundControl/Controls/SetupButton.qml create mode 100644 qml/QGroundControl/Controls/qmldir create mode 100644 src/VehicleSetup/SetupView.ui create mode 100644 src/VehicleSetup/SetupViewButtons.qml delete mode 100644 src/VehicleSetup/SetupWidgetHolder.ui rename src/VehicleSetup/{SetupViewConnected.qml => VehicleSummary.qml} (71%) diff --git a/files/Setup/cogwheels.png b/files/Setup/cogwheels.png new file mode 100644 index 0000000000000000000000000000000000000000..7ef3297fed5815fe15293da65e7cddf17ab25aab GIT binary patch literal 10484 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 cH*Ua3V5Uz$zxO8r^@$)26src/test.qml qml/QGroundControl/FactControls/qmldir - - - qml/QGroundControl/FactControls/SetupButton.qml qml/QGroundControl/FactControls/FactLabel.qml qml/QGroundControl/FactControls/FactTextField.qml qml/QGroundControl/FactControls/FactCheckBox.qml + qml/QGroundControl/Controls/qmldir + qml/QGroundControl/Controls/SetupButton.qml + files/images/px4/airframes/octo_x.png files/images/px4/boards/px4fmu_2.x.png - src/VehicleSetup/SetupViewConnected.qml - src/VehicleSetup/SetupViewDisconnected.qml - src/VehicleSetup/SetupPane.qml + src/VehicleSetup/SetupViewButtons.qml + src/VehicleSetup/VehicleSummary.qml src/AutoPilotPlugins/PX4/SafetyComponent.qml @@ -263,6 +262,8 @@ src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml + files/Setup/cogwheels.png + diff --git a/qml/QGroundControl/Controls/SetupButton.qml b/qml/QGroundControl/Controls/SetupButton.qml new file mode 100644 index 000000000..64b720663 --- /dev/null +++ b/qml/QGroundControl/Controls/SetupButton.qml @@ -0,0 +1,88 @@ +import QtQuick 2.2 +import QtQuick.Controls 1.2 +import QtQuick.Controls.Styles 1.2 +import QtGraphicalEffects 1.0 +import QGroundControl.FactSystem 1.0 + +Button { + checkable: true + height: 80 + + text: "Button" + property bool setupComplete: true + property bool setupIndicator: true + + style: ButtonStyle { + id: buttonStyle + + property var __qgcpal: QGCPalette { + colorGroup: control.enabled ? QGCPalette.Active : QGCPalette.Disabled + } + + background: Rectangle { + id: innerRect + readonly property real titleHeight: 30 + + border.color: control.checked ? "#eee333" : "#676767" + radius: 10 + + color: control.checked ? "#eee333" : "#343434" + + Text { + id: titleBar + + width: parent.width + height: parent.titleHeight + + verticalAlignment: TextEdit.AlignVCenter + horizontalAlignment: TextEdit.AlignHCenter + + text: control.text + font.pixelSize: 12 + color: control.checked ? "black" : "white" + + Rectangle { + id: setupIndicator + + readonly property real indicatorRadius: 6 + + x: parent.width - (indicatorRadius * 2) - 5 + y: (parent.height - (indicatorRadius * 2)) / 2 + width: indicatorRadius * 2 + height: indicatorRadius * 2 + + radius: indicatorRadius + color: control.setupIndicator ? (control.setupComplete ? "green" : "red") : innerRect.color + } + } + + Rectangle { + width: parent.width + height: parent.height - parent.titleHeight + + y: parent.titleHeight + + color: __qgcpal.window + border.color: control.checked ? "#eee333" : "#676767" + + Image { + id: buttonImage + source: "setupButtonImage.png" + sourceSize: Qt.size(parent.width - 20, parent.height - 20) + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + smooth: true + visible: false + } + + ColorOverlay { + anchors.fill: buttonImage + source: buttonImage + color: control.checked ? "#eee333" : "#58585a" + } + } + } + + label: Item {} + } +} diff --git a/qml/QGroundControl/Controls/qmldir b/qml/QGroundControl/Controls/qmldir new file mode 100644 index 000000000..48c30e1a2 --- /dev/null +++ b/qml/QGroundControl/Controls/qmldir @@ -0,0 +1,2 @@ +Module QGroundControl.Controls +SetupButton 1.0 SetupButton.qml \ No newline at end of file diff --git a/src/VehicleSetup/SetupView.cc b/src/VehicleSetup/SetupView.cc index d48af88e4..fd13f54e7 100644 --- a/src/VehicleSetup/SetupView.cc +++ b/src/VehicleSetup/SetupView.cc @@ -25,13 +25,14 @@ /// @author Don Gagne #include "SetupView.h" +#include "ui_SetupView.h" #include "UASManager.h" #include "AutoPilotPluginManager.h" #include "VehicleComponent.h" #include "PX4FirmwareUpgrade.h" #include "ParameterEditor.h" -#include "SetupWidgetHolder.h" +#include "QGCQmlWidgetHolder.h" #include "MainWindow.h" #include "QGCMessageBox.h" @@ -40,16 +41,38 @@ #include SetupView::SetupView(QWidget* parent) : - QGCQuickWidget(parent), + QWidget(parent), _uasCurrent(NULL), _initComplete(false), - _autoPilotPlugin(NULL) + _autoPilotPlugin(NULL), + _currentSetupWidget(NULL), + _ui(new Ui::SetupView) { + _ui->setupUi(this); + bool fSucceeded = connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(_setActiveUAS(UASInterface*))); Q_UNUSED(fSucceeded); Q_ASSERT(fSucceeded); - setResizeMode(SizeRootObjectToView); + //setResizeMode(SizeRootObjectToView); + + _ui->buttonHolder->setAutoPilot(NULL); + _ui->buttonHolder->setSource(QUrl::fromUserInput("qrc:/qml/SetupViewButtons.qml")); + + QObject* rootObject = (QObject*)_ui->buttonHolder->rootObject(); + Q_ASSERT(rootObject); + + fSucceeded = connect(rootObject, SIGNAL(setupButtonClicked(QVariant)), this, SLOT(_setupButtonClicked(QVariant))); + Q_ASSERT(fSucceeded); + + fSucceeded = connect(rootObject, SIGNAL(firmwareButtonClicked()), this, SLOT(_firmwareButtonClicked())); + Q_ASSERT(fSucceeded); + + fSucceeded = connect(rootObject, SIGNAL(parametersButtonClicked()), this, SLOT(_parametersButtonClicked())); + Q_ASSERT(fSucceeded); + + fSucceeded = connect(rootObject, SIGNAL(summaryButtonClicked()), this, SLOT(_summaryButtonClicked())); + Q_ASSERT(fSucceeded); _setActiveUAS(UASManager::instance()->getActiveUAS()); } @@ -63,10 +86,16 @@ void SetupView::_setActiveUAS(UASInterface* uas) { if (_uasCurrent) { Q_ASSERT(_autoPilotPlugin); - disconnect(_autoPilotPlugin); - _autoPilotPlugin = NULL; + disconnect(_autoPilotPlugin, &AutoPilotPlugin::pluginReady, this, &SetupView::_pluginReady); } + _autoPilotPlugin = NULL; + _ui->buttonHolder->setAutoPilot(NULL); + _firmwareButtonClicked(); + QObject* button = _ui->buttonHolder->rootObject()->findChild("firmwareButton"); + Q_ASSERT(button); + button->setProperty("checked", true); + _uasCurrent = uas; if (_uasCurrent) { @@ -74,48 +103,27 @@ void SetupView::_setActiveUAS(UASInterface* uas) connect(_autoPilotPlugin, &AutoPilotPlugin::pluginReady, this, &SetupView::_pluginReady); if (_autoPilotPlugin->pluginIsReady()) { - _setConnectedView(); + _pluginReady(); } - } else { - _setDisconnectedView(); } } void SetupView::_pluginReady(void) { - _setConnectedView(); -} - -void SetupView::_setViewConnections(void) -{ - QObject*button = rootObject()->findChild("firmwareButton"); + _ui->buttonHolder->setAutoPilot(_autoPilotPlugin); + _summaryButtonClicked(); + QObject* button = _ui->buttonHolder->rootObject()->findChild("summaryButton"); Q_ASSERT(button); - connect(button, SIGNAL(clicked()), this, SLOT(_firmwareButtonClicked())); - - button = rootObject()->findChild("parametersButton"); - if (button) { - connect(button, SIGNAL(clicked()), this, SLOT(_parametersButtonClicked())); - } + button->setProperty("checked", true); } -void SetupView::_setDisconnectedView(void) +void SetupView::_changeSetupWidget(QWidget* newWidget) { - setSource(QUrl::fromUserInput("qrc:qml/SetupViewDisconnected.qml")); - _setViewConnections(); -} - -void SetupView::_setConnectedView(void) -{ - Q_ASSERT(_uasCurrent); - Q_ASSERT(_autoPilotPlugin); - - setAutoPilot(_autoPilotPlugin); - - setSource(QUrl::fromUserInput("qrc:qml/SetupViewConnected.qml")); - disconnect(_autoPilotPlugin); - _setViewConnections(); - - connect((QObject*)rootObject(), SIGNAL(buttonClicked(QVariant)), this, SLOT(_setupButtonClicked(QVariant))); + if (_currentSetupWidget) { + delete _currentSetupWidget; + } + _currentSetupWidget = newWidget; + _ui->setupWidgetLayout->addWidget(newWidget); } void SetupView::_firmwareButtonClicked(void) @@ -125,24 +133,27 @@ void SetupView::_firmwareButtonClicked(void) return; } - SetupWidgetHolder* dialog = new SetupWidgetHolder(MainWindow::instance()); - dialog->setModal(true); - dialog->setWindowTitle("Firmware Upgrade"); - - PX4FirmwareUpgrade* setup = new PX4FirmwareUpgrade(dialog); - dialog->setInnerWidget(setup); - dialog->exec(); + PX4FirmwareUpgrade* setup = new PX4FirmwareUpgrade(this); + _changeSetupWidget(setup); } void SetupView::_parametersButtonClicked(void) { - SetupWidgetHolder* dialog = new SetupWidgetHolder(MainWindow::instance()); - dialog->setModal(true); - dialog->setWindowTitle("Parameter Editor"); + ParameterEditor* setup = new ParameterEditor(_uasCurrent, QStringList(), this); + _changeSetupWidget(setup); +} + +void SetupView::_summaryButtonClicked(void) +{ + Q_ASSERT(_autoPilotPlugin); - ParameterEditor* setup = new ParameterEditor(_uasCurrent, QStringList(), dialog); - dialog->setInnerWidget(setup); - dialog->exec(); + QGCQmlWidgetHolder* summary = new QGCQmlWidgetHolder; + Q_CHECK_PTR(summary); + + summary->setAutoPilot(_autoPilotPlugin); + summary->setSource(QUrl::fromUserInput("qrc:/qml/VehicleSummary.qml")); + + _changeSetupWidget(summary); } void SetupView::_setupButtonClicked(const QVariant& component) @@ -161,15 +172,5 @@ void SetupView::_setupButtonClicked(const QVariant& component) return; } - SetupWidgetHolder dialog(MainWindow::instance()); - dialog.setModal(true); - dialog.setWindowTitle(vehicle->name()); - - QWidget* setupWidget = vehicle->setupWidget(); - - dialog.resize(setupWidget->minimumSize()); - dialog.setInnerWidget(setupWidget); - dialog.exec(); - - delete setupWidget; + _changeSetupWidget(vehicle->setupWidget()); } diff --git a/src/VehicleSetup/SetupView.h b/src/VehicleSetup/SetupView.h index 24f974eba..8c4a6bc8e 100644 --- a/src/VehicleSetup/SetupView.h +++ b/src/VehicleSetup/SetupView.h @@ -24,18 +24,22 @@ #ifndef SETUPVIEW_H #define SETUPVIEW_H - #include "UASInterface.h" #include "ParameterEditor.h" #include "VehicleComponent.h" -#include "QGCQuickWidget.h" #include "AutoPilotPlugin.h" +#include + /// @file /// @brief This class is used to display the UI for the VehicleComponent objects. /// @author Don Gagne -class SetupView : public QGCQuickWidget +namespace Ui { + class SetupView; +} + +class SetupView : public QWidget { Q_OBJECT @@ -48,16 +52,18 @@ private slots: void _pluginReady(void); void _firmwareButtonClicked(void); void _parametersButtonClicked(void); + void _summaryButtonClicked(void); void _setupButtonClicked(const QVariant& component); private: - void _setConnectedView(void); - void _setDisconnectedView(void); - void _setViewConnections(void); - + void _changeSetupWidget(QWidget* newWidget); + UASInterface* _uasCurrent; ///< Currently active UAS bool _initComplete; ///< true: parameters are ready and ui has been setup AutoPilotPlugin* _autoPilotPlugin; + QWidget* _currentSetupWidget; + + Ui::SetupView* _ui; }; #endif diff --git a/src/VehicleSetup/SetupView.ui b/src/VehicleSetup/SetupView.ui new file mode 100644 index 000000000..d5bc228c6 --- /dev/null +++ b/src/VehicleSetup/SetupView.ui @@ -0,0 +1,90 @@ + + + SetupView + + + + 0 + 0 + 946 + 821 + + + + Form + + + + + + + 0 + 0 + + + + + 160 + 0 + + + + + 160 + 16777215 + + + + QGCQuickWidget::SizeRootObjectToView + + + + + + + + 0 + 0 + 400 + 300 + + + + Form + + + true + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + QGCQuickWidget + QQuickWidget +
QGCQuickWidget.h
+ 1 + + + + + diff --git a/src/VehicleSetup/SetupViewButtons.qml b/src/VehicleSetup/SetupViewButtons.qml new file mode 100644 index 000000000..8d8aa34a7 --- /dev/null +++ b/src/VehicleSetup/SetupViewButtons.qml @@ -0,0 +1,88 @@ +import QtQuick 2.2 +import QtQuick.Controls 1.2 +import QtQuick.Controls.Styles 1.2 +import QGroundControl.FactSystem 1.0 +import QGroundControl.Controls 1.0 + +Rectangle { + id: topLevel + + QGCPalette { id: palette; colorGroup: QGCPalette.Active } + color: palette.window + + signal firmwareButtonClicked; + signal summaryButtonClicked; + signal parametersButtonClicked; + signal setupButtonClicked(variant component); + + ExclusiveGroup { id: setupButtonGroup } + + Component { + id: disconnectedButtons + + Column { + spacing: 10 + + SetupButton { + id: firmwareButton; objectName: "firmwareButton" + width: parent.width + text: "FIRMWARE" + setupIndicator: false + exclusiveGroup: setupButtonGroup + onClicked: topLevel.firmwareButtonClicked() + } + } + } + + Component { + id: connectedButtons + + Column { + spacing: 10 + + SetupButton { + id: summaryButton; objectName: "summaryButton" + width: parent.width + text: "VEHICLE SUMMARY" + setupIndicator: false + exclusiveGroup: setupButtonGroup + onClicked: topLevel.summaryButtonClicked() + } + + SetupButton { + id: firmwareButton; objectName: "firmwareButton" + width: parent.width + text: "FIRMWARE" + setupIndicator: false + exclusiveGroup: setupButtonGroup + onClicked: topLevel.firmwareButtonClicked() + } + + Repeater { + model: autopilot.components + + SetupButton { + width: parent.width + text: modelData.name.toUpperCase() + setupComplete: modelData.setupComplete + exclusiveGroup: setupButtonGroup + onClicked: topLevel.setupButtonClicked(modelData) + } + } + + SetupButton { + width: parent.width + text: "PARAMETERS" + setupIndicator: false + exclusiveGroup: setupButtonGroup + onClicked: topLevel.parametersButtonClicked() + } + } + } + + + Loader { + anchors.fill: parent + sourceComponent: autopilot ? connectedButtons : disconnectedButtons + } +} diff --git a/src/VehicleSetup/SetupWidgetHolder.ui b/src/VehicleSetup/SetupWidgetHolder.ui deleted file mode 100644 index 05e3a0b9b..000000000 --- a/src/VehicleSetup/SetupWidgetHolder.ui +++ /dev/null @@ -1,40 +0,0 @@ - - - SetupWidgetHolder - - - - 0 - 0 - 400 - 300 - - - - Form - - - true - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - diff --git a/src/VehicleSetup/SetupViewConnected.qml b/src/VehicleSetup/VehicleSummary.qml similarity index 71% rename from src/VehicleSetup/SetupViewConnected.qml rename to src/VehicleSetup/VehicleSummary.qml index cd2956d62..8569e290c 100644 --- a/src/VehicleSetup/SetupViewConnected.qml +++ b/src/VehicleSetup/VehicleSummary.qml @@ -4,34 +4,29 @@ import QtQuick.Controls.Styles 1.2 import QGroundControl.FactSystem 1.0 Rectangle { + width: 600 + height: 400 + QGCPalette { id: palette; colorGroup: QGCPalette.Active } id: topLevel objectName: "topLevel" color: palette.window - - signal buttonClicked(variant component); - Image { anchors.fill: parent fillMode: Image.PreserveAspectFit smooth: true source: autopilot.setupBackgroundImage; } - Column { anchors.margins: 20 anchors.fill: parent spacing: 5 - Rectangle { id: header; color: "lightblue"; radius: 10.0; width: parent.width; height: titleText.height + 20; opacity: 0.8; - Text { id: titleText; anchors.centerIn: parent; font.pointSize: 24; text: "Vehicle Setup" } - } - Flow { width: parent.width; - height: parent.height - header.height - footer.height + height: parent.height spacing: 5 Repeater { @@ -54,9 +49,8 @@ Rectangle { border.color: "#888" radius: 10 - color: control.activeFocus ? "#47b" : "white" - opacity: control.hovered || control.activeFocus ? 1 : 0.8 - Behavior on opacity {NumberAnimation{ duration: 100 }} + color: "white" + opacity: 0.8 Text { id: titleBar @@ -108,23 +102,8 @@ Rectangle { label: Item {} } - - onClicked: topLevel.buttonClicked(modelData) } } } - - Rectangle { id: footer; color: "lightblue"; radius: 10.0; width: parent.width; height: titleText.height + 20; opacity: 0.8; - - property real spacing: (width - firmwareButton.width - parametersButton.width) / 3 - - Button { id: firmwareButton; objectName: "firmwareButton"; - x: parent.spacing; anchors.verticalCenter: parent.verticalCenter; - text: "Firmware Upgrade" } - Button { id: parametersButton; objectName: "parametersButton" - x: firmwareButton.width + (parent.spacing*2); anchors.verticalCenter: parent.verticalCenter; - text: "Parameters" } - } - } } diff --git a/src/test.qml b/src/test.qml index e623f499a..fa45fe272 100644 --- a/src/test.qml +++ b/src/test.qml @@ -1,10 +1,14 @@ import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.2 -//import QGroundControl.FactControls 1.0 +import QGroundControl.FactControls 1.0 -Row { -width: 200 -Text { id: firstCol; text: "Col 1" } -Text { horizontalAlignment: Text.AlignRight; width: parent.width - firstCol.contentWidth; text: "Col 2" } + +Rectangle { + QGCPalette { id: palette; colorGroup: enabled ? QGCPalette.Active : QGCPalette.Disabled } + + width: 100 + height: 100 + color: "#e43f3f" + // palette.windowText } -- 2.22.0