From 1142b6f34273851718e81ba0cf4e67f46c6beec8 Mon Sep 17 00:00:00 2001 From: Michael Carpenter Date: Thu, 27 Jun 2013 14:28:24 -0400 Subject: [PATCH] Implemented Sonar Config --- files/images/devices/AC-0004-11-2.jpg | Bin 0 -> 10600 bytes qgroundcontrol.qrc | 1 + src/ui/configuration/SonarConfig.cc | 61 +++++++++++++++++++++++++- src/ui/configuration/SonarConfig.h | 8 +++- src/ui/configuration/SonarConfig.ui | 50 +++++++++++++++++++-- 5 files changed, 113 insertions(+), 7 deletions(-) create mode 100644 files/images/devices/AC-0004-11-2.jpg diff --git a/files/images/devices/AC-0004-11-2.jpg b/files/images/devices/AC-0004-11-2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..334486b6756e6b2671c1a2dd1099f2c051e4a20c GIT binary patch literal 10600 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 literal 0 HcmV?d00001 diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index b40e399506..2f8034f33d 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -111,6 +111,7 @@ files/images/mavs/frames-05.png files/images/devices/BR-HMC5883-01-2.jpg files/images/devices/BR-APMPWRDEAN-2.jpg + files/images/devices/AC-0004-11-2.jpg files/styles/Vera.ttf diff --git a/src/ui/configuration/SonarConfig.cc b/src/ui/configuration/SonarConfig.cc index fa9ce05d70..fb3481d908 100644 --- a/src/ui/configuration/SonarConfig.cc +++ b/src/ui/configuration/SonarConfig.cc @@ -1,11 +1,68 @@ #include "SonarConfig.h" +#include - -SonarConfig::SonarConfig(QWidget *parent) : QWidget(parent) +SonarConfig::SonarConfig(QWidget *parent) : AP2ConfigWidget(parent) { ui.setupUi(this); + connect(ui.enableCheckBox,SIGNAL(toggled(bool)),this,SLOT(checkBoxToggled(bool))); + connect(ui.sonarTypeComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(sonarTypeChanged(int))); + + ui.sonarTypeComboBox->addItem("XL-EZ0 / XL-EZ4"); + ui.sonarTypeComboBox->addItem("LV-EZ0"); + ui.sonarTypeComboBox->addItem("XL-EZL0"); + ui.sonarTypeComboBox->addItem("HRLV"); } SonarConfig::~SonarConfig() { } +void SonarConfig::checkBoxToggled(bool enabled) +{ + if (enabled) + { + ui.sonarTypeComboBox->setEnabled(false); + } + if (!m_uas) + { + QMessageBox::information(0,tr("Error"),tr("Please connect to a MAV before attempting to set configuration")); + return; + } + m_uas->setParameter(0,"SONAR_ENABLE",ui.enableCheckBox->isChecked() ? 1 : 0); +} +void SonarConfig::sonarTypeChanged(int index) +{ + if (!m_uas) + { + QMessageBox::information(0,tr("Error"),tr("Please connect to a MAV before attempting to set configuration")); + return; + } + m_uas->setParameter(0,"SONAR_TYPE",ui.sonarTypeComboBox->currentIndex()); +} + +void SonarConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) +{ + if (parameterName == "SONAR_ENABLE") + { + if (value.toInt() == 0) + { + //Disabled + disconnect(ui.enableCheckBox,SIGNAL(toggled(bool)),this,SLOT(checkBoxToggled(bool))); + ui.enableCheckBox->setChecked(false); + connect(ui.enableCheckBox,SIGNAL(toggled(bool)),this,SLOT(checkBoxToggled(bool))); + ui.sonarTypeComboBox->setEnabled(false); + } + else + { + disconnect(ui.enableCheckBox,SIGNAL(toggled(bool)),this,SLOT(checkBoxToggled(bool))); + ui.enableCheckBox->setChecked(true); + connect(ui.enableCheckBox,SIGNAL(toggled(bool)),this,SLOT(checkBoxToggled(bool))); + ui.sonarTypeComboBox->setEnabled(true); + } + } + else if (parameterName == "SONAR_TYPE") + { + disconnect(ui.sonarTypeComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(sonarTypeChanged(int))); + ui.sonarTypeComboBox->setCurrentIndex(value.toInt()); + connect(ui.sonarTypeComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(sonarTypeChanged(int))); + } +} diff --git a/src/ui/configuration/SonarConfig.h b/src/ui/configuration/SonarConfig.h index 07dc9cfbcd..825591a652 100644 --- a/src/ui/configuration/SonarConfig.h +++ b/src/ui/configuration/SonarConfig.h @@ -2,16 +2,20 @@ #define SONARCONFIG_H #include +#include "AP2ConfigWidget.h" #include "ui_SonarConfig.h" -class SonarConfig : public QWidget +class SonarConfig : public AP2ConfigWidget { Q_OBJECT public: explicit SonarConfig(QWidget *parent = 0); ~SonarConfig(); - +private slots: + void parameterChanged(int uas, int component, QString parameterName, QVariant value); + void checkBoxToggled(bool enabled); + void sonarTypeChanged(int index); private: Ui::SonarConfig ui; }; diff --git a/src/ui/configuration/SonarConfig.ui b/src/ui/configuration/SonarConfig.ui index e286253853..6bce3475ae 100644 --- a/src/ui/configuration/SonarConfig.ui +++ b/src/ui/configuration/SonarConfig.ui @@ -6,8 +6,8 @@ 0 0 - 400 - 300 + 651 + 432 @@ -29,7 +29,51 @@ false + + + + 30 + 60 + 91 + 81 + + + + + + + :/files/images/devices/AC-0004-11-2.jpg + + + true + + + + + + 140 + 60 + 70 + 17 + + + + CheckBox + + + + + + 150 + 100 + 171 + 22 + + + - + + + -- GitLab