From c5a11aaa94adc9406fdccc8e838308eab67194b4 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 13 Apr 2015 22:12:15 -0700 Subject: [PATCH] Remove unused code --- src/uas/QGCUASParamManager.cc | 27 --------------------------- src/uas/QGCUASParamManager.h | 4 ---- 2 files changed, 31 deletions(-) diff --git a/src/uas/QGCUASParamManager.cc b/src/uas/QGCUASParamManager.cc index 0085120..bec6cfa 100644 --- a/src/uas/QGCUASParamManager.cc +++ b/src/uas/QGCUASParamManager.cc @@ -21,9 +21,6 @@ QGCUASParamManager* QGCUASParamManager::initWithUAS(UASInterface* uas) { mav = uas; - // Load default values and tooltips for data model - loadParamMetaInfoCSV(); - paramDataModel.setUASID(mav->getUASID()); paramCommsMgr.initWithUAS(uas); @@ -143,30 +140,6 @@ void QGCUASParamManager::setPendingParam(int compId, const QString& paramName, -void QGCUASParamManager::loadParamMetaInfoCSV() -{ - // Load default values and tooltips - QString autopilot(mav->getAutopilotTypeName()); - - QDir appDir = QApplication::applicationDirPath(); - appDir.cd("files"); - QString fileName = QString("%1/%2/parameter_tooltips/tooltips.txt").arg(appDir.canonicalPath()).arg(autopilot.toLower()); - QFile paramMetaFile(fileName); - - qDebug() << "loadParamMetaInfoCSV for autopilot: " << autopilot << " from file: " << fileName; - - if (!paramMetaFile.open(QIODevice::ReadOnly | QIODevice::Text)) { - qDebug() << "loadParamMetaInfoCSV couldn't open:" << fileName; - return; - } - - QTextStream in(¶mMetaFile); - paramDataModel.loadParamMetaInfoFromStream(in); - paramMetaFile.close(); - -} - - UASInterface* QGCUASParamManager::getUAS() { return mav; diff --git a/src/uas/QGCUASParamManager.h b/src/uas/QGCUASParamManager.h index 27853dd..421f754 100644 --- a/src/uas/QGCUASParamManager.h +++ b/src/uas/QGCUASParamManager.h @@ -65,10 +65,6 @@ public: virtual bool parametersReady(void) { return _parametersReady; } protected: - - /** @brief Load parameter meta information from appropriate CSV file */ - virtual void loadParamMetaInfoCSV(); - void connectToModelAndComms();