Skip to content

Q
qgroundcontrol
Commit 5e03573c authored by Michael Carpenter's avatar Michael Carpenter
Browse files
Options

Major change to configuration, to allow for loading from APM generated xml 

This commit still allows configuration widgets to be loaded from qgc files
assuming that there is no APM generated xml file (arduplane.pdef.xml) in
the files/%autopilorname%/ directory. This filename needs to be
configurable, and selectable at runtime. It is not yet.
parent bc2fc3e5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3408 additions and 102 deletions
files/ardupilotmega/arduplane.pdef.xml 0 → 100644
View file @ 5e03573c
This source diff could not be displayed because it is too large. You can view the blob instead.
src/uas/QGCUASParamManager.h
View file @ 5e03573c
...@@ -43,6 +43,7 @@ public: ...@@ -43,6 +43,7 @@ public:
virtual double getParamMax(const QString& param) = 0; virtual double getParamMax(const QString& param) = 0;
virtual double getParamDefault(const QString& param) = 0; virtual double getParamDefault(const QString& param) = 0;
virtual QString getParamInfo(const QString& param) = 0; virtual QString getParamInfo(const QString& param) = 0;
virtual void setParamInfo(const QMap<QString,QString>& param) = 0;
/** @brief Request an update for the parameter list */ /** @brief Request an update for the parameter list */
void requestParameterListUpdate(int component = 0); void requestParameterListUpdate(int component = 0);
......
src/ui/MainWindow.h
View file @ 5e03573c
...@@ -127,7 +127,6 @@ public: ...@@ -127,7 +127,6 @@ public:
QList<QAction*> listLinkMenuActions(void); QList<QAction*> listLinkMenuActions(void);
public slots: public slots:
/** @brief Shows a status message on the bottom status bar */ /** @brief Shows a status message on the bottom status bar */
void showStatusMessage(const QString& status, int timeout); void showStatusMessage(const QString& status, int timeout);
/** @brief Shows a status message on the bottom status bar */ /** @brief Shows a status message on the bottom status bar */
......
src/ui/QGCParamWidget.h
View file @ 5e03573c
...@@ -58,6 +58,7 @@ public: ...@@ -58,6 +58,7 @@ public:
double getParamMax(const QString& param) { return paramMax.value(param, 0.0f); } double getParamMax(const QString& param) { return paramMax.value(param, 0.0f); }
double getParamDefault(const QString& param) { return paramDefault.value(param, 0.0f); } double getParamDefault(const QString& param) { return paramDefault.value(param, 0.0f); }
QString getParamInfo(const QString& param) { return paramToolTips.value(param, ""); } QString getParamInfo(const QString& param) { return paramToolTips.value(param, ""); }
void setParamInfo(const QMap<QString,QString>& param) { paramToolTips = param; }
signals: signals:
/** @brief A parameter was changed in the widget, NOT onboard */ /** @brief A parameter was changed in the widget, NOT onboard */
......
src/ui/QGCVehicleConfig.cc
View file @ 5e03573c
This diff is collapsed.
src/ui/QGCVehicleConfig.h
View file @ 5e03573c
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <QWidget> #include <QWidget>
#include <QTimer> #include <QTimer>
#include <QList> #include <QList>
#include <QGroupBox>
#include "QGCToolWidget.h" #include "QGCToolWidget.h"
#include "UASInterface.h" #include "UASInterface.h"
...@@ -30,7 +31,8 @@ public: ...@@ -30,7 +31,8 @@ public:
public slots: public slots:
/** Set the MAV currently being calibrated */ /** Set the MAV currently being calibrated */
void setActiveUAS(UASInterface* active); void setActiveUAS(UASInterface* active);
void loadQgcConfig();
void loadConfig();
/** Start the RC calibration routine */ /** Start the RC calibration routine */
void startCalibrationRC(); void startCalibrationRC();
/** Stop the RC calibration routine */ /** Stop the RC calibration routine */
...@@ -169,12 +171,16 @@ protected: ...@@ -169,12 +171,16 @@ protected:
enum RC_MODE rc_mode; ///< Mode of the remote control, according to usual convention enum RC_MODE rc_mode; ///< Mode of the remote control, according to usual convention
QList<QGCToolWidget*> toolWidgets; ///< Configurable widgets QList<QGCToolWidget*> toolWidgets; ///< Configurable widgets
bool calibrationEnabled; ///< calibration mode on / off bool calibrationEnabled; ///< calibration mode on / off
QMap<QString,QGCToolWidget*> paramToWidgetMap;
QMap<QGCToolWidget*,QGroupBox*> toolToBoxMap;
QMap<QString,QString> paramTooltips;
private: private:
Ui::QGCVehicleConfig *ui; Ui::QGCVehicleConfig *ui;
signals: signals:
void visibilityChanged(bool visible); void visibilityChanged(bool visible);
void configReady();
}; };
#endif // QGCVEHICLECONFIG_H #endif // QGCVEHICLECONFIG_H
src/ui/designer/QGCComboBox.cc
View file @ 5e03573c
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
QGCComboBox::QGCComboBox(QWidget *parent) : QGCComboBox::QGCComboBox(QWidget *parent) :
QGCToolWidgetItem("Slider", parent), QGCToolWidgetItem("Combo", parent),
parameterName(""), parameterName(""),
parameterValue(0.0f), parameterValue(0.0f),
parameterScalingFactor(0.0), parameterScalingFactor(0.0),
...@@ -41,10 +41,8 @@ QGCComboBox::QGCComboBox(QWidget *parent) : ...@@ -41,10 +41,8 @@ QGCComboBox::QGCComboBox(QWidget *parent) :
ui->itemNameLabel->hide(); ui->itemNameLabel->hide();
ui->editOptionComboBox->setEnabled(false); ui->editOptionComboBox->setEnabled(false);
isDisabled = true; isDisabled = true;
//ui->editLine1->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }");
ui->editLine1->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }"); // ui->editLine2->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }");
ui->editLine2->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }");
connect(ui->editDoneButton, SIGNAL(clicked()), this, SLOT(endEditMode())); connect(ui->editDoneButton, SIGNAL(clicked()), this, SLOT(endEditMode()));
connect(ui->editOptionComboBox,SIGNAL(currentIndexChanged(QString)),this,SLOT(comboBoxIndexChanged(QString))); connect(ui->editOptionComboBox,SIGNAL(currentIndexChanged(QString)),this,SLOT(comboBoxIndexChanged(QString)));
connect(ui->editAddItemButton,SIGNAL(clicked()),this,SLOT(addButtonClicked())); connect(ui->editAddItemButton,SIGNAL(clicked()),this,SLOT(addButtonClicked()));
...@@ -64,7 +62,9 @@ QGCComboBox::QGCComboBox(QWidget *parent) : ...@@ -64,7 +62,9 @@ QGCComboBox::QGCComboBox(QWidget *parent) :
// connect to self // connect to self
connect(ui->infoLabel, SIGNAL(released()), this, SLOT(showTooltip())); connect(ui->infoLabel, SIGNAL(released()), this, SLOT(showTooltip()));
// Set the current UAS if present // Set the current UAS if present
connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setActiveUAS(UASInterface*))); connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setActiveUAS(UASInterface*)));
} }
QGCComboBox::~QGCComboBox() QGCComboBox::~QGCComboBox()
...@@ -107,7 +107,7 @@ void QGCComboBox::setActiveUAS(UASInterface* activeUas) ...@@ -107,7 +107,7 @@ void QGCComboBox::setActiveUAS(UASInterface* activeUas)
connect(activeUas, SIGNAL(parameterChanged(int,int,int,int,QString,QVariant)), this, SLOT(setParameterValue(int,int,int,int,QString,QVariant)), Qt::UniqueConnection); connect(activeUas, SIGNAL(parameterChanged(int,int,int,int,QString,QVariant)), this, SLOT(setParameterValue(int,int,int,int,QString,QVariant)), Qt::UniqueConnection);
uas = activeUas; uas = activeUas;
// Update current param value // Update current param value
requestParameter(); //requestParameter();
// Set param info // Set param info
QString text = uas->getParamManager()->getParamInfo(parameterName); QString text = uas->getParamManager()->getParamInfo(parameterName);
ui->infoLabel->setToolTip(text); ui->infoLabel->setToolTip(text);
...@@ -351,7 +351,34 @@ void QGCComboBox::writeSettings(QSettings& settings) ...@@ -351,7 +351,34 @@ void QGCComboBox::writeSettings(QSettings& settings)
} }
settings.sync(); settings.sync();
} }
void QGCComboBox::readSettings(const QString& pre,const QVariantMap& settings)
{
parameterName = settings.value(pre + "QGC_PARAM_COMBOBOX_PARAMID").toString();
component = settings.value(pre + "QGC_PARAM_COMBOBOX_COMPONENTID").toInt();
ui->nameLabel->setText(settings.value(pre + "QGC_PARAM_COMBOBOX_DESCRIPTION").toString());
ui->editNameLabel->setText(settings.value(pre + "QGC_PARAM_COMBOBOX_DESCRIPTION").toString());
//settings.setValue("QGC_PARAM_SLIDER_BUTTONTEXT", ui->actionButton->text());
ui->editSelectParamComboBox->addItem(settings.value(pre + "QGC_PARAM_COMBOBOX_PARAMID").toString());
ui->editSelectParamComboBox->setCurrentIndex(ui->editSelectParamComboBox->count()-1);
ui->editSelectComponentComboBox->addItem(tr("Component #%1").arg(settings.value(pre + "QGC_PARAM_COMBOBOX_COMPONENTID").toInt()), settings.value(pre + "QGC_PARAM_COMBOBOX_COMPONENTID").toInt());
showInfo(settings.value(pre + "QGC_PARAM_COMBOBOX_DISPLAY_INFO", true).toBool());
ui->editSelectParamComboBox->setEnabled(true);
ui->editSelectComponentComboBox->setEnabled(true);
int num = settings.value(pre + "QGC_PARAM_COMBOBOX_COUNT").toInt();
for (int i=0;i<num;i++)
{
ui->editOptionComboBox->addItem(settings.value(pre + "QGC_PARAM_COMBOBOX_ITEM_" + QString::number(i) + "_TEXT").toString());
//qDebug() << "Adding val:" << settings.value(pre + "QGC_PARAM_COMBOBOX_ITEM_" + QString::number(i) + "_TEXT").toString() << settings.value(pre + "QGC_PARAM_COMBOBOX_ITEM_" + QString::number(i) + "_VAL").toInt();
comboBoxTextToValMap[settings.value(pre + "QGC_PARAM_COMBOBOX_ITEM_" + QString::number(i) + "_TEXT").toString()] = settings.value(pre + "QGC_PARAM_COMBOBOX_ITEM_" + QString::number(i) + "_VAL").toInt();
}
setActiveUAS(UASManager::instance()->getActiveUAS());
// Get param value after settings have been loaded
// requestParameter();
}
void QGCComboBox::readSettings(const QSettings& settings) void QGCComboBox::readSettings(const QSettings& settings)
{ {
parameterName = settings.value("QGC_PARAM_COMBOBOX_PARAMID").toString(); parameterName = settings.value("QGC_PARAM_COMBOBOX_PARAMID").toString();
...@@ -394,7 +421,6 @@ void QGCComboBox::delButtonClicked() ...@@ -394,7 +421,6 @@ void QGCComboBox::delButtonClicked()
} }
void QGCComboBox::comboBoxIndexChanged(QString val) void QGCComboBox::comboBoxIndexChanged(QString val)
{ {
qDebug() << "comboboxchanged:" << comboBoxTextToValMap[val] << val;
switch (parameterValue.type()) switch (parameterValue.type())
{ {
case QVariant::Char: case QVariant::Char:
......
src/ui/designer/QGCComboBox.h
View file @ 5e03573c
...@@ -28,6 +28,7 @@ public slots: ...@@ -28,6 +28,7 @@ public slots:
/** @brief Update the UI with the new parameter value */ /** @brief Update the UI with the new parameter value */
void setParameterValue(int uas, int component, int paramCount, int paramIndex, QString parameterName, const QVariant value); void setParameterValue(int uas, int component, int paramCount, int paramIndex, QString parameterName, const QVariant value);
void writeSettings(QSettings& settings); void writeSettings(QSettings& settings);
void readSettings(const QString& pre,const QVariantMap& settings);
void readSettings(const QSettings& settings); void readSettings(const QSettings& settings);
void refreshParamList(); void refreshParamList();
void setActiveUAS(UASInterface *uas); void setActiveUAS(UASInterface *uas);
......
src/ui/designer/QGCComboBox.ui
View file @ 5e03573c
...@@ -247,11 +247,7 @@ ...@@ -247,11 +247,7 @@
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
</property> </property>
<property name="text"> <property name="text">
<string/> <string>?</string>
</property>
<property name="icon">
<iconset resource="../../../qgroundcontrol.qrc">
<normaloff>:/files/images/status/dialog-information.svg</normaloff>:/files/images/status/dialog-information.svg</iconset>
</property> </property>
<property name="popupMode"> <property name="popupMode">
<enum>QToolButton::DelayedPopup</enum> <enum>QToolButton::DelayedPopup</enum>
...@@ -285,8 +281,6 @@ ...@@ -285,8 +281,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="../../../qgroundcontrol.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>
src/ui/designer/QGCCommandButton.cc
View file @ 5e03573c
...@@ -241,7 +241,58 @@ void QGCCommandButton::writeSettings(QSettings& settings) ...@@ -241,7 +241,58 @@ void QGCCommandButton::writeSettings(QSettings& settings)
settings.setValue("QGC_COMMAND_BUTTON_PARAM7", ui->editParam7SpinBox->value()); settings.setValue("QGC_COMMAND_BUTTON_PARAM7", ui->editParam7SpinBox->value());
settings.sync(); settings.sync();
} }
void QGCCommandButton::readSettings(const QString& pre,const QVariantMap& settings)
{
ui->editButtonName->setText(settings.value(pre + "QGC_COMMAND_BUTTON_BUTTONTEXT", "UNKNOWN").toString());
ui->editCommandComboBox->setCurrentIndex(settings.value(pre + "QGC_COMMAND_BUTTON_COMMANDID", 0).toInt());
ui->commandButton->setText(settings.value(pre + "QGC_COMMAND_BUTTON_BUTTONTEXT", "UNKNOWN").toString());
int commandId = settings.value(pre + "QGC_COMMAND_BUTTON_COMMANDID", 0).toInt();
ui->editParam1SpinBox->setValue(settings.value(pre + "QGC_COMMAND_BUTTON_PARAM1", 0.0).toDouble());
ui->editParam2SpinBox->setValue(settings.value(pre + "QGC_COMMAND_BUTTON_PARAM2", 0.0).toDouble());
ui->editParam3SpinBox->setValue(settings.value(pre + "QGC_COMMAND_BUTTON_PARAM3", 0.0).toDouble());
ui->editParam4SpinBox->setValue(settings.value(pre + "QGC_COMMAND_BUTTON_PARAM4", 0.0).toDouble());
ui->editParam5SpinBox->setValue(settings.value(pre + "QGC_COMMAND_BUTTON_PARAM5", 0.0).toDouble());
ui->editParam6SpinBox->setValue(settings.value(pre + "QGC_COMMAND_BUTTON_PARAM6", 0.0).toDouble());
ui->editParam7SpinBox->setValue(settings.value(pre + "QGC_COMMAND_BUTTON_PARAM7", 0.0).toDouble());
ui->editCommandComboBox->setCurrentIndex(0);
// Find combobox entry for this data
for (int i = 0; i < ui->editCommandComboBox->count(); ++i)
{
if (commandId == ui->editCommandComboBox->itemData(i).toInt())
{
ui->editCommandComboBox->setCurrentIndex(i);
}
}
ui->editParamsVisibleCheckBox->setChecked(settings.value(pre + "QGC_COMMAND_BUTTON_PARAMS_VISIBLE").toBool());
if (ui->editParamsVisibleCheckBox->isChecked())
{
ui->editParam1SpinBox->show();
ui->editParam2SpinBox->show();
ui->editParam3SpinBox->show();
ui->editParam4SpinBox->show();
ui->editParam5SpinBox->show();
ui->editParam6SpinBox->show();
ui->editParam7SpinBox->show();
}
else
{
ui->editParam1SpinBox->hide();
ui->editParam2SpinBox->hide();
ui->editParam3SpinBox->hide();
ui->editParam4SpinBox->hide();
ui->editParam5SpinBox->hide();
ui->editParam6SpinBox->hide();
ui->editParam7SpinBox->hide();
}
ui->editNameLabel->setText(settings.value(pre + "QGC_COMMAND_BUTTON_DESCRIPTION", "ERROR LOADING BUTTON").toString());
ui->nameLabel->setText(settings.value(pre + "QGC_COMMAND_BUTTON_DESCRIPTION", "ERROR LOADING BUTTON").toString());
}
void QGCCommandButton::readSettings(const QSettings& settings) void QGCCommandButton::readSettings(const QSettings& settings)
{ {
ui->editButtonName->setText(settings.value("QGC_COMMAND_BUTTON_BUTTONTEXT", "UNKNOWN").toString()); ui->editButtonName->setText(settings.value("QGC_COMMAND_BUTTON_BUTTONTEXT", "UNKNOWN").toString());
......
src/ui/designer/QGCCommandButton.h
View file @ 5e03573c
...@@ -25,6 +25,7 @@ public slots: ...@@ -25,6 +25,7 @@ public slots:
void endEditMode(); void endEditMode();
void writeSettings(QSettings& settings); void writeSettings(QSettings& settings);
void readSettings(const QSettings& settings); void readSettings(const QSettings& settings);
void readSettings(const QString& pre,const QVariantMap& settings);
private: private:
Ui::QGCCommandButton *ui; Ui::QGCCommandButton *ui;
......
src/ui/designer/QGCParamSlider.cc
View file @ 5e03573c
...@@ -40,8 +40,8 @@ QGCParamSlider::QGCParamSlider(QWidget *parent) : ...@@ -40,8 +40,8 @@ QGCParamSlider::QGCParamSlider(QWidget *parent) :
ui->editLine1->hide(); ui->editLine1->hide();
ui->editLine2->hide(); ui->editLine2->hide();
ui->editLine1->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }"); //ui->editLine1->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }");
ui->editLine2->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }"); //ui->editLine2->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }");
connect(ui->editDoneButton, SIGNAL(clicked()), this, SLOT(endEditMode())); connect(ui->editDoneButton, SIGNAL(clicked()), this, SLOT(endEditMode()));
...@@ -102,7 +102,7 @@ void QGCParamSlider::setActiveUAS(UASInterface* activeUas) ...@@ -102,7 +102,7 @@ void QGCParamSlider::setActiveUAS(UASInterface* activeUas)
connect(activeUas, SIGNAL(parameterChanged(int,int,int,int,QString,QVariant)), this, SLOT(setParameterValue(int,int,int,int,QString,QVariant)), Qt::UniqueConnection); connect(activeUas, SIGNAL(parameterChanged(int,int,int,int,QString,QVariant)), this, SLOT(setParameterValue(int,int,int,int,QString,QVariant)), Qt::UniqueConnection);
uas = activeUas; uas = activeUas;
// Update current param value // Update current param value
requestParameter(); //requestParameter();
// Set param info // Set param info
QString text = uas->getParamManager()->getParamInfo(parameterName); QString text = uas->getParamManager()->getParamInfo(parameterName);
ui->infoLabel->setToolTip(text); ui->infoLabel->setToolTip(text);
...@@ -428,6 +428,27 @@ void QGCParamSlider::writeSettings(QSettings& settings) ...@@ -428,6 +428,27 @@ void QGCParamSlider::writeSettings(QSettings& settings)
settings.setValue("QGC_PARAM_SLIDER_DISPLAY_INFO", ui->editInfoCheckBox->isChecked()); settings.setValue("QGC_PARAM_SLIDER_DISPLAY_INFO", ui->editInfoCheckBox->isChecked());
settings.sync(); settings.sync();
} }
void QGCParamSlider::readSettings(const QString& pre,const QVariantMap& settings)
{
parameterName = settings.value(pre + "QGC_PARAM_SLIDER_PARAMID").toString();
component = settings.value(pre + "QGC_PARAM_SLIDER_COMPONENTID").toInt();
ui->nameLabel->setText(settings.value(pre + "QGC_PARAM_SLIDER_DESCRIPTION").toString());
ui->editNameLabel->setText(settings.value(pre + "QGC_PARAM_SLIDER_DESCRIPTION").toString());
//settings.setValue("QGC_PARAM_SLIDER_BUTTONTEXT", ui->actionButton->text());
ui->editSelectParamComboBox->addItem(settings.value(pre + "QGC_PARAM_SLIDER_PARAMID").toString());
ui->editSelectParamComboBox->setCurrentIndex(ui->editSelectParamComboBox->count()-1);
ui->editSelectComponentComboBox->addItem(tr("Component #%1").arg(settings.value(pre + "QGC_PARAM_SLIDER_COMPONENTID").toInt()), settings.value(pre + "QGC_PARAM_SLIDER_COMPONENTID").toInt());
ui->editMinSpinBox->setValue(settings.value(pre + "QGC_PARAM_SLIDER_MIN").toFloat());
ui->editMaxSpinBox->setValue(settings.value(pre + "QGC_PARAM_SLIDER_MAX").toFloat());
showInfo(settings.value(pre + "QGC_PARAM_SLIDER_DISPLAY_INFO", true).toBool());
ui->editSelectParamComboBox->setEnabled(true);
ui->editSelectComponentComboBox->setEnabled(true);
setActiveUAS(UASManager::instance()->getActiveUAS());
// Get param value after settings have been loaded
//requestParameter();
}
void QGCParamSlider::readSettings(const QSettings& settings) void QGCParamSlider::readSettings(const QSettings& settings)
{ {
...@@ -448,5 +469,5 @@ void QGCParamSlider::readSettings(const QSettings& settings) ...@@ -448,5 +469,5 @@ void QGCParamSlider::readSettings(const QSettings& settings)
setActiveUAS(UASManager::instance()->getActiveUAS()); setActiveUAS(UASManager::instance()->getActiveUAS());
// Get param value after settings have been loaded // Get param value after settings have been loaded
requestParameter(); //requestParameter();
} }
src/ui/designer/QGCParamSlider.h
View file @ 5e03573c
...@@ -31,6 +31,7 @@ public slots: ...@@ -31,6 +31,7 @@ public slots:
void setParameterValue(int uas, int component, int paramCount, int paramIndex, QString parameterName, const QVariant value); void setParameterValue(int uas, int component, int paramCount, int paramIndex, QString parameterName, const QVariant value);
void writeSettings(QSettings& settings); void writeSettings(QSettings& settings);
void readSettings(const QSettings& settings); void readSettings(const QSettings& settings);
void readSettings(const QString& pre,const QVariantMap& settings);
void refreshParamList(); void refreshParamList();
void setActiveUAS(UASInterface *uas); void setActiveUAS(UASInterface *uas);
void selectComponent(int componentIndex); void selectComponent(int componentIndex);
......
src/ui/designer/QGCParamSlider.ui
View file @ 5e03573c
...@@ -282,18 +282,12 @@ ...@@ -282,18 +282,12 @@
<item row="2" column="3"> <item row="2" column="3">
<widget class="QToolButton" name="infoLabel"> <widget class="QToolButton" name="infoLabel">
<property name="text"> <property name="text">
<string/> <string>?</string>
</property>
<property name="icon">
<iconset resource="../../../qgroundcontrol.qrc">
<normaloff>:/files/images/status/dialog-information.svg</normaloff>:/files/images/status/dialog-information.svg</iconset>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="../../../qgroundcontrol.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>
src/ui/designer/QGCToolWidget.cc
View file @ 5e03573c
...@@ -65,7 +65,7 @@ QGCToolWidget::QGCToolWidget(const QString& title, QWidget *parent, QSettings* s ...@@ -65,7 +65,7 @@ QGCToolWidget::QGCToolWidget(const QString& title, QWidget *parent, QSettings* s
// Enforce storage if this not loaded from settings // Enforce storage if this not loaded from settings
// is MUST NOT BE SAVED if it was loaded from settings! // is MUST NOT BE SAVED if it was loaded from settings!
if (!settings) storeWidgetsToSettings(); //if (!settings) storeWidgetsToSettings();
} }
QGCToolWidget::~QGCToolWidget() QGCToolWidget::~QGCToolWidget()
...@@ -169,6 +169,130 @@ bool QGCToolWidget::loadSettings(const QString& settings, bool singleinstance) ...@@ -169,6 +169,130 @@ bool QGCToolWidget::loadSettings(const QString& settings, bool singleinstance)
return false; return false;
} }
} }
void QGCToolWidget::setSettings(QVariantMap& settings)
{
settingsMap = settings;
QString widgetName = getTitle();
int size = settingsMap["count"].toInt();
for (int j = 0; j < size; j++)
{
QString type = settings.value(widgetName + "\\" + QString::number(j) + "\\" + "TYPE", "UNKNOWN").toString();
if (type == "SLIDER")
{
QString checkparam = settingsMap.value(widgetName + "\\" + QString::number(j) + "\\" + "QGC_PARAM_SLIDER_PARAMID").toString();
paramList.append(checkparam);
}
else if (type == "COMBO")
{
QString checkparam = settingsMap.value(widgetName + "\\" + QString::number(j) + "\\" + "QGC_PARAM_COMBOBOX_PARAMID").toString();
paramList.append(checkparam);
}
}
}
QList<QString> QGCToolWidget::getParamList()
{
return paramList;
}
void QGCToolWidget::setParameterValue(int uas, int component, QString parameterName, const QVariant value)
{
//settings.setValue("QGC_PARAM_SLIDER_PARAMID", parameterName);
//settings.setValue("QGC_PARAM_COMBOBOX_PARAMID", parameterName);
QString widgetName = getTitle();
//settings.beginGroup(widgetName);
//qDebug() << "LOADING FOR" << widgetName;
//int size = settings.beginReadArray("QGC_TOOL_WIDGET_ITEMS");
int size = settingsMap["count"].toInt();
//qDebug() << "CHILDREN SIZE:" << size;
for (int j = 0; j < size; j++)
{
QString type = settingsMap.value(widgetName + "\\" + QString::number(j) + "\\" + "TYPE", "UNKNOWN").toString();
QGCToolWidgetItem* item = NULL;
if (type == "COMMANDBUTTON")
{
return;
//item = new QGCCommandButton(this);
//qDebug() << "CREATED COMMANDBUTTON";
}
else if (type == "SLIDER")
{
QString checkparam = settingsMap.value(widgetName + "\\" + QString::number(j) + "\\" + "QGC_PARAM_SLIDER_PARAMID").toString();
if (checkparam == parameterName)
{
item = new QGCParamSlider(this);
addToolWidget(item);
item->readSettings(widgetName + "\\" + QString::number(j) + "\\",settingsMap);
return;
}
//qDebug() << "CREATED PARAM SLIDER";
}
else if (type == "COMBO")
{
QString checkparam = settingsMap.value(widgetName + "\\" + QString::number(j) + "\\" + "QGC_PARAM_COMBOBOX_PARAMID").toString();
if (checkparam == parameterName)
{
item = new QGCComboBox(this);
addToolWidget(item);
item->readSettings(widgetName + "\\" + QString::number(j) + "\\",settingsMap);
return;
}
//qDebug() << "CREATED PARAM COMBOBOX";
}
}
}
void QGCToolWidget::loadSettings(QVariantMap& settings)
{
QString widgetName = getTitle();
//settings.beginGroup(widgetName);
qDebug() << "LOADING FOR" << widgetName;
//int size = settings.beginReadArray("QGC_TOOL_WIDGET_ITEMS");
int size = settings["count"].toInt();
qDebug() << "CHILDREN SIZE:" << size;
for (int j = 0; j < size; j++)
{
QApplication::processEvents();
//settings.setArrayIndex(j);
QString type = settings.value(widgetName + "\\" + QString::number(j) + "\\" + "TYPE", "UNKNOWN").toString();
if (type != "UNKNOWN")
{
QGCToolWidgetItem* item = NULL;
if (type == "COMMANDBUTTON")
{
item = new QGCCommandButton(this);
//qDebug() << "CREATED COMMANDBUTTON";
}
else if (type == "SLIDER")
{
item = new QGCParamSlider(this);
//qDebug() << "CREATED PARAM SLIDER";
}
else if (type == "COMBO")
{
item = new QGCComboBox(this);
//qDebug() << "CREATED PARAM COMBOBOX";
}
if (item)
{
// Configure and add to layout
addToolWidget(item);
item->readSettings(widgetName + "\\" + QString::number(j) + "\\",settings);
//qDebug() << "Created tool widget";
}
}
else
{
qDebug() << "UNKNOWN TOOL WIDGET TYPE" << type;
}
}
//settings.endArray();
//settings.endGroup();
}
void QGCToolWidget::loadSettings(QSettings& settings) void QGCToolWidget::loadSettings(QSettings& settings)
{ {
...@@ -480,7 +604,7 @@ void QGCToolWidget::setTitle(QString title) ...@@ -480,7 +604,7 @@ void QGCToolWidget::setTitle(QString title)
QDockWidget* parent = dynamic_cast<QDockWidget*>(this->parentWidget()); QDockWidget* parent = dynamic_cast<QDockWidget*>(this->parentWidget());
if (parent) parent->setWindowTitle(title); if (parent) parent->setWindowTitle(title);
// Store all widgets // Store all widgets
storeWidgetsToSettings(); //storeWidgetsToSettings();
emit titleChanged(title); emit titleChanged(title);
if (mainMenuAction) mainMenuAction->setText(title); if (mainMenuAction) mainMenuAction->setText(title);
......
src/ui/designer/QGCToolWidget.h
View file @ 5e03573c
...@@ -45,6 +45,7 @@ public slots: ...@@ -45,6 +45,7 @@ public slots:
void importWidget(); void importWidget();
/** @brief Store all widgets of this type to QSettings */ /** @brief Store all widgets of this type to QSettings */
static void storeWidgetsToSettings(QString settingsFile=QString()); static void storeWidgetsToSettings(QString settingsFile=QString());
void loadSettings(QVariantMap& settings);
/** @brief Load this widget from a QSettings object */ /** @brief Load this widget from a QSettings object */
void loadSettings(QSettings& settings); void loadSettings(QSettings& settings);
/** @brief Load this widget from a settings file */ /** @brief Load this widget from a settings file */
...@@ -57,11 +58,15 @@ public slots: ...@@ -57,11 +58,15 @@ public slots:
void storeSettings(); void storeSettings();
/** @brief Store the view id and dock widget area */ /** @brief Store the view id and dock widget area */
void setViewVisibilityAndDockWidgetArea(int view, bool visible, Qt::DockWidgetArea area); void setViewVisibilityAndDockWidgetArea(int view, bool visible, Qt::DockWidgetArea area);
void setSettings(QVariantMap& settings);
QList<QString> getParamList();
void setParameterValue(int uas, int component, QString parameterName, const QVariant value);
signals: signals:
void titleChanged(QString); void titleChanged(QString);
protected: protected:
QList<QString> paramList;
QVariantMap settingsMap;
QAction* addParamAction; QAction* addParamAction;
QAction* addCommandAction; QAction* addCommandAction;
QAction* setTitleAction; QAction* setTitleAction;
...@@ -83,12 +88,13 @@ protected: ...@@ -83,12 +88,13 @@ protected:
void addToolWidget(QGCToolWidgetItem* widget); void addToolWidget(QGCToolWidgetItem* widget);
void hideEvent(QHideEvent* event); void hideEvent(QHideEvent* event);
public slots:
void setTitle(QString title);
protected slots: protected slots:
void addParam(); void addParam();
void addCommand(); void addCommand();
void setTitle(); void setTitle();
void setTitle(QString title);
void setWindowTitle(const QString& title); void setWindowTitle(const QString& title);
......
src/ui/designer/QGCToolWidgetItem.h
View file @ 5e03573c
...@@ -26,6 +26,7 @@ public slots: ...@@ -26,6 +26,7 @@ public slots:
} }
virtual void writeSettings(QSettings& settings) = 0; virtual void writeSettings(QSettings& settings) = 0;
virtual void readSettings(const QSettings& settings) = 0; virtual void readSettings(const QSettings& settings) = 0;
virtual void readSettings(const QString& pre,const QVariantMap& settings) = 0;
virtual void setActiveUAS(UASInterface *uas); virtual void setActiveUAS(UASInterface *uas);
signals: signals:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment