From a8b6e1f959fba61f81d1534071e816ff72568558 Mon Sep 17 00:00:00 2001
From: m_thread <fredrik@arvidssons.org>
Date: Sat, 28 Feb 2015 00:14:51 +0100
Subject: [PATCH] OP-1755 Added additional location for cloudconfigs.

---
 .../pages/airframeinitialtuningpage.cpp       | 23 ++++++++++++-------
 .../pages/airframeinitialtuningpage.h         |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp
index 0d279385a..86a0f553d 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp
@@ -169,15 +169,10 @@ bool AirframeInitialTuningPage::airframeIsCompatible(int vehicleType, int vehicl
     }
 }
 
-void AirframeInitialTuningPage::loadValidFiles()
+void AirframeInitialTuningPage::loadFilesInDir(QString templateBasePath)
 {
-    ui->templateList->clear();
-    foreach(QJsonObject * templ, m_templates.values()) {
-        delete templ;
-    }
-    m_templates.clear();
-
-    QDir templateDir(QString("%1/%2/").arg(Utils::PathUtils().InsertDataPath("%%DATAPATH%%cloudconfig")).arg(m_dir));
+    QDir templateDir(templateBasePath);
+    qDebug() << "Loading templates from base path:" << templateBasePath;
     QStringList names;
     names << "*.optmpl";
     templateDir.setNameFilters(names);
@@ -207,6 +202,18 @@ void AirframeInitialTuningPage::loadValidFiles()
     }
 }
 
+void AirframeInitialTuningPage::loadValidFiles()
+{
+    ui->templateList->clear();
+    foreach(QJsonObject * templ, m_templates.values()) {
+        delete templ;
+    }
+    m_templates.clear();
+
+    loadFilesInDir(QString("%1/%2/").arg(Utils::PathUtils().InsertDataPath("%%DATAPATH%%cloudconfig")).arg(m_dir));
+    loadFilesInDir(QString("%1/%2/").arg(Utils::PathUtils().InsertStoragePath("%%STOREPATH%%cloudconfig")).arg(m_dir));
+}
+
 void AirframeInitialTuningPage::setupTemplateList()
 {
     QListWidgetItem *item;
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.h b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.h
index 258beb9d1..fecad62bf 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.h
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.h
@@ -44,7 +44,6 @@ public:
     void initializePage();
     bool validatePage();
     bool isComplete() const;
-
 public slots:
     void templateSelectionChanged();
 
@@ -59,6 +58,7 @@ private:
     QGraphicsPixmapItem *m_photoItem;
 
     void loadValidFiles();
+    void loadFilesInDir(QString templateBasePath);
     void setupTemplateList();
     QString getTemplateKey(QJsonObject *templ);
     void updatePhoto(QJsonObject *templ);