Merged in filnet/librepilot/LP-565_make_pfd_saved_model_file_relative_to_gcs_data_dir (pull request #483)

LP-565 make pfd saved model file relative to gcs data dir

Approved-by: Lalanne Laurent <f5soh@free.fr>
Approved-by: Philippe Renon <philippe_renon@yahoo.fr>

Author: filnet

ground/gcs/src/plugins/pfdqml/pfdqmlcontext.cpp

@@ -328,12 +328,12 @@ void PfdQmlContext::loadConfiguration(PfdQmlGadgetConfiguration *config)
 
 void PfdQmlContext::saveState(QSettings &settings) const
 {
-    settings.setValue("modelFile", modelFile());
+    settings.setValue("modelFile", Utils::RemoveDataPath(modelFile()));
 }
 
 void PfdQmlContext::restoreState(QSettings &settings)
 {
-    QString file = settings.value("modelFile").toString();
+    QString file = Utils::InsertDataPath(settings.value("modelFile").toString());
 
     if (!file.isEmpty()) {
         setModelFile(file);

ground/gcs/src/plugins/pfdqml/pfdqmlgadgetconfiguration.cpp

@@ -68,12 +68,10 @@ PfdQmlGadgetConfiguration::PfdQmlGadgetConfiguration(QString classId, QSettings
     // model
     m_modelEnabled        = settings.value("modelEnabled").toBool();
     m_modelSelectionMode  = static_cast<ModelSelectionMode::Enum>(settings.value("modelSelectionMode", ModelSelectionMode::Auto).toUInt());
-    m_modelFile           = settings.value("modelFile", "Unknown").toString();
-    m_modelFile           = Utils::InsertDataPath(m_modelFile);
+    m_modelFile           = Utils::InsertDataPath(settings.value("modelFile", "Unknown").toString());
 
     // background image
-    m_backgroundImageFile = settings.value("backgroundImageFile", "Unknown").toString();
-    m_backgroundImageFile = Utils::InsertDataPath(m_backgroundImageFile);
+    m_backgroundImageFile = Utils::InsertDataPath(settings.value("backgroundImageFile", "Unknown").toString());
 
     // gstreamer pipeline
     m_gstPipeline         = settings.value("gstPipeline").toString();
@@ -156,12 +154,10 @@ void PfdQmlGadgetConfiguration::saveConfig(QSettings &settings) const
     // model
     settings.setValue("modelEnabled", m_modelEnabled);
     settings.setValue("modelSelectionMode", static_cast<uint>(m_modelSelectionMode));
-    QString modelFile = Utils::RemoveDataPath(m_modelFile);
-    settings.setValue("modelFile", modelFile);
+    settings.setValue("modelFile", Utils::RemoveDataPath(m_modelFile));
 
     // background image
-    QString backgroundImageFile = Utils::RemoveDataPath(m_backgroundImageFile);
-    settings.setValue("backgroundImageFile", backgroundImageFile);
+    settings.setValue("backgroundImageFile", Utils::RemoveDataPath(m_backgroundImageFile));
 
     // gstreamer pipeline
     settings.setValue("gstPipeline", m_gstPipeline);