From 551ffcc8e54d4a724f1223163e8f959512ac79b5 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 4 Dec 2014 14:57:32 -0800 Subject: [PATCH] Renamed due to collision with new QGCComboBox --- src/ui/designer/QGCToolWidget.cc | 8 ++-- ...GCComboBox.cc => QGCToolWidgetComboBox.cc} | 44 +++++++++---------- ...{QGCComboBox.h => QGCToolWidgetComboBox.h} | 16 +++---- ...GCComboBox.ui => QGCToolWidgetComboBox.ui} | 4 +- 4 files changed, 36 insertions(+), 36 deletions(-) rename src/ui/designer/{QGCComboBox.cc => QGCToolWidgetComboBox.cc} (92%) rename src/ui/designer/{QGCComboBox.h => QGCToolWidgetComboBox.h} (88%) rename src/ui/designer/{QGCComboBox.ui => QGCToolWidgetComboBox.ui} (98%) diff --git a/src/ui/designer/QGCToolWidget.cc b/src/ui/designer/QGCToolWidget.cc index 37a3226a9..72db2d02b 100644 --- a/src/ui/designer/QGCToolWidget.cc +++ b/src/ui/designer/QGCToolWidget.cc @@ -10,7 +10,7 @@ #include #include "QGCParamSlider.h" -#include "QGCComboBox.h" +#include "QGCToolWidgetComboBox.h" #include "QGCTextLabel.h" #include "QGCXYPlot.h" #include "QGCCommandButton.h" @@ -230,7 +230,7 @@ void QGCToolWidget::setParameterValue(int uas, int component, QString parameterN QString checkparam = settingsMap.value(widgetName + "\\" + QString::number(j) + "\\" + "QGC_PARAM_COMBOBOX_PARAMID").toString(); if (checkparam == parameterName) { - item = new QGCComboBox(this); + item = new QGCToolWidgetComboBox(this); addToolWidget(item); item->readSettings(widgetName + "\\" + QString::number(j) + "\\",settingsMap); paramToItemMap[parameterName] = item; @@ -274,7 +274,7 @@ void QGCToolWidget::loadSettings(QVariantMap& settings) } else if (type == "COMBO") { - item = new QGCComboBox(this); + item = new QGCToolWidgetComboBox(this); //qDebug() << "CREATED COMBOBOX"; } else if (type == "XYPLOT") @@ -330,7 +330,7 @@ void QGCToolWidget::loadSettings(QSettings& settings) } else if (type == "COMBO") { - item = new QGCComboBox(this); + item = new QGCToolWidgetComboBox(this); item->setActiveUAS(mav); qDebug() << "CREATED PARAM COMBOBOX"; } diff --git a/src/ui/designer/QGCComboBox.cc b/src/ui/designer/QGCToolWidgetComboBox.cc similarity index 92% rename from src/ui/designer/QGCComboBox.cc rename to src/ui/designer/QGCToolWidgetComboBox.cc index 2a0747c0e..f4923842e 100644 --- a/src/ui/designer/QGCComboBox.cc +++ b/src/ui/designer/QGCToolWidgetComboBox.cc @@ -5,13 +5,13 @@ #include #include -#include "QGCComboBox.h" -#include "ui_QGCComboBox.h" +#include "QGCToolWidgetComboBox.h" +#include "ui_QGCToolWidgetComboBox.h" #include "UASInterface.h" #include "UASManager.h" -QGCComboBox::QGCComboBox(QWidget *parent) : +QGCToolWidgetComboBox::QGCToolWidgetComboBox(QWidget *parent) : QGCToolWidgetItem("Combo", parent), parameterName(""), parameterValue(0.0f), @@ -19,7 +19,7 @@ QGCComboBox::QGCComboBox(QWidget *parent) : parameterMin(0.0f), parameterMax(0.0f), componentId(0), - ui(new Ui::QGCComboBox) + ui(new Ui::QGCToolWidgetComboBox) { ui->setupUi(this); uas = NULL; @@ -64,12 +64,12 @@ QGCComboBox::QGCComboBox(QWidget *parent) : init(); } -QGCComboBox::~QGCComboBox() +QGCToolWidgetComboBox::~QGCToolWidgetComboBox() { delete ui; } -void QGCComboBox::showTooltip() +void QGCToolWidgetComboBox::showTooltip() { QWidget* sender = dynamic_cast(QObject::sender()); @@ -80,7 +80,7 @@ void QGCComboBox::showTooltip() } } -void QGCComboBox::refreshParameter() +void QGCToolWidgetComboBox::refreshParameter() { ui->editSelectParamComboBox->setEnabled(true); ui->editSelectComponentComboBox->setEnabled(true); @@ -90,7 +90,7 @@ void QGCComboBox::refreshParameter() } } -void QGCComboBox::setActiveUAS(UASInterface* activeUas) +void QGCToolWidgetComboBox::setActiveUAS(UASInterface* activeUas) { if (activeUas) { @@ -119,7 +119,7 @@ void QGCComboBox::setActiveUAS(UASInterface* activeUas) } } -void QGCComboBox::requestParameter() +void QGCToolWidgetComboBox::requestParameter() { if (!parameterName.isEmpty() && uas) { @@ -127,18 +127,18 @@ void QGCComboBox::requestParameter() } } -void QGCComboBox::showInfo(bool enable) +void QGCToolWidgetComboBox::showInfo(bool enable) { ui->editInfoCheckBox->setChecked(enable); ui->infoLabel->setVisible(enable); } -void QGCComboBox::selectComponent(int componentIndex) +void QGCToolWidgetComboBox::selectComponent(int componentIndex) { this->componentId = ui->editSelectComponentComboBox->itemData(componentIndex).toInt(); } -void QGCComboBox::selectParameter(int paramIndex) +void QGCToolWidgetComboBox::selectParameter(int paramIndex) { // Set name parameterName = ui->editSelectParamComboBox->itemText(paramIndex); @@ -165,7 +165,7 @@ void QGCComboBox::selectParameter(int paramIndex) } } -void QGCComboBox::setEditMode(bool editMode) +void QGCToolWidgetComboBox::setEditMode(bool editMode) { if(!editMode) { // Store component id @@ -203,7 +203,7 @@ void QGCComboBox::setEditMode(bool editMode) QGCToolWidgetItem::setEditMode(editMode); } -void QGCComboBox::setParamPending() +void QGCToolWidgetComboBox::setParamPending() { if (uas) { uas->getParamManager()->setPendingParam(componentId, parameterName, parameterValue); @@ -220,7 +220,7 @@ void QGCComboBox::setParamPending() * @brief parameterName Key/name of the parameter * @brief value Value of the parameter */ -void QGCComboBox::setParameterValue(int uas, int component, int paramCount, int paramIndex, QString parameterName, QVariant value) +void QGCToolWidgetComboBox::setParameterValue(int uas, int component, int paramCount, int paramIndex, QString parameterName, QVariant value) { Q_UNUSED(paramCount); // Check if this component and parameter are part of the list @@ -301,7 +301,7 @@ void QGCComboBox::setParameterValue(int uas, int component, int paramCount, int } } -void QGCComboBox::changeEvent(QEvent *e) +void QGCToolWidgetComboBox::changeEvent(QEvent *e) { QWidget::changeEvent(e); switch (e->type()) { @@ -314,7 +314,7 @@ void QGCComboBox::changeEvent(QEvent *e) } -void QGCComboBox::writeSettings(QSettings& settings) +void QGCToolWidgetComboBox::writeSettings(QSettings& settings) { settings.setValue("TYPE", "COMBOBOX"); settings.setValue("QGC_PARAM_COMBOBOX_DESCRIPTION", ui->nameLabel->text()); @@ -331,7 +331,7 @@ void QGCComboBox::writeSettings(QSettings& settings) } settings.sync(); } -void QGCComboBox::readSettings(const QString& pre,const QVariantMap& settings) +void QGCToolWidgetComboBox::readSettings(const QString& pre,const QVariantMap& settings) { parameterName = settings.value(pre + "QGC_PARAM_COMBOBOX_PARAMID").toString(); componentId = settings.value(pre + "QGC_PARAM_COMBOBOX_COMPONENTID").toInt(); @@ -370,7 +370,7 @@ void QGCComboBox::readSettings(const QString& pre,const QVariantMap& settings) // Get param value after settings have been loaded // requestParameter(); } -void QGCComboBox::readSettings(const QSettings& settings) +void QGCToolWidgetComboBox::readSettings(const QSettings& settings) { QVariantMap map; foreach (QString key,settings.allKeys()) @@ -410,19 +410,19 @@ void QGCComboBox::readSettings(const QSettings& settings) // Get param value after settings have been loaded //requestParameter(); } -void QGCComboBox::addButtonClicked() +void QGCToolWidgetComboBox::addButtonClicked() { ui->editOptionComboBox->addItem(ui->editItemNameLabel->text()); comboBoxTextToValMap[ui->editItemNameLabel->text()] = ui->editItemValueSpinBox->value(); } -void QGCComboBox::delButtonClicked() +void QGCToolWidgetComboBox::delButtonClicked() { int index = ui->editOptionComboBox->currentIndex(); comboBoxTextToValMap.remove(ui->editOptionComboBox->currentText()); ui->editOptionComboBox->removeItem(index); } -void QGCComboBox::comboBoxIndexChanged(QString val) +void QGCToolWidgetComboBox::comboBoxIndexChanged(QString val) { ui->imageLabel->setPixmap(comboBoxIndexToPixmap[ui->editOptionComboBox->currentIndex()]); if (comboBoxTextToParamMap.contains(ui->editOptionComboBox->currentText())) diff --git a/src/ui/designer/QGCComboBox.h b/src/ui/designer/QGCToolWidgetComboBox.h similarity index 88% rename from src/ui/designer/QGCComboBox.h rename to src/ui/designer/QGCToolWidgetComboBox.h index a698e1f0e..785d606a4 100644 --- a/src/ui/designer/QGCComboBox.h +++ b/src/ui/designer/QGCToolWidgetComboBox.h @@ -1,5 +1,5 @@ -#ifndef QGCCOMBOBOX_H -#define QGCCOMBOBOX_H +#ifndef QGCToolWidgetComboBox_H +#define QGCToolWidgetComboBox_H #include #include @@ -11,16 +11,16 @@ class QGCUASParamManagerInterface; namespace Ui { -class QGCComboBox; +class QGCToolWidgetComboBox; } -class QGCComboBox : public QGCToolWidgetItem +class QGCToolWidgetComboBox : public QGCToolWidgetItem { Q_OBJECT public: - explicit QGCComboBox(QWidget *parent = 0); - ~QGCComboBox(); + explicit QGCToolWidgetComboBox(QWidget *parent = 0); + ~QGCToolWidgetComboBox(); virtual void setEditMode(bool editMode); @@ -70,7 +70,7 @@ protected: void changeEvent(QEvent *e); private: - Ui::QGCComboBox *ui; + Ui::QGCToolWidgetComboBox *ui; }; -#endif // QGCCOMBOBOX_H +#endif // QGCToolWidgetComboBox_H diff --git a/src/ui/designer/QGCComboBox.ui b/src/ui/designer/QGCToolWidgetComboBox.ui similarity index 98% rename from src/ui/designer/QGCComboBox.ui rename to src/ui/designer/QGCToolWidgetComboBox.ui index fdfbc7935..59d1fb035 100644 --- a/src/ui/designer/QGCComboBox.ui +++ b/src/ui/designer/QGCToolWidgetComboBox.ui @@ -1,7 +1,7 @@ - QGCComboBox - + QGCToolWidgetComboBox + 0 -- 2.22.0