From d7def6d461d0b07a38bf890758e3449aa11fd023 Mon Sep 17 00:00:00 2001 From: Michael Carpenter Date: Thu, 11 Jul 2013 20:11:05 -0400 Subject: [PATCH] Some comment and general code cleanup tasks --- src/ui/configuration/ApmHardwareConfig.cc | 20 +++----------- src/ui/configuration/ApmSoftwareConfig.cc | 19 +------------- src/ui/configuration/ApmSoftwareConfig.ui | 32 ----------------------- 3 files changed, 5 insertions(+), 66 deletions(-) diff --git a/src/ui/configuration/ApmHardwareConfig.cc b/src/ui/configuration/ApmHardwareConfig.cc index 3b9c5655d..06f6a2a35 100644 --- a/src/ui/configuration/ApmHardwareConfig.cc +++ b/src/ui/configuration/ApmHardwareConfig.cc @@ -33,7 +33,8 @@ This file is part of the QGROUNDCONTROL project 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); @@ -41,15 +42,12 @@ ApmHardwareConfig::ApmHardwareConfig(QWidget *parent) : QWidget(parent) ui.arduPlaneLevelButton->setVisible(false); ui.radioCalibrateButton->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.optionalHardwareButton,SIGNAL(toggled(bool)),ui.radio3DRButton,SLOT(setShown(bool))); connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.batteryMonitorButton,SLOT(setShown(bool))); @@ -134,8 +132,6 @@ ApmHardwareConfig::ApmHardwareConfig(QWidget *parent) : QWidget(parent) 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()) { @@ -185,15 +181,7 @@ void ApmHardwareConfig::activeUASSet(UASInterface *uas) } ui.firmwareButton->setVisible(true); ui.manditoryHardware->setVisible(true); - ui.manditoryHardware->setChecked(false); + ui.manditoryHardware->setChecked(true); ui.optionalHardwareButton->setVisible(true); - ui.optionalHardwareButton->setChecked(false); - ui.radio3DRButton->setVisible(false); - ui.antennaTrackerButton->setVisible(false); - - - - - - + ui.optionalHardwareButton->setChecked(true); } diff --git a/src/ui/configuration/ApmSoftwareConfig.cc b/src/ui/configuration/ApmSoftwareConfig.cc index fa36a6a1d..041228722 100644 --- a/src/ui/configuration/ApmSoftwareConfig.cc +++ b/src/ui/configuration/ApmSoftwareConfig.cc @@ -8,10 +8,8 @@ ApmSoftwareConfig::ApmSoftwareConfig(QWidget *parent) : QWidget(parent) { ui.setupUi(this); - ui.basicPidsButton->setVisible(false); ui.flightModesButton->setVisible(false); ui.standardParamButton->setVisible(false); - ui.geoFenceButton->setVisible(false); ui.failSafeButton->setVisible(false); ui.advancedParamButton->setVisible(false); ui.advParamListButton->setVisible(false); @@ -19,11 +17,6 @@ ApmSoftwareConfig::ApmSoftwareConfig(QWidget *parent) : QWidget(parent) ui.arduRoverPidButton->setVisible(false); ui.arduPlanePidButton->setVisible(false); - /*basicPidConfig = new BasicPidConfig(this); - ui.stackedWidget->addWidget(basicPidConfig); - buttonToConfigWidgetMap[ui.basicPidsButton] = basicPidConfig; - connect(ui.basicPidsButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget()));*/ - flightConfig = new FlightModeConfig(this); ui.stackedWidget->addWidget(flightConfig); buttonToConfigWidgetMap[ui.flightModesButton] = flightConfig; @@ -34,11 +27,6 @@ ApmSoftwareConfig::ApmSoftwareConfig(QWidget *parent) : QWidget(parent) buttonToConfigWidgetMap[ui.standardParamButton] = standardParamConfig; connect(ui.standardParamButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); - /*geoFenceConfig = new GeoFenceConfig(this); - ui.stackedWidget->addWidget(geoFenceConfig); - buttonToConfigWidgetMap[ui.geoFenceButton] = geoFenceConfig; - connect(ui.geoFenceButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget()));*/ - failSafeConfig = new FailSafeConfig(this); ui.stackedWidget->addWidget(failSafeConfig); buttonToConfigWidgetMap[ui.failSafeButton] = failSafeConfig; @@ -69,10 +57,6 @@ ApmSoftwareConfig::ApmSoftwareConfig(QWidget *parent) : QWidget(parent) buttonToConfigWidgetMap[ui.arduRoverPidButton] = arduRoverPidConfig; connect(ui.arduRoverPidButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); - - - - connect(UASManager::instance(),SIGNAL(activeUASSet(UASInterface*)),this,SLOT(activeUASSet(UASInterface*))); if (UASManager::instance()->getActiveUAS()) { @@ -97,10 +81,8 @@ void ApmSoftwareConfig::activeUASSet(UASInterface *uas) return; } - ui.basicPidsButton->setVisible(true); ui.flightModesButton->setVisible(true); ui.standardParamButton->setVisible(true); - ui.geoFenceButton->setVisible(true); ui.failSafeButton->setVisible(true); ui.advancedParamButton->setVisible(true); ui.advParamListButton->setVisible(true); @@ -136,6 +118,7 @@ void ApmSoftwareConfig::activeUASSet(UASInterface *uas) xmlfile.close(); //TODO: Testing to ensure that incorrectly formated XML won't break this. + //Also, move this into the Param Manager, as it should handle all metadata. while (!xml.atEnd()) { if (xml.isStartElement() && xml.name() == "paramfile") diff --git a/src/ui/configuration/ApmSoftwareConfig.ui b/src/ui/configuration/ApmSoftwareConfig.ui index aa039930b..c29e3b6ff 100644 --- a/src/ui/configuration/ApmSoftwareConfig.ui +++ b/src/ui/configuration/ApmSoftwareConfig.ui @@ -59,22 +59,6 @@ - - - - - 0 - 35 - - - - Basic Pids - - - false - - - @@ -107,22 +91,6 @@ - - - - - 0 - 35 - - - - GeoFence - - - false - - - -- 2.22.0