From 632ddad3ade6ba332be5e7f28b2e3ab4d416f3e4 Mon Sep 17 00:00:00 2001 From: Michael Carpenter Date: Wed, 19 Jun 2013 13:18:31 -0400 Subject: [PATCH] New configuration menu setup. Placeholders for now, waiting for functionality --- qgroundcontrol.pro | 54 ++- src/ui/MainWindow.cc | 63 +++- src/ui/MainWindow.h | 11 +- src/ui/MainWindow.ui | 14 +- .../configuration/AccelCalibrationConfig.cc | 11 + src/ui/configuration/AccelCalibrationConfig.h | 19 + .../configuration/AccelCalibrationConfig.ui | 35 ++ src/ui/configuration/AirspeedConfig.cc | 11 + src/ui/configuration/AirspeedConfig.h | 19 + src/ui/configuration/AirspeedConfig.ui | 35 ++ src/ui/configuration/AntennaTrackerConfig.cc | 11 + src/ui/configuration/AntennaTrackerConfig.h | 19 + src/ui/configuration/AntennaTrackerConfig.ui | 35 ++ src/ui/configuration/ApmHardwareConfig.cc | 145 ++++++++ src/ui/configuration/ApmHardwareConfig.h | 54 +++ src/ui/configuration/ApmHardwareConfig.ui | 327 ++++++++++++++++++ src/ui/configuration/ApmSoftwareConfig.cc | 11 + src/ui/configuration/ApmSoftwareConfig.h | 19 + src/ui/configuration/ApmSoftwareConfig.ui | 99 ++++++ src/ui/configuration/BatteryMonitorConfig.cc | 11 + src/ui/configuration/BatteryMonitorConfig.h | 19 + src/ui/configuration/BatteryMonitorConfig.ui | 35 ++ src/ui/configuration/CameraGimbalConfig.cc | 11 + src/ui/configuration/CameraGimbalConfig.h | 19 + src/ui/configuration/CameraGimbalConfig.ui | 35 ++ src/ui/configuration/CompassConfig.cc | 11 + src/ui/configuration/CompassConfig.h | 19 + src/ui/configuration/CompassConfig.ui | 35 ++ src/ui/configuration/FlightModeConfig.cc | 11 + src/ui/configuration/FlightModeConfig.h | 19 + src/ui/configuration/FlightModeConfig.ui | 35 ++ src/ui/configuration/FrameTypeConfig.cc | 11 + src/ui/configuration/FrameTypeConfig.h | 19 + src/ui/configuration/FrameTypeConfig.ui | 35 ++ src/ui/configuration/OpticalFlowConfig.cc | 11 + src/ui/configuration/OpticalFlowConfig.h | 19 + src/ui/configuration/OpticalFlowConfig.ui | 35 ++ src/ui/configuration/OsdConfig.cc | 11 + src/ui/configuration/OsdConfig.h | 19 + src/ui/configuration/OsdConfig.ui | 35 ++ src/ui/configuration/Radio3DRConfig.cc | 11 + src/ui/configuration/Radio3DRConfig.h | 19 + src/ui/configuration/Radio3DRConfig.ui | 35 ++ .../configuration/RadioCalibrationConfig.cc | 11 + src/ui/configuration/RadioCalibrationConfig.h | 19 + .../configuration/RadioCalibrationConfig.ui | 35 ++ src/ui/configuration/SonarConfig.cc | 11 + src/ui/configuration/SonarConfig.h | 19 + src/ui/configuration/SonarConfig.ui | 35 ++ 49 files changed, 1616 insertions(+), 26 deletions(-) create mode 100644 src/ui/configuration/AccelCalibrationConfig.cc create mode 100644 src/ui/configuration/AccelCalibrationConfig.h create mode 100644 src/ui/configuration/AccelCalibrationConfig.ui create mode 100644 src/ui/configuration/AirspeedConfig.cc create mode 100644 src/ui/configuration/AirspeedConfig.h create mode 100644 src/ui/configuration/AirspeedConfig.ui create mode 100644 src/ui/configuration/AntennaTrackerConfig.cc create mode 100644 src/ui/configuration/AntennaTrackerConfig.h create mode 100644 src/ui/configuration/AntennaTrackerConfig.ui create mode 100644 src/ui/configuration/ApmHardwareConfig.cc create mode 100644 src/ui/configuration/ApmHardwareConfig.h create mode 100644 src/ui/configuration/ApmHardwareConfig.ui create mode 100644 src/ui/configuration/ApmSoftwareConfig.cc create mode 100644 src/ui/configuration/ApmSoftwareConfig.h create mode 100644 src/ui/configuration/ApmSoftwareConfig.ui create mode 100644 src/ui/configuration/BatteryMonitorConfig.cc create mode 100644 src/ui/configuration/BatteryMonitorConfig.h create mode 100644 src/ui/configuration/BatteryMonitorConfig.ui create mode 100644 src/ui/configuration/CameraGimbalConfig.cc create mode 100644 src/ui/configuration/CameraGimbalConfig.h create mode 100644 src/ui/configuration/CameraGimbalConfig.ui create mode 100644 src/ui/configuration/CompassConfig.cc create mode 100644 src/ui/configuration/CompassConfig.h create mode 100644 src/ui/configuration/CompassConfig.ui create mode 100644 src/ui/configuration/FlightModeConfig.cc create mode 100644 src/ui/configuration/FlightModeConfig.h create mode 100644 src/ui/configuration/FlightModeConfig.ui create mode 100644 src/ui/configuration/FrameTypeConfig.cc create mode 100644 src/ui/configuration/FrameTypeConfig.h create mode 100644 src/ui/configuration/FrameTypeConfig.ui create mode 100644 src/ui/configuration/OpticalFlowConfig.cc create mode 100644 src/ui/configuration/OpticalFlowConfig.h create mode 100644 src/ui/configuration/OpticalFlowConfig.ui create mode 100644 src/ui/configuration/OsdConfig.cc create mode 100644 src/ui/configuration/OsdConfig.h create mode 100644 src/ui/configuration/OsdConfig.ui create mode 100644 src/ui/configuration/Radio3DRConfig.cc create mode 100644 src/ui/configuration/Radio3DRConfig.h create mode 100644 src/ui/configuration/Radio3DRConfig.ui create mode 100644 src/ui/configuration/RadioCalibrationConfig.cc create mode 100644 src/ui/configuration/RadioCalibrationConfig.h create mode 100644 src/ui/configuration/RadioCalibrationConfig.ui create mode 100644 src/ui/configuration/SonarConfig.cc create mode 100644 src/ui/configuration/SonarConfig.h create mode 100644 src/ui/configuration/SonarConfig.ui diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index bf6c51e0f..edf55c06c 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -235,7 +235,22 @@ FORMS += src/ui/MainWindow.ui \ src/ui/uas/UASActionsWidget.ui \ src/ui/QGCTabbedInfoView.ui \ src/ui/UASRawStatusView.ui \ - src/ui/uas/QGCMessageView.ui + src/ui/uas/QGCMessageView.ui \ + src/ui/configuration/ApmHardwareConfig.ui \ + src/ui/configuration/ApmSoftwareConfig.ui \ + src/ui/configuration/FrameTypeConfig.ui \ + src/ui/configuration/CompassConfig.ui \ + src/ui/configuration/AccelCalibrationConfig.ui \ + src/ui/configuration/RadioCalibrationConfig.ui \ + src/ui/configuration/FlightModeConfig.ui \ + src/ui/configuration/Radio3DRConfig.ui \ + src/ui/configuration/BatteryMonitorConfig.ui \ + src/ui/configuration/SonarConfig.ui \ + src/ui/configuration/AirspeedConfig.ui \ + src/ui/configuration/OpticalFlowConfig.ui \ + src/ui/configuration/OsdConfig.ui \ + src/ui/configuration/AntennaTrackerConfig.ui \ + src/ui/configuration/CameraGimbalConfig.ui INCLUDEPATH += src \ src/ui \ src/ui/linechart \ @@ -251,7 +266,8 @@ INCLUDEPATH += src \ src/ui/watchdog \ src/ui/map3D \ src/ui/mission \ - src/ui/designer + src/ui/designer \ + src/ui/configuration HEADERS += src/MG.h \ src/QGCCore.h \ src/uas/UASInterface.h \ @@ -393,7 +409,22 @@ HEADERS += src/MG.h \ src/ui/QGCTabbedInfoView.h \ src/ui/UASRawStatusView.h \ src/ui/PrimaryFlightDisplay.h \ - src/ui/uas/QGCMessageView.h + src/ui/uas/QGCMessageView.h \ + src/ui/configuration/ApmHardwareConfig.h \ + src/ui/configuration/ApmSoftwareConfig.h \ + src/ui/configuration/FrameTypeConfig.h \ + src/ui/configuration/CompassConfig.h \ + src/ui/configuration/AccelCalibrationConfig.h \ + src/ui/configuration/RadioCalibrationConfig.h \ + src/ui/configuration/FlightModeConfig.h \ + src/ui/configuration/Radio3DRConfig.h \ + src/ui/configuration/BatteryMonitorConfig.h \ + src/ui/configuration/SonarConfig.h \ + src/ui/configuration/AirspeedConfig.h \ + src/ui/configuration/OpticalFlowConfig.h \ + src/ui/configuration/OsdConfig.h \ + src/ui/configuration/AntennaTrackerConfig.h \ + src/ui/configuration/CameraGimbalConfig.h # Google Earth is only supported on Mac OS and Windows with Visual Studio Compiler macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010|win32-msvc2012::HEADERS += src/ui/map3D/QGCGoogleEarthView.h @@ -570,7 +601,22 @@ SOURCES += src/main.cc \ src/ui/QGCTabbedInfoView.cpp \ src/ui/UASRawStatusView.cpp \ src/ui/PrimaryFlightDisplay.cpp \ - src/ui/uas/QGCMessageView.cc + src/ui/uas/QGCMessageView.cc \ + src/ui/configuration/ApmHardwareConfig.cc \ + src/ui/configuration/ApmSoftwareConfig.cc \ + src/ui/configuration/FrameTypeConfig.cc \ + src/ui/configuration/CompassConfig.cc \ + src/ui/configuration/AccelCalibrationConfig.cc \ + src/ui/configuration/RadioCalibrationConfig.cc \ + src/ui/configuration/FlightModeConfig.cc \ + src/ui/configuration/Radio3DRConfig.cc \ + src/ui/configuration/BatteryMonitorConfig.cc \ + src/ui/configuration/SonarConfig.cc \ + src/ui/configuration/AirspeedConfig.cc \ + src/ui/configuration/OpticalFlowConfig.cc \ + src/ui/configuration/OsdConfig.cc \ + src/ui/configuration/AntennaTrackerConfig.cc \ + src/ui/configuration/CameraGimbalConfig.cc # Enable Google Earth only on Mac OS and Windows with Visual Studio compiler macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010|win32-msvc2012::SOURCES += src/ui/map3D/QGCGoogleEarthView.cc diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index 54e8d226f..aaa076ba8 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -174,7 +174,9 @@ MainWindow::MainWindow(QWidget *parent): QList actions; actions << ui.actionFlightView; actions << ui.actionMissionView; - actions << ui.actionConfiguration_2; + //actions << ui.actionConfiguration_2; + actions << ui.actionHardwareConfig; + actions << ui.actionSoftwareConfig; toolBar->setPerspectiveChangeActions(actions); // Add actions for advanced users (displayed in dropdown under "advanced") @@ -472,12 +474,20 @@ void MainWindow::buildCommonWidgets() if (!configView) { configView = new SubMainWindow(this); - configView->setObjectName("VIEW_CONFIGURATION"); - configView->setCentralWidget(new QGCVehicleConfig(this)); - addCentralWidget(configView,"Config"); - centralWidgetToDockWidgetsMap[VIEW_CONFIGURATION] = QMap(); + configView->setObjectName("VIEW_HARDWARE_CONFIG"); + configView->setCentralWidget(new ApmHardwareConfig(this)); + addCentralWidget(configView,"Hardware"); + centralWidgetToDockWidgetsMap[VIEW_HARDWARE_CONFIG] = QMap(); } + if (!softwareConfigView) + { + softwareConfigView = new SubMainWindow(this); + softwareConfigView->setObjectName("VIEW_SOFTWARE_CONFIG"); + softwareConfigView->setCentralWidget(new ApmSoftwareConfig(this)); + addCentralWidget(softwareConfigView,"Software"); + centralWidgetToDockWidgetsMap[VIEW_SOFTWARE_CONFIG] = QMap(); + } if (!engineeringView) { engineeringView = new SubMainWindow(this); @@ -1413,7 +1423,9 @@ void MainWindow::connectCommonActions() perspectives->addAction(ui.actionFlightView); perspectives->addAction(ui.actionSimulation_View); perspectives->addAction(ui.actionMissionView); - perspectives->addAction(ui.actionConfiguration_2); + //perspectives->addAction(ui.actionConfiguration_2); + perspectives->addAction(ui.actionHardwareConfig); + perspectives->addAction(ui.actionSoftwareConfig); perspectives->addAction(ui.actionFirmwareUpdateView); perspectives->addAction(ui.actionUnconnectedView); perspectives->setExclusive(true); @@ -1444,10 +1456,15 @@ void MainWindow::connectCommonActions() ui.actionMissionView->setChecked(true); ui.actionMissionView->activate(QAction::Trigger); } - if (currentView == VIEW_CONFIGURATION) + if (currentView == VIEW_HARDWARE_CONFIG) + { + ui.actionHardwareConfig->setChecked(true); + ui.actionHardwareConfig->activate(QAction::Trigger); + } + if (currentView == VIEW_SOFTWARE_CONFIG) { - ui.actionConfiguration_2->setChecked(true); - ui.actionConfiguration_2->activate(QAction::Trigger); + ui.actionSoftwareConfig->setChecked(true); + ui.actionSoftwareConfig->activate(QAction::Trigger); } if (currentView == VIEW_FIRMWAREUPDATE) { @@ -1489,7 +1506,9 @@ void MainWindow::connectCommonActions() connect(ui.actionEngineersView, SIGNAL(triggered()), this, SLOT(loadEngineerView())); connect(ui.actionMissionView, SIGNAL(triggered()), this, SLOT(loadOperatorView())); connect(ui.actionUnconnectedView, SIGNAL(triggered()), this, SLOT(loadUnconnectedView())); - connect(ui.actionConfiguration_2,SIGNAL(triggered()),this,SLOT(loadConfigurationView())); + //connect(ui.actionConfiguration_2,SIGNAL(triggered()),this,SLOT(loadConfigurationView())); + connect(ui.actionHardwareConfig,SIGNAL(triggered()),this,SLOT(loadHardwareConfigView())); + connect(ui.actionSoftwareConfig,SIGNAL(triggered()),this,SLOT(loadSoftwareConfigView())); connect(ui.actionFirmwareUpdateView, SIGNAL(triggered()), this, SLOT(loadFirmwareUpdateView())); connect(ui.actionMavlinkView, SIGNAL(triggered()), this, SLOT(loadMAVLinkView())); @@ -1955,9 +1974,12 @@ void MainWindow::loadViewState() // Load defaults switch (currentView) { - case VIEW_CONFIGURATION: + case VIEW_HARDWARE_CONFIG: centerStack->setCurrentWidget(configView); break; + case VIEW_SOFTWARE_CONFIG: + centerStack->setCurrentWidget(softwareConfigView); + break; case VIEW_ENGINEER: centerStack->setCurrentWidget(engineeringView); break; @@ -2067,13 +2089,24 @@ void MainWindow::loadOperatorView() loadViewState(); } } -void MainWindow::loadConfigurationView() +void MainWindow::loadHardwareConfigView() +{ + if (currentView != VIEW_HARDWARE_CONFIG) + { + storeViewState(); + currentView = VIEW_HARDWARE_CONFIG; + ui.actionHardwareConfig->setChecked(true); + loadViewState(); + } +} + +void MainWindow::loadSoftwareConfigView() { - if (currentView != VIEW_CONFIGURATION) + if (currentView != VIEW_SOFTWARE_CONFIG) { storeViewState(); - currentView = VIEW_CONFIGURATION; - ui.actionConfiguration_2->setChecked(true); + currentView = VIEW_SOFTWARE_CONFIG; + ui.actionSoftwareConfig->setChecked(true); loadViewState(); } } diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h index f9b322961..4435268f1 100644 --- a/src/ui/MainWindow.h +++ b/src/ui/MainWindow.h @@ -82,6 +82,8 @@ This file is part of the QGROUNDCONTROL project #include "QGCMAVLinkLogPlayer.h" #include "QGCVehicleConfig.h" #include "MAVLinkDecoder.h" +#include "ApmHardwareConfig.h" +#include "ApmSoftwareConfig.h" class QGCMapTool; class QGCMAVLinkMessageSender; @@ -164,8 +166,9 @@ public slots: /** @brief Sets advanced mode, allowing for editing of tool widget locations */ void setAdvancedMode(); - /** @brief Load configuration view */ - void loadConfigurationView(); + /** @brief Load configuration views */ + void loadHardwareConfigView(); + void loadSoftwareConfigView(); /** @brief Load default view when no MAV is connected */ void loadUnconnectedView(); /** @brief Load view for pilot */ @@ -282,7 +285,8 @@ protected: VIEW_SIMULATION, VIEW_MAVLINK, VIEW_FIRMWAREUPDATE, - VIEW_CONFIGURATION, + VIEW_HARDWARE_CONFIG, + VIEW_SOFTWARE_CONFIG, VIEW_UNCONNECTED, ///< View in unconnected mode, when no UAS is available VIEW_FULL ///< All widgets shown at once } VIEW_SECTIONS; @@ -349,6 +353,7 @@ protected: QPointer plannerView; QPointer pilotView; QPointer configView; + QPointer softwareConfigView; QPointer mavlinkView; QPointer engineeringView; QPointer simView; diff --git a/src/ui/MainWindow.ui b/src/ui/MainWindow.ui index 24eef8093..f51da403f 100644 --- a/src/ui/MainWindow.ui +++ b/src/ui/MainWindow.ui @@ -51,7 +51,7 @@ 0 0 800 - 22 + 21 @@ -105,7 +105,8 @@ - + + @@ -466,7 +467,7 @@ Open the simulation view - + true @@ -475,7 +476,7 @@ :/files/images/categories/preferences-system.svg:/files/images/categories/preferences-system.svg - Config + Hardware Configuration options of the vehicle. @@ -494,6 +495,11 @@ Simulation + + + Software + + diff --git a/src/ui/configuration/AccelCalibrationConfig.cc b/src/ui/configuration/AccelCalibrationConfig.cc new file mode 100644 index 000000000..b861e6e78 --- /dev/null +++ b/src/ui/configuration/AccelCalibrationConfig.cc @@ -0,0 +1,11 @@ +#include "AccelCalibrationConfig.h" + + +AccelCalibrationConfig::AccelCalibrationConfig(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); +} + +AccelCalibrationConfig::~AccelCalibrationConfig() +{ +} diff --git a/src/ui/configuration/AccelCalibrationConfig.h b/src/ui/configuration/AccelCalibrationConfig.h new file mode 100644 index 000000000..51ae8d76f --- /dev/null +++ b/src/ui/configuration/AccelCalibrationConfig.h @@ -0,0 +1,19 @@ +#ifndef ACCELCALIBRATIONCONFIG_H +#define ACCELCALIBRATIONCONFIG_H + +#include +#include "ui_AccelCalibrationConfig.h" + +class AccelCalibrationConfig : public QWidget +{ + Q_OBJECT + +public: + explicit AccelCalibrationConfig(QWidget *parent = 0); + ~AccelCalibrationConfig(); + +private: + Ui::AccelCalibrationConfig ui; +}; + +#endif // ACCELCALIBRATIONCONFIG_H diff --git a/src/ui/configuration/AccelCalibrationConfig.ui b/src/ui/configuration/AccelCalibrationConfig.ui new file mode 100644 index 000000000..75fdd0c65 --- /dev/null +++ b/src/ui/configuration/AccelCalibrationConfig.ui @@ -0,0 +1,35 @@ + + + AccelCalibrationConfig + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + 20 + 20 + 231 + 31 + + + + <h2>Accelerometer Calibration</h2> + + + false + + + + + + diff --git a/src/ui/configuration/AirspeedConfig.cc b/src/ui/configuration/AirspeedConfig.cc new file mode 100644 index 000000000..bff387fb6 --- /dev/null +++ b/src/ui/configuration/AirspeedConfig.cc @@ -0,0 +1,11 @@ +#include "AirspeedConfig.h" + + +AirspeedConfig::AirspeedConfig(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); +} + +AirspeedConfig::~AirspeedConfig() +{ +} diff --git a/src/ui/configuration/AirspeedConfig.h b/src/ui/configuration/AirspeedConfig.h new file mode 100644 index 000000000..cd67ba49e --- /dev/null +++ b/src/ui/configuration/AirspeedConfig.h @@ -0,0 +1,19 @@ +#ifndef AIRSPEEDCONFIG_H +#define AIRSPEEDCONFIG_H + +#include +#include "ui_AirspeedConfig.h" + +class AirspeedConfig : public QWidget +{ + Q_OBJECT + +public: + explicit AirspeedConfig(QWidget *parent = 0); + ~AirspeedConfig(); + +private: + Ui::AirspeedConfig ui; +}; + +#endif // AIRSPEEDCONFIG_H diff --git a/src/ui/configuration/AirspeedConfig.ui b/src/ui/configuration/AirspeedConfig.ui new file mode 100644 index 000000000..07c97247a --- /dev/null +++ b/src/ui/configuration/AirspeedConfig.ui @@ -0,0 +1,35 @@ + + + AirspeedConfig + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + 20 + 20 + 131 + 31 + + + + <h2>Airspeed</h2> + + + false + + + + + + diff --git a/src/ui/configuration/AntennaTrackerConfig.cc b/src/ui/configuration/AntennaTrackerConfig.cc new file mode 100644 index 000000000..6b406da47 --- /dev/null +++ b/src/ui/configuration/AntennaTrackerConfig.cc @@ -0,0 +1,11 @@ +#include "AntennaTrackerConfig.h" + + +AntennaTrackerConfig::AntennaTrackerConfig(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); +} + +AntennaTrackerConfig::~AntennaTrackerConfig() +{ +} diff --git a/src/ui/configuration/AntennaTrackerConfig.h b/src/ui/configuration/AntennaTrackerConfig.h new file mode 100644 index 000000000..35271cb28 --- /dev/null +++ b/src/ui/configuration/AntennaTrackerConfig.h @@ -0,0 +1,19 @@ +#ifndef ANTENNATRACKERCONFIG_H +#define ANTENNATRACKERCONFIG_H + +#include +#include "ui_AntennaTrackerConfig.h" + +class AntennaTrackerConfig : public QWidget +{ + Q_OBJECT + +public: + explicit AntennaTrackerConfig(QWidget *parent = 0); + ~AntennaTrackerConfig(); + +private: + Ui::AntennaTrackerConfig ui; +}; + +#endif // ANTENNATRACKERCONFIG_H diff --git a/src/ui/configuration/AntennaTrackerConfig.ui b/src/ui/configuration/AntennaTrackerConfig.ui new file mode 100644 index 000000000..e259e1fce --- /dev/null +++ b/src/ui/configuration/AntennaTrackerConfig.ui @@ -0,0 +1,35 @@ + + + AntennaTrackerConfig + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + 30 + 30 + 151 + 31 + + + + <h2>Antenna Tracker</h2> + + + false + + + + + + diff --git a/src/ui/configuration/ApmHardwareConfig.cc b/src/ui/configuration/ApmHardwareConfig.cc new file mode 100644 index 000000000..829b43292 --- /dev/null +++ b/src/ui/configuration/ApmHardwareConfig.cc @@ -0,0 +1,145 @@ +#include "ApmHardwareConfig.h" + + +ApmHardwareConfig::ApmHardwareConfig(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); + //ui.firmwareButton->setVisible(valse); + ui.manditoryHardware->setVisible(false); + ui.frameTypeButton->setVisible(false); + ui.compassButton->setVisible(false); + ui.accelCalibrateButton->setVisible(false); + ui.radioCalibrateButton->setVisible(false); + ui.flightModesButton->setVisible(false); + ui.optionalHardwareButton->setVisible(false); + //ui.radio3DRButton->setVisible(false); + ui.batteryMonitorButton->setVisible(false); + ui.sonarButton->setVisible(false); + ui.airspeedButton->setVisible(false); + ui.opticalFlowButton->setVisible(false); + ui.osdButton->setVisible(false); + ui.cameraGimbalButton->setVisible(false); + //ui.antennaTrackerButton->setVisible(false); + + connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.frameTypeButton,SLOT(setShown(bool))); + connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.compassButton,SLOT(setShown(bool))); + connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.accelCalibrateButton,SLOT(setShown(bool))); + connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.radioCalibrateButton,SLOT(setShown(bool))); + connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.flightModesButton,SLOT(setShown(bool))); + + connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.radio3DRButton,SLOT(setShown(bool))); + connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.batteryMonitorButton,SLOT(setShown(bool))); + connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.sonarButton,SLOT(setShown(bool))); + connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.airspeedButton,SLOT(setShown(bool))); + connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.opticalFlowButton,SLOT(setShown(bool))); + connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.osdButton,SLOT(setShown(bool))); + connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.cameraGimbalButton,SLOT(setShown(bool))); + connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.antennaTrackerButton,SLOT(setShown(bool))); + + connect(ui.frameTypeButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + + + QWidget *widget = new QWidget(this); + ui.stackedWidget->addWidget(widget); //Firmware placeholder. + buttonToConfigWidgetMap[ui.firmwareButton] = widget; + connect(ui.firmwareButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + + frameConfig = new FrameTypeConfig(this); + ui.stackedWidget->addWidget(frameConfig); + buttonToConfigWidgetMap[ui.frameTypeButton] = frameConfig; + connect(ui.frameTypeButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + + compassConfig = new CompassConfig(this); + ui.stackedWidget->addWidget(compassConfig); + buttonToConfigWidgetMap[ui.compassButton] = compassConfig; + connect(ui.compassButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + + accelConfig = new AccelCalibrationConfig(this); + ui.stackedWidget->addWidget(accelConfig); + buttonToConfigWidgetMap[ui.accelCalibrateButton] = accelConfig; + connect(ui.accelCalibrateButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + + radioConfig = new RadioCalibrationConfig(this); + ui.stackedWidget->addWidget(radioConfig); + buttonToConfigWidgetMap[ui.radioCalibrateButton] = radioConfig; + connect(ui.radioCalibrateButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + + flightConfig = new FlightModeConfig(this); + ui.stackedWidget->addWidget(flightConfig); + buttonToConfigWidgetMap[ui.flightModesButton] = flightConfig; + connect(ui.flightModesButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + + radio3drConfig = new Radio3DRConfig(this); + ui.stackedWidget->addWidget(radio3drConfig); + buttonToConfigWidgetMap[ui.radio3DRButton] = radio3drConfig; + connect(ui.radio3DRButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + + batteryConfig = new BatteryMonitorConfig(this); + ui.stackedWidget->addWidget(batteryConfig); + buttonToConfigWidgetMap[ui.batteryMonitorButton] = batteryConfig; + connect(ui.batteryMonitorButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + + sonarConfig = new SonarConfig(this); + ui.stackedWidget->addWidget(sonarConfig); + buttonToConfigWidgetMap[ui.sonarButton] = sonarConfig; + connect(ui.sonarButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + + airspeedConfig = new AirspeedConfig(this); + ui.stackedWidget->addWidget(airspeedConfig); + buttonToConfigWidgetMap[ui.airspeedButton] = airspeedConfig; + connect(ui.airspeedButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + + opticalFlowConfig = new OpticalFlowConfig(this); + ui.stackedWidget->addWidget(opticalFlowConfig); + buttonToConfigWidgetMap[ui.opticalFlowButton] = opticalFlowConfig; + connect(ui.opticalFlowButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + + osdConfig = new OsdConfig(this); + ui.stackedWidget->addWidget(osdConfig); + buttonToConfigWidgetMap[ui.osdButton] = osdConfig; + connect(ui.osdButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + + cameraGimbalConfig = new CameraGimbalConfig(this); + ui.stackedWidget->addWidget(cameraGimbalConfig); + buttonToConfigWidgetMap[ui.cameraGimbalButton] = cameraGimbalConfig; + connect(ui.cameraGimbalButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + + antennaTrackerConfig = new AntennaTrackerConfig(this); + ui.stackedWidget->addWidget(antennaTrackerConfig); + buttonToConfigWidgetMap[ui.antennaTrackerButton] = antennaTrackerConfig; + connect(ui.antennaTrackerButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + + + + connect(UASManager::instance(),SIGNAL(activeUASSet(UASInterface*)),this,SLOT(activeUASSet(UASInterface*))); + if (UASManager::instance()->getActiveUAS()) + { + activeUASSet(UASManager::instance()->getActiveUAS()); + } +} +void ApmHardwareConfig::activateStackedWidget() +{ + if (buttonToConfigWidgetMap.contains(sender())) + { + ui.stackedWidget->setCurrentWidget(buttonToConfigWidgetMap[sender()]); + } +} + +ApmHardwareConfig::~ApmHardwareConfig() +{ +} + +void ApmHardwareConfig::activeUASSet(UASInterface *uas) +{ + if (!uas) + { + return; + } + ui.firmwareButton->setVisible(true); + ui.manditoryHardware->setVisible(true); + ui.manditoryHardware->setChecked(false); + ui.optionalHardwareButton->setVisible(true); + ui.optionalHardwareButton->setChecked(false); + ui.radio3DRButton->setVisible(false); + ui.antennaTrackerButton->setVisible(false); +} diff --git a/src/ui/configuration/ApmHardwareConfig.h b/src/ui/configuration/ApmHardwareConfig.h new file mode 100644 index 000000000..d021d2672 --- /dev/null +++ b/src/ui/configuration/ApmHardwareConfig.h @@ -0,0 +1,54 @@ +#ifndef APMHARDWARECONFIG_H +#define APMHARDWARECONFIG_H + +#include +#include "ui_ApmHardwareConfig.h" +#include +#include +#include "FrameTypeConfig.h" +#include "CompassConfig.h" +#include "AccelCalibrationConfig.h" +#include "RadioCalibrationConfig.h" +#include "FlightModeConfig.h" +#include "Radio3DRConfig.h" +#include "BatteryMonitorConfig.h" +#include "SonarConfig.h" +#include "AirspeedConfig.h" +#include "OpticalFlowConfig.h" +#include "OsdConfig.h" +#include "CameraGimbalConfig.h" +#include "AntennaTrackerConfig.h" + +class ApmHardwareConfig : public QWidget +{ + Q_OBJECT + +public: + explicit ApmHardwareConfig(QWidget *parent = 0); + ~ApmHardwareConfig(); +private: + FrameTypeConfig *frameConfig; + CompassConfig *compassConfig; + AccelCalibrationConfig *accelConfig; + RadioCalibrationConfig *radioConfig; + FlightModeConfig *flightConfig; + + Radio3DRConfig *radio3drConfig; + BatteryMonitorConfig *batteryConfig; + SonarConfig *sonarConfig; + AirspeedConfig *airspeedConfig; + OpticalFlowConfig *opticalFlowConfig; + OsdConfig *osdConfig; + CameraGimbalConfig *cameraGimbalConfig; + AntennaTrackerConfig *antennaTrackerConfig; +private slots: + void activeUASSet(UASInterface *uas); + void activateStackedWidget(); +private: + Ui::ApmHardwareConfig ui; + + //This is a map between the buttons, and the widgets they should be displying + QMap buttonToConfigWidgetMap; +}; + +#endif // APMHARDWARECONFIG_H diff --git a/src/ui/configuration/ApmHardwareConfig.ui b/src/ui/configuration/ApmHardwareConfig.ui new file mode 100644 index 000000000..87e2230ed --- /dev/null +++ b/src/ui/configuration/ApmHardwareConfig.ui @@ -0,0 +1,327 @@ + + + ApmHardwareConfig + + + + 0 + 0 + 984 + 553 + + + + Form + + + + + 0 + 20 + 175 + 531 + + + + + 175 + 0 + + + + + 175 + 16777215 + + + + true + + + + + 0 + 0 + 156 + 676 + + + + + + + QLayout::SetMinAndMaxSize + + + + + + 100 + 35 + + + + Install Firmware + + + + + + + + 0 + 35 + + + + >>> Manditory Hardware + + + true + + + + + + + + 0 + 35 + + + + Qt::LeftToRight + + + Frame Type + + + + + + + + 0 + 35 + + + + Compass + + + + + + + + 0 + 35 + + + + Qt::LeftToRight + + + false + + + Accel Calibration + + + + + + + + 100 + 35 + + + + + 16777215 + 16777215 + + + + Radio Calibration + + + false + + + false + + + + + + + + 0 + 35 + + + + Flight Modes + + + false + + + + + + + + 0 + 35 + + + + >>> Optional Hardware + + + true + + + + + + + + 0 + 35 + + + + 3DR Radio + + + + + + + + 0 + 35 + + + + Battery Monitor + + + + + + + + 0 + 35 + + + + Sonar + + + + + + + + 0 + 35 + + + + Airspeed + + + + + + + + 0 + 35 + + + + Optical Flow + + + + + + + + 0 + 35 + + + + OSD + + + + + + + + 0 + 35 + + + + Camera Gimbal + + + + + + + + 0 + 35 + + + + Antenna Tracker + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + 200 + 30 + 721 + 491 + + + + -1 + + + + + + diff --git a/src/ui/configuration/ApmSoftwareConfig.cc b/src/ui/configuration/ApmSoftwareConfig.cc new file mode 100644 index 000000000..f8ae035ab --- /dev/null +++ b/src/ui/configuration/ApmSoftwareConfig.cc @@ -0,0 +1,11 @@ +#include "ApmSoftwareConfig.h" + + +ApmSoftwareConfig::ApmSoftwareConfig(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); +} + +ApmSoftwareConfig::~ApmSoftwareConfig() +{ +} diff --git a/src/ui/configuration/ApmSoftwareConfig.h b/src/ui/configuration/ApmSoftwareConfig.h new file mode 100644 index 000000000..35eabfd5d --- /dev/null +++ b/src/ui/configuration/ApmSoftwareConfig.h @@ -0,0 +1,19 @@ +#ifndef APMSOFTWARECONFIG_H +#define APMSOFTWARECONFIG_H + +#include +#include "ui_ApmSoftwareConfig.h" + +class ApmSoftwareConfig : public QWidget +{ + Q_OBJECT + +public: + explicit ApmSoftwareConfig(QWidget *parent = 0); + ~ApmSoftwareConfig(); + +private: + Ui::ApmSoftwareConfig ui; +}; + +#endif // APMSOFTWARECONFIG_H diff --git a/src/ui/configuration/ApmSoftwareConfig.ui b/src/ui/configuration/ApmSoftwareConfig.ui new file mode 100644 index 000000000..0132c2f5c --- /dev/null +++ b/src/ui/configuration/ApmSoftwareConfig.ui @@ -0,0 +1,99 @@ + + + ApmSoftwareConfig + + + + 0 + 0 + 718 + 531 + + + + Form + + + + + 20 + 10 + 175 + 531 + + + + + 175 + 0 + + + + + 175 + 16777215 + + + + true + + + + + 0 + 0 + 173 + 529 + + + + + + + QLayout::SetMinAndMaxSize + + + + + + 100 + 35 + + + + APM Planner 2.0 Config + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + 220 + 20 + 471 + 491 + + + + + + + diff --git a/src/ui/configuration/BatteryMonitorConfig.cc b/src/ui/configuration/BatteryMonitorConfig.cc new file mode 100644 index 000000000..23ef9a731 --- /dev/null +++ b/src/ui/configuration/BatteryMonitorConfig.cc @@ -0,0 +1,11 @@ +#include "BatteryMonitorConfig.h" + + +BatteryMonitorConfig::BatteryMonitorConfig(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); +} + +BatteryMonitorConfig::~BatteryMonitorConfig() +{ +} diff --git a/src/ui/configuration/BatteryMonitorConfig.h b/src/ui/configuration/BatteryMonitorConfig.h new file mode 100644 index 000000000..bdddcd823 --- /dev/null +++ b/src/ui/configuration/BatteryMonitorConfig.h @@ -0,0 +1,19 @@ +#ifndef BATTERYMONITORCONFIG_H +#define BATTERYMONITORCONFIG_H + +#include +#include "ui_BatteryMonitorConfig.h" + +class BatteryMonitorConfig : public QWidget +{ + Q_OBJECT + +public: + explicit BatteryMonitorConfig(QWidget *parent = 0); + ~BatteryMonitorConfig(); + +private: + Ui::BatteryMonitorConfig ui; +}; + +#endif // BATTERYMONITORCONFIG_H diff --git a/src/ui/configuration/BatteryMonitorConfig.ui b/src/ui/configuration/BatteryMonitorConfig.ui new file mode 100644 index 000000000..564ec5503 --- /dev/null +++ b/src/ui/configuration/BatteryMonitorConfig.ui @@ -0,0 +1,35 @@ + + + BatteryMonitorConfig + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + 20 + 20 + 141 + 31 + + + + <h2>Battery Monitor</h2> + + + false + + + + + + diff --git a/src/ui/configuration/CameraGimbalConfig.cc b/src/ui/configuration/CameraGimbalConfig.cc new file mode 100644 index 000000000..377cbdd8f --- /dev/null +++ b/src/ui/configuration/CameraGimbalConfig.cc @@ -0,0 +1,11 @@ +#include "CameraGimbalConfig.h" + + +CameraGimbalConfig::CameraGimbalConfig(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); +} + +CameraGimbalConfig::~CameraGimbalConfig() +{ +} diff --git a/src/ui/configuration/CameraGimbalConfig.h b/src/ui/configuration/CameraGimbalConfig.h new file mode 100644 index 000000000..4373fbf5f --- /dev/null +++ b/src/ui/configuration/CameraGimbalConfig.h @@ -0,0 +1,19 @@ +#ifndef CAMERAGIMBALCONFIG_H +#define CAMERAGIMBALCONFIG_H + +#include +#include "ui_CameraGimbalConfig.h" + +class CameraGimbalConfig : public QWidget +{ + Q_OBJECT + +public: + explicit CameraGimbalConfig(QWidget *parent = 0); + ~CameraGimbalConfig(); + +private: + Ui::CameraGimbalConfig ui; +}; + +#endif // CAMERAGIMBALCONFIG_H diff --git a/src/ui/configuration/CameraGimbalConfig.ui b/src/ui/configuration/CameraGimbalConfig.ui new file mode 100644 index 000000000..b2b7f607b --- /dev/null +++ b/src/ui/configuration/CameraGimbalConfig.ui @@ -0,0 +1,35 @@ + + + CameraGimbalConfig + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + 30 + 20 + 131 + 31 + + + + <h2>Camera Gimbal</h2> + + + false + + + + + + diff --git a/src/ui/configuration/CompassConfig.cc b/src/ui/configuration/CompassConfig.cc new file mode 100644 index 000000000..015c45c8e --- /dev/null +++ b/src/ui/configuration/CompassConfig.cc @@ -0,0 +1,11 @@ +#include "CompassConfig.h" + + +CompassConfig::CompassConfig(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); +} + +CompassConfig::~CompassConfig() +{ +} diff --git a/src/ui/configuration/CompassConfig.h b/src/ui/configuration/CompassConfig.h new file mode 100644 index 000000000..e70f34052 --- /dev/null +++ b/src/ui/configuration/CompassConfig.h @@ -0,0 +1,19 @@ +#ifndef COMPASSCONFIG_H +#define COMPASSCONFIG_H + +#include +#include "ui_CompassConfig.h" + +class CompassConfig : public QWidget +{ + Q_OBJECT + +public: + explicit CompassConfig(QWidget *parent = 0); + ~CompassConfig(); + +private: + Ui::CompassConfig ui; +}; + +#endif // COMPASSCONFIG_H diff --git a/src/ui/configuration/CompassConfig.ui b/src/ui/configuration/CompassConfig.ui new file mode 100644 index 000000000..b97069d7c --- /dev/null +++ b/src/ui/configuration/CompassConfig.ui @@ -0,0 +1,35 @@ + + + CompassConfig + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + 30 + 20 + 131 + 31 + + + + <h2>Compass</h2> + + + false + + + + + + diff --git a/src/ui/configuration/FlightModeConfig.cc b/src/ui/configuration/FlightModeConfig.cc new file mode 100644 index 000000000..07a1ed394 --- /dev/null +++ b/src/ui/configuration/FlightModeConfig.cc @@ -0,0 +1,11 @@ +#include "FlightModeConfig.h" + + +FlightModeConfig::FlightModeConfig(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); +} + +FlightModeConfig::~FlightModeConfig() +{ +} diff --git a/src/ui/configuration/FlightModeConfig.h b/src/ui/configuration/FlightModeConfig.h new file mode 100644 index 000000000..fdf1129bb --- /dev/null +++ b/src/ui/configuration/FlightModeConfig.h @@ -0,0 +1,19 @@ +#ifndef FLIGHTMODECONFIG_H +#define FLIGHTMODECONFIG_H + +#include +#include "ui_FlightModeConfig.h" + +class FlightModeConfig : public QWidget +{ + Q_OBJECT + +public: + explicit FlightModeConfig(QWidget *parent = 0); + ~FlightModeConfig(); + +private: + Ui::FlightModeConfig ui; +}; + +#endif // FLIGHTMODECONFIG_H diff --git a/src/ui/configuration/FlightModeConfig.ui b/src/ui/configuration/FlightModeConfig.ui new file mode 100644 index 000000000..737d40523 --- /dev/null +++ b/src/ui/configuration/FlightModeConfig.ui @@ -0,0 +1,35 @@ + + + FlightModeConfig + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + 10 + 20 + 131 + 31 + + + + <h2>Flight Modes</h2> + + + false + + + + + + diff --git a/src/ui/configuration/FrameTypeConfig.cc b/src/ui/configuration/FrameTypeConfig.cc new file mode 100644 index 000000000..ac514cae3 --- /dev/null +++ b/src/ui/configuration/FrameTypeConfig.cc @@ -0,0 +1,11 @@ +#include "FrameTypeConfig.h" + + +FrameTypeConfig::FrameTypeConfig(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); +} + +FrameTypeConfig::~FrameTypeConfig() +{ +} diff --git a/src/ui/configuration/FrameTypeConfig.h b/src/ui/configuration/FrameTypeConfig.h new file mode 100644 index 000000000..592bf564d --- /dev/null +++ b/src/ui/configuration/FrameTypeConfig.h @@ -0,0 +1,19 @@ +#ifndef FRAMETYPECONFIG_H +#define FRAMETYPECONFIG_H + +#include +#include "ui_FrameTypeConfig.h" + +class FrameTypeConfig : public QWidget +{ + Q_OBJECT + +public: + explicit FrameTypeConfig(QWidget *parent = 0); + ~FrameTypeConfig(); + +private: + Ui::FrameTypeConfig ui; +}; + +#endif // FRAMETYPECONFIG_H diff --git a/src/ui/configuration/FrameTypeConfig.ui b/src/ui/configuration/FrameTypeConfig.ui new file mode 100644 index 000000000..4359e41a0 --- /dev/null +++ b/src/ui/configuration/FrameTypeConfig.ui @@ -0,0 +1,35 @@ + + + FrameTypeConfig + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + 20 + 20 + 131 + 31 + + + + <h2>Frame Setup</h2> + + + false + + + + + + diff --git a/src/ui/configuration/OpticalFlowConfig.cc b/src/ui/configuration/OpticalFlowConfig.cc new file mode 100644 index 000000000..bc977317b --- /dev/null +++ b/src/ui/configuration/OpticalFlowConfig.cc @@ -0,0 +1,11 @@ +#include "OpticalFlowConfig.h" + + +OpticalFlowConfig::OpticalFlowConfig(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); +} + +OpticalFlowConfig::~OpticalFlowConfig() +{ +} diff --git a/src/ui/configuration/OpticalFlowConfig.h b/src/ui/configuration/OpticalFlowConfig.h new file mode 100644 index 000000000..72ea2b0a3 --- /dev/null +++ b/src/ui/configuration/OpticalFlowConfig.h @@ -0,0 +1,19 @@ +#ifndef OPTICALFLOWCONFIG_H +#define OPTICALFLOWCONFIG_H + +#include +#include "ui_OpticalFlowConfig.h" + +class OpticalFlowConfig : public QWidget +{ + Q_OBJECT + +public: + explicit OpticalFlowConfig(QWidget *parent = 0); + ~OpticalFlowConfig(); + +private: + Ui::OpticalFlowConfig ui; +}; + +#endif // OPTICALFLOWCONFIG_H diff --git a/src/ui/configuration/OpticalFlowConfig.ui b/src/ui/configuration/OpticalFlowConfig.ui new file mode 100644 index 000000000..19ffbd7e4 --- /dev/null +++ b/src/ui/configuration/OpticalFlowConfig.ui @@ -0,0 +1,35 @@ + + + OpticalFlowConfig + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + 20 + 20 + 131 + 31 + + + + <h2>Optical Flow</h2> + + + false + + + + + + diff --git a/src/ui/configuration/OsdConfig.cc b/src/ui/configuration/OsdConfig.cc new file mode 100644 index 000000000..badf1b8e0 --- /dev/null +++ b/src/ui/configuration/OsdConfig.cc @@ -0,0 +1,11 @@ +#include "OsdConfig.h" + + +OsdConfig::OsdConfig(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); +} + +OsdConfig::~OsdConfig() +{ +} diff --git a/src/ui/configuration/OsdConfig.h b/src/ui/configuration/OsdConfig.h new file mode 100644 index 000000000..ecfb3ceaa --- /dev/null +++ b/src/ui/configuration/OsdConfig.h @@ -0,0 +1,19 @@ +#ifndef OSDCONFIG_H +#define OSDCONFIG_H + +#include +#include "ui_OsdConfig.h" + +class OsdConfig : public QWidget +{ + Q_OBJECT + +public: + explicit OsdConfig(QWidget *parent = 0); + ~OsdConfig(); + +private: + Ui::OsdConfig ui; +}; + +#endif // OSDCONFIG_H diff --git a/src/ui/configuration/OsdConfig.ui b/src/ui/configuration/OsdConfig.ui new file mode 100644 index 000000000..c45bc6a25 --- /dev/null +++ b/src/ui/configuration/OsdConfig.ui @@ -0,0 +1,35 @@ + + + OsdConfig + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + 20 + 20 + 131 + 31 + + + + <h2>OSD</h2> + + + false + + + + + + diff --git a/src/ui/configuration/Radio3DRConfig.cc b/src/ui/configuration/Radio3DRConfig.cc new file mode 100644 index 000000000..435ae290f --- /dev/null +++ b/src/ui/configuration/Radio3DRConfig.cc @@ -0,0 +1,11 @@ +#include "Radio3DRConfig.h" + + +Radio3DRConfig::Radio3DRConfig(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); +} + +Radio3DRConfig::~Radio3DRConfig() +{ +} diff --git a/src/ui/configuration/Radio3DRConfig.h b/src/ui/configuration/Radio3DRConfig.h new file mode 100644 index 000000000..5233921d1 --- /dev/null +++ b/src/ui/configuration/Radio3DRConfig.h @@ -0,0 +1,19 @@ +#ifndef RADIO3DRCONFIG_H +#define RADIO3DRCONFIG_H + +#include +#include "ui_Radio3DRConfig.h" + +class Radio3DRConfig : public QWidget +{ + Q_OBJECT + +public: + explicit Radio3DRConfig(QWidget *parent = 0); + ~Radio3DRConfig(); + +private: + Ui::Radio3DRConfig ui; +}; + +#endif // RADIO3DRCONFIG_H diff --git a/src/ui/configuration/Radio3DRConfig.ui b/src/ui/configuration/Radio3DRConfig.ui new file mode 100644 index 000000000..7a98b9dba --- /dev/null +++ b/src/ui/configuration/Radio3DRConfig.ui @@ -0,0 +1,35 @@ + + + Radio3DRConfig + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + 20 + 20 + 131 + 31 + + + + <h2>3DR Radio</h2> + + + false + + + + + + diff --git a/src/ui/configuration/RadioCalibrationConfig.cc b/src/ui/configuration/RadioCalibrationConfig.cc new file mode 100644 index 000000000..81b898eda --- /dev/null +++ b/src/ui/configuration/RadioCalibrationConfig.cc @@ -0,0 +1,11 @@ +#include "RadioCalibrationConfig.h" + + +RadioCalibrationConfig::RadioCalibrationConfig(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); +} + +RadioCalibrationConfig::~RadioCalibrationConfig() +{ +} diff --git a/src/ui/configuration/RadioCalibrationConfig.h b/src/ui/configuration/RadioCalibrationConfig.h new file mode 100644 index 000000000..df0cb44d6 --- /dev/null +++ b/src/ui/configuration/RadioCalibrationConfig.h @@ -0,0 +1,19 @@ +#ifndef RADIOCALIBRATIONCONFIG_H +#define RADIOCALIBRATIONCONFIG_H + +#include +#include "ui_RadioCalibrationConfig.h" + +class RadioCalibrationConfig : public QWidget +{ + Q_OBJECT + +public: + explicit RadioCalibrationConfig(QWidget *parent = 0); + ~RadioCalibrationConfig(); + +private: + Ui::RadioCalibrationConfig ui; +}; + +#endif // RADIOCALIBRATIONCONFIG_H diff --git a/src/ui/configuration/RadioCalibrationConfig.ui b/src/ui/configuration/RadioCalibrationConfig.ui new file mode 100644 index 000000000..3fdd68378 --- /dev/null +++ b/src/ui/configuration/RadioCalibrationConfig.ui @@ -0,0 +1,35 @@ + + + RadioCalibrationConfig + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + 20 + 20 + 171 + 31 + + + + <h2>Radio Calibration</h2> + + + false + + + + + + diff --git a/src/ui/configuration/SonarConfig.cc b/src/ui/configuration/SonarConfig.cc new file mode 100644 index 000000000..fa9ce05d7 --- /dev/null +++ b/src/ui/configuration/SonarConfig.cc @@ -0,0 +1,11 @@ +#include "SonarConfig.h" + + +SonarConfig::SonarConfig(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); +} + +SonarConfig::~SonarConfig() +{ +} diff --git a/src/ui/configuration/SonarConfig.h b/src/ui/configuration/SonarConfig.h new file mode 100644 index 000000000..07dc9cfbc --- /dev/null +++ b/src/ui/configuration/SonarConfig.h @@ -0,0 +1,19 @@ +#ifndef SONARCONFIG_H +#define SONARCONFIG_H + +#include +#include "ui_SonarConfig.h" + +class SonarConfig : public QWidget +{ + Q_OBJECT + +public: + explicit SonarConfig(QWidget *parent = 0); + ~SonarConfig(); + +private: + Ui::SonarConfig ui; +}; + +#endif // SONARCONFIG_H diff --git a/src/ui/configuration/SonarConfig.ui b/src/ui/configuration/SonarConfig.ui new file mode 100644 index 000000000..e28625385 --- /dev/null +++ b/src/ui/configuration/SonarConfig.ui @@ -0,0 +1,35 @@ + + + SonarConfig + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + 20 + 20 + 131 + 31 + + + + <h2>Sonar</h2> + + + false + + + + + + -- 2.22.0