diff --git a/src/uas/QGCUASParamManager.cc b/src/uas/QGCUASParamManager.cc index 7193bce82f227cc818172a5e8753c6139b50b61c..ee42aa96847d68b2e91c5764afee3623a69ed9cf 100644 --- a/src/uas/QGCUASParamManager.cc +++ b/src/uas/QGCUASParamManager.cc @@ -24,4 +24,7 @@ void QGCUASParamManager::requestParameterListUpdate(int component) Q_UNUSED(component); } +bool QGCUASParamManager::getParameterValue(int component, const QString& parameter, QVariant& value) const { + return paramDataModel->getOnboardParameterValue(component,parameter,value); +} diff --git a/src/uas/QGCUASParamManager.h b/src/uas/QGCUASParamManager.h index 130e9a18cba5cf9959b702f34b4005f70a6819c3..7f970ef6dc7320e98da50b2ff6416ad5dcad2154 100644 --- a/src/uas/QGCUASParamManager.h +++ b/src/uas/QGCUASParamManager.h @@ -15,27 +15,7 @@ class QGCUASParamManager : public QWidget public: QGCUASParamManager(UASInterface* uas, QWidget *parent = 0); - QList getParameterNames(int component) const { - return onboardParameters.value(component)->keys(); - } - QList getParameterValues(int component) const { - return onboardParameters.value(component)->values(); - } - bool getParameterValue(int component, const QString& parameter, QVariant& value) const { - if (!onboardParameters.contains(component)) - { - return false; - } - - if (!onboardParameters.value(component)->contains(parameter)) - { - return false; - } - - value = onboardParameters.value(component)->value(parameter); - - return true; - } + virtual bool getParameterValue(int component, const QString& parameter, QVariant& value) const; virtual bool isParamMinKnown(const QString& param) = 0; virtual bool isParamMaxKnown(const QString& param) = 0; @@ -66,7 +46,6 @@ protected: // Parameter data model UASInterface* mav; ///< The MAV this widget is controlling - QMap* > onboardParameters; ///< All parameters UASParameterDataModel* paramDataModel;///< Shared data model of parameters // Communications management