rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-16 08:29:15 +01:00
Code Issues Releases Activity

removed unnecesssary PathUtils class around functions

Browse Source
This commit is contained in:
LibrePilot Packager 2015-07-11 23:36:16 +01:00 committed by James Duley
parent 1e662d6175
commit 77cdbcc351
17 changed files with 45 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/openpilotgcs/src/app/main.cpp
View File

@ -342,7 +342,7 @@ AppOptionValues parseCommandLine(SharedTools::QtSingleApplication &app,
void loadFactoryDefaults(QSettings &settings, AppOptionValues &appOptionValues) void loadFactoryDefaults(QSettings &settings, AppOptionValues &appOptionValues)
{ {
QDir directory(Utils::PathUtils().GetDataPath() + QString("default_configurations")); QDir directory(Utils::GetDataPath() + QString("default_configurations"));
qDebug() << "Looking for factory defaults configuration files in:" << directory.absolutePath(); qDebug() << "Looking for factory defaults configuration files in:" << directory.absolutePath();
@ -414,7 +414,7 @@ void overrideSettings(QSettings &settings, int argc, char * *argv)
void loadTranslators(QString language, QTranslator &translator, QTranslator &qtTranslator) void loadTranslators(QString language, QTranslator &translator, QTranslator &qtTranslator)
{ {
const QString &creatorTrPath = Utils::PathUtils().GetDataPath() + QLatin1String("translations"); const QString &creatorTrPath = Utils::GetDataPath() + QLatin1String("translations");
if (translator.load(QLatin1String("openpilotgcs_") + language, creatorTrPath)) { if (translator.load(QLatin1String("openpilotgcs_") + language, creatorTrPath)) {
const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath); const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
@ -472,7 +472,7 @@ int main(int argc, char * *argv)
// load user settings // load user settings
// Must be done before any QSettings class is created // Must be done before any QSettings class is created
// keep this in sync with the MainWindow ctor in coreplugin/mainwindow.cpp // keep this in sync with the MainWindow ctor in coreplugin/mainwindow.cpp
QString settingsPath = Utils::PathUtils().GetDataPath(); QString settingsPath = Utils::GetDataPath();
qDebug() << "Loading system settings from" << settingsPath; qDebug() << "Loading system settings from" << settingsPath;
QSettings::setPath(XmlConfig::XmlSettingsFormat, QSettings::SystemScope, settingsPath); QSettings::setPath(XmlConfig::XmlSettingsFormat, QSettings::SystemScope, settingsPath);
QSettings settings; QSettings settings;

2
ground/openpilotgcs/src/libs/opmapcontrol/src/core/cache.cpp
View File

@ -54,7 +54,7 @@ QString Cache::CacheLocation()
Cache::Cache() Cache::Cache()
{ {
if (cache.isNull() | cache.isEmpty()) { if (cache.isNull() | cache.isEmpty()) {
cache = Utils::PathUtils().GetStoragePath() + "mapscache" + QDir::separator(); cache = Utils::GetStoragePath() + "mapscache" + QDir::separator();
setCacheLocation(cache); setCacheLocation(cache);
} }
} }

15
ground/openpilotgcs/src/libs/utils/pathutils.cpp
View File

@ -33,15 +33,12 @@
namespace Utils { namespace Utils {
PathUtils::PathUtils()
{}
/** /**
Returns the base path of the share directory. Returns the base path of the share directory.
Path is in Qt/Unix conventions, separated by "/". Path is in Qt/Unix conventions, separated by "/".
*/ */
QString PathUtils::GetDataPath() QString GetDataPath()
{ {
QString dataPath = QApplication::applicationDirPath(); QString dataPath = QApplication::applicationDirPath();
dataPath += QLatin1Char('/'); dataPath += QLatin1Char('/');
@ -56,7 +53,7 @@ QString PathUtils::GetDataPath()
Always returns a path converted to "/". Always returns a path converted to "/".
*/ */
QString PathUtils::RemoveDataPath(QString path) QString RemoveDataPath(QString path)
{ {
// Depending on the platform, we might get either "/" or "\" // Depending on the platform, we might get either "/" or "\"
// so we need to go to the standard ("/") // so we need to go to the standard ("/")
@ -75,7 +72,7 @@ QString PathUtils::RemoveDataPath(QString path)
Returns a "/" or "\" separated path depending on platform conventions. Returns a "/" or "\" separated path depending on platform conventions.
*/ */
QString PathUtils::InsertDataPath(QString path) QString InsertDataPath(QString path)
{ {
if (path.startsWith(QString("%%DATAPATH%%"))) { if (path.startsWith(QString("%%DATAPATH%%"))) {
QString newPath = GetDataPath(); QString newPath = GetDataPath();
@ -88,7 +85,7 @@ QString PathUtils::InsertDataPath(QString path)
/** /**
Gets a standard user-writable location for the system Gets a standard user-writable location for the system
*/ */
QString PathUtils::GetStoragePath() QString GetStoragePath()
{ {
return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1Char('/'); return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1Char('/');
} }
@ -96,7 +93,7 @@ QString PathUtils::GetStoragePath()
/** /**
Removes the standard storage path and replace with a tag Removes the standard storage path and replace with a tag
*/ */
QString PathUtils::RemoveStoragePath(QString path) QString RemoveStoragePath(QString path)
{ {
// Depending on the platform, we might get either "/" or "\" // Depending on the platform, we might get either "/" or "\"
// so we need to go to the standard ("/") // so we need to go to the standard ("/")
@ -113,7 +110,7 @@ QString PathUtils::RemoveStoragePath(QString path)
/** /**
Inserts the standard storage path is there is a storage path tag Inserts the standard storage path is there is a storage path tag
*/ */
QString PathUtils::InsertStoragePath(QString path) QString InsertStoragePath(QString path)
{ {
if (path.startsWith(QString("%%STOREPATH%%"))) { if (path.startsWith(QString("%%STOREPATH%%"))) {
QString newPath = GetStoragePath(); QString newPath = GetStoragePath();

16
ground/openpilotgcs/src/libs/utils/pathutils.h
View File

@ -36,17 +36,13 @@
#include <QSettings> #include <QSettings>
namespace Utils { namespace Utils {
class QTCREATOR_UTILS_EXPORT PathUtils { QTCREATOR_UTILS_EXPORT QString GetDataPath();
public: QTCREATOR_UTILS_EXPORT QString RemoveDataPath(QString path);
PathUtils(); QTCREATOR_UTILS_EXPORT QString InsertDataPath(QString path);
QString GetDataPath();
QString RemoveDataPath(QString path);
QString InsertDataPath(QString path);
QString GetStoragePath(); QTCREATOR_UTILS_EXPORT QString GetStoragePath();
QString RemoveStoragePath(QString path); QTCREATOR_UTILS_EXPORT QString RemoveStoragePath(QString path);
QString InsertStoragePath(QString path); QTCREATOR_UTILS_EXPORT QString InsertStoragePath(QString path);
};
} }
#endif /* PATHUTILS_H */ #endif /* PATHUTILS_H */

4
ground/openpilotgcs/src/plugins/dial/dialgadgetconfiguration.cpp
View File

@ -60,7 +60,7 @@ DialGadgetConfiguration::DialGadgetConfiguration(QString classId, QSettings *qSe
if (qSettings != 0) { if (qSettings != 0) {
QString dialFile = qSettings->value("dialFile").toString(); QString dialFile = qSettings->value("dialFile").toString();
m_defaultDial = Utils::PathUtils().InsertDataPath(dialFile); m_defaultDial = Utils::InsertDataPath(dialFile);
dialBackgroundID = qSettings->value("dialBackgroundID").toString(); dialBackgroundID = qSettings->value("dialBackgroundID").toString();
dialForegroundID = qSettings->value("dialForegroundID").toString(); dialForegroundID = qSettings->value("dialForegroundID").toString();
dialNeedleID1 = qSettings->value("dialNeedleID1").toString(); dialNeedleID1 = qSettings->value("dialNeedleID1").toString();
@ -135,7 +135,7 @@ IUAVGadgetConfiguration *DialGadgetConfiguration::clone()
*/ */
void DialGadgetConfiguration::saveConfig(QSettings *settings) const void DialGadgetConfiguration::saveConfig(QSettings *settings) const
{ {
QString dialFile = Utils::PathUtils().RemoveDataPath(m_defaultDial); QString dialFile = Utils::RemoveDataPath(m_defaultDial);
settings->setValue("dialFile", dialFile); settings->setValue("dialFile", dialFile);

4
ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetconfiguration.cpp
View File

@ -52,7 +52,7 @@ LineardialGadgetConfiguration::LineardialGadgetConfiguration(QString classId, QS
// if a saved configuration exists load it // if a saved configuration exists load it
if (qSettings != 0) { if (qSettings != 0) {
QString dFile = qSettings->value("dFile").toString(); QString dFile = qSettings->value("dFile").toString();
dialFile = Utils::PathUtils().InsertDataPath(dFile); dialFile = Utils::InsertDataPath(dFile);
sourceDataObject = qSettings->value("sourceDataObject").toString(); sourceDataObject = qSettings->value("sourceDataObject").toString();
sourceObjectField = qSettings->value("sourceObjectField").toString(); sourceObjectField = qSettings->value("sourceObjectField").toString();
minValue = qSettings->value("minValue").toDouble(); minValue = qSettings->value("minValue").toDouble();
@ -103,7 +103,7 @@ IUAVGadgetConfiguration *LineardialGadgetConfiguration::clone()
*/ */
void LineardialGadgetConfiguration::saveConfig(QSettings *qSettings) const void LineardialGadgetConfiguration::saveConfig(QSettings *qSettings) const
{ {
QString dFile = Utils::PathUtils().RemoveDataPath(dialFile); QString dFile = Utils::RemoveDataPath(dialFile);
qSettings->setValue("dFile", dFile); qSettings->setValue("dFile", dFile);
qSettings->setValue("sourceDataObject", sourceDataObject); qSettings->setValue("sourceDataObject", sourceDataObject);

8
ground/openpilotgcs/src/plugins/modelview/modelviewgadgetconfiguration.cpp
View File

@ -39,8 +39,8 @@ ModelViewGadgetConfiguration::ModelViewGadgetConfiguration(QString classId, QSet
QString modelFile = qSettings->value("acFilename").toString(); QString modelFile = qSettings->value("acFilename").toString();
QString bgFile = qSettings->value("bgFilename").toString(); QString bgFile = qSettings->value("bgFilename").toString();
m_enableVbo = qSettings->value("enableVbo").toBool(); m_enableVbo = qSettings->value("enableVbo").toBool();
m_acFilename = Utils::PathUtils().InsertDataPath(modelFile); m_acFilename = Utils::InsertDataPath(modelFile);
m_bgFilename = Utils::PathUtils().InsertDataPath(bgFile); m_bgFilename = Utils::InsertDataPath(bgFile);
} }
} }
@ -60,7 +60,7 @@ IUAVGadgetConfiguration *ModelViewGadgetConfiguration::clone()
*/ */
void ModelViewGadgetConfiguration::saveConfig(QSettings *qSettings) const void ModelViewGadgetConfiguration::saveConfig(QSettings *qSettings) const
{ {
qSettings->setValue("acFilename", Utils::PathUtils().RemoveDataPath(m_acFilename)); qSettings->setValue("acFilename", Utils::RemoveDataPath(m_acFilename));
qSettings->setValue("bgFilename", Utils::PathUtils().RemoveDataPath(m_bgFilename)); qSettings->setValue("bgFilename", Utils::RemoveDataPath(m_bgFilename));
qSettings->setValue("enableVbo", m_enableVbo); qSettings->setValue("enableVbo", m_enableVbo);
} }

4
ground/openpilotgcs/src/plugins/notify/notificationitem.cpp
View File

@ -105,7 +105,7 @@ void NotificationItem::copyTo(NotificationItem *that) const
void NotificationItem::saveState(QSettings *settings) const void NotificationItem::saveState(QSettings *settings) const
{ {
settings->setValue("SoundCollectionPath", Utils::PathUtils().RemoveDataPath(getSoundCollectionPath())); settings->setValue("SoundCollectionPath", Utils::RemoveDataPath(getSoundCollectionPath()));
settings->setValue(QLatin1String("CurrentLanguage"), getCurrentLanguage()); settings->setValue(QLatin1String("CurrentLanguage"), getCurrentLanguage());
settings->setValue(QLatin1String("ObjectField"), getObjectField()); settings->setValue(QLatin1String("ObjectField"), getObjectField());
settings->setValue(QLatin1String("DataObject"), getDataObject()); settings->setValue(QLatin1String("DataObject"), getDataObject());
@ -124,7 +124,7 @@ void NotificationItem::saveState(QSettings *settings) const
void NotificationItem::restoreState(QSettings *settings) void NotificationItem::restoreState(QSettings *settings)
{ {
// settings = Core::ICore::instance()->settings(); // settings = Core::ICore::instance()->settings();
setSoundCollectionPath(Utils::PathUtils().InsertDataPath(settings->value(QLatin1String("SoundCollectionPath"), tr("")).toString())); setSoundCollectionPath(Utils::InsertDataPath(settings->value(QLatin1String("SoundCollectionPath"), tr("")).toString()));
setCurrentLanguage(settings->value(QLatin1String("CurrentLanguage"), tr("")).toString()); setCurrentLanguage(settings->value(QLatin1String("CurrentLanguage"), tr("")).toString());
setDataObject(settings->value(QLatin1String("DataObject"), tr("")).toString()); setDataObject(settings->value(QLatin1String("DataObject"), tr("")).toString());
setObjectField(settings->value(QLatin1String("ObjectField"), tr("")).toString()); setObjectField(settings->value(QLatin1String("ObjectField"), tr("")).toString());

2
ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp
View File

@ -384,7 +384,7 @@ void NotifyPluginOptionsPage::updateConfigView(NotificationItem *notification)
QString path = notification->getSoundCollectionPath(); QString path = notification->getSoundCollectionPath();
if (path.isEmpty()) { if (path.isEmpty()) {
path = Utils::PathUtils().InsertDataPath("%%DATAPATH%%sounds"); path = Utils::InsertDataPath("%%DATAPATH%%sounds");
} }
_optionsPage->SoundDirectoryPathChooser->setPath(path); _optionsPage->SoundDirectoryPathChooser->setPath(path);

8
ground/openpilotgcs/src/plugins/opmap/opmapgadgetconfiguration.cpp
View File

@ -39,7 +39,7 @@ OPMapGadgetConfiguration::OPMapGadgetConfiguration(QString classId, QSettings *q
m_showTileGridLines(false), m_showTileGridLines(false),
m_accessMode("ServerAndCache"), m_accessMode("ServerAndCache"),
m_useMemoryCache(true), m_useMemoryCache(true),
m_cacheLocation(Utils::PathUtils().GetStoragePath() + "mapscache" + QDir::separator()), m_cacheLocation(Utils::GetStoragePath() + "mapscache" + QDir::separator()),
m_uavSymbol(QString::fromUtf8(":/uavs/images/mapquad.png")), m_uavSymbol(QString::fromUtf8(":/uavs/images/mapquad.png")),
m_maxUpdateRate(2000), // ms m_maxUpdateRate(2000), // ms
m_settings(qSettings), m_settings(qSettings),
@ -81,7 +81,7 @@ OPMapGadgetConfiguration::OPMapGadgetConfiguration(QString classId, QSettings *q
} }
m_useMemoryCache = useMemoryCache; m_useMemoryCache = useMemoryCache;
if (!cacheLocation.isEmpty()) { if (!cacheLocation.isEmpty()) {
m_cacheLocation = Utils::PathUtils().InsertStoragePath(cacheLocation); m_cacheLocation = Utils::InsertStoragePath(cacheLocation);
} }
} }
} }
@ -119,7 +119,7 @@ void OPMapGadgetConfiguration::saveConfig() const
m_settings->setValue("accessMode", m_accessMode); m_settings->setValue("accessMode", m_accessMode);
m_settings->setValue("useMemoryCache", m_useMemoryCache); m_settings->setValue("useMemoryCache", m_useMemoryCache);
m_settings->setValue("uavSymbol", m_uavSymbol); m_settings->setValue("uavSymbol", m_uavSymbol);
m_settings->setValue("cacheLocation", Utils::PathUtils().RemoveStoragePath(m_cacheLocation)); m_settings->setValue("cacheLocation", Utils::RemoveStoragePath(m_cacheLocation));
m_settings->setValue("maxUpdateRate", m_maxUpdateRate); m_settings->setValue("maxUpdateRate", m_maxUpdateRate);
m_settings->setValue("overlayOpacity", m_opacity); m_settings->setValue("overlayOpacity", m_opacity);
} }
@ -134,7 +134,7 @@ void OPMapGadgetConfiguration::saveConfig(QSettings *qSettings) const
qSettings->setValue("accessMode", m_accessMode); qSettings->setValue("accessMode", m_accessMode);
qSettings->setValue("useMemoryCache", m_useMemoryCache); qSettings->setValue("useMemoryCache", m_useMemoryCache);
qSettings->setValue("uavSymbol", m_uavSymbol); qSettings->setValue("uavSymbol", m_uavSymbol);
qSettings->setValue("cacheLocation", Utils::PathUtils().RemoveStoragePath(m_cacheLocation)); qSettings->setValue("cacheLocation", Utils::RemoveStoragePath(m_cacheLocation));
qSettings->setValue("maxUpdateRate", m_maxUpdateRate); qSettings->setValue("maxUpdateRate", m_maxUpdateRate);
qSettings->setValue("overlayOpacity", m_opacity); qSettings->setValue("overlayOpacity", m_opacity);
} }

2
ground/openpilotgcs/src/plugins/opmap/opmapgadgetoptionspage.cpp
View File

@ -122,7 +122,7 @@ void OPMapGadgetOptionsPage::on_pushButtonCacheDefaults_clicked()
m_page->accessModeComboBox->setCurrentIndex(index); m_page->accessModeComboBox->setCurrentIndex(index);
m_page->checkBoxUseMemoryCache->setChecked(true); m_page->checkBoxUseMemoryCache->setChecked(true);
m_page->lineEditCacheLocation->setPath(Utils::PathUtils().GetStoragePath() + "mapscache" + QDir::separator()); m_page->lineEditCacheLocation->setPath(Utils::GetStoragePath() + "mapscache" + QDir::separator());
} }
void OPMapGadgetOptionsPage::apply() void OPMapGadgetOptionsPage::apply()

8
ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetconfiguration.cpp
View File

@ -46,10 +46,10 @@ PfdQmlGadgetConfiguration::PfdQmlGadgetConfiguration(QString classId, QSettings
// if a saved configuration exists load it // if a saved configuration exists load it
if (qSettings != 0) { if (qSettings != 0) {
m_qmlFile = qSettings->value("qmlFile").toString(); m_qmlFile = qSettings->value("qmlFile").toString();
m_qmlFile = Utils::PathUtils().InsertDataPath(m_qmlFile); m_qmlFile = Utils::InsertDataPath(m_qmlFile);
m_earthFile = qSettings->value("earthFile").toString(); m_earthFile = qSettings->value("earthFile").toString();
m_earthFile = Utils::PathUtils().InsertDataPath(m_earthFile); m_earthFile = Utils::InsertDataPath(m_earthFile);
m_openGLEnabled = qSettings->value("openGLEnabled", true).toBool(); m_openGLEnabled = qSettings->value("openGLEnabled", true).toBool();
m_terrainEnabled = qSettings->value("terrainEnabled").toBool(); m_terrainEnabled = qSettings->value("terrainEnabled").toBool();
@ -92,10 +92,10 @@ IUAVGadgetConfiguration *PfdQmlGadgetConfiguration::clone()
*/ */
void PfdQmlGadgetConfiguration::saveConfig(QSettings *qSettings) const void PfdQmlGadgetConfiguration::saveConfig(QSettings *qSettings) const
{ {
QString qmlFile = Utils::PathUtils().RemoveDataPath(m_qmlFile); QString qmlFile = Utils::RemoveDataPath(m_qmlFile);
qSettings->setValue("qmlFile", qmlFile); qSettings->setValue("qmlFile", qmlFile);
QString earthFile = Utils::PathUtils().RemoveDataPath(m_earthFile); QString earthFile = Utils::RemoveDataPath(m_earthFile);
qSettings->setValue("earthFile", earthFile); qSettings->setValue("earthFile", earthFile);
qSettings->setValue("openGLEnabled", m_openGLEnabled); qSettings->setValue("openGLEnabled", m_openGLEnabled);

4
ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetconfiguration.cpp
View File

@ -40,7 +40,7 @@ QmlViewGadgetConfiguration::QmlViewGadgetConfiguration(QString classId, QSetting
if (qSettings != 0) { if (qSettings != 0) {
QString dialFile = qSettings->value("dialFile").toString(); QString dialFile = qSettings->value("dialFile").toString();
useOpenGLFlag = qSettings->value("useOpenGLFlag").toBool(); useOpenGLFlag = qSettings->value("useOpenGLFlag").toBool();
m_defaultDial = Utils::PathUtils().InsertDataPath(dialFile); m_defaultDial = Utils::InsertDataPath(dialFile);
} }
} }
@ -63,7 +63,7 @@ IUAVGadgetConfiguration *QmlViewGadgetConfiguration::clone()
*/ */
void QmlViewGadgetConfiguration::saveConfig(QSettings *qSettings) const void QmlViewGadgetConfiguration::saveConfig(QSettings *qSettings) const
{ {
QString dialFile = Utils::PathUtils().RemoveDataPath(m_defaultDial); QString dialFile = Utils::RemoveDataPath(m_defaultDial);
qSettings->setValue("dialFile", dialFile); qSettings->setValue("dialFile", dialFile);
qSettings->setValue("useOpenGLFlag", useOpenGLFlag); qSettings->setValue("useOpenGLFlag", useOpenGLFlag);

2
ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp
View File

@ -272,7 +272,7 @@ QString VehicleTemplateExportDialog::fixFilenameString(QString input, int trunca
void VehicleTemplateExportDialog::exportTemplate() void VehicleTemplateExportDialog::exportTemplate()
{ {
QString path = QString("%1%2%3%4").arg(Utils::PathUtils().InsertStoragePath("%%STOREPATH%%cloudconfig")) QString path = QString("%1%2%3%4").arg(Utils::InsertStoragePath("%%STOREPATH%%cloudconfig"))
.arg(QDir::separator()).arg(getTypeDirectory()).arg(QDir::separator()); .arg(QDir::separator()).arg(getTypeDirectory()).arg(QDir::separator());
QDir dir; QDir dir;

4
ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateselectorwidget.cpp
View File

@ -203,8 +203,8 @@ void VehicleTemplateSelectorWidget::loadValidFiles()
} }
m_templates.clear(); m_templates.clear();
QString path = getTemplatePath(); QString path = getTemplatePath();
loadFilesInDir(QString("%1/%2/").arg(Utils::PathUtils().InsertDataPath("%%DATAPATH%%cloudconfig")).arg(path)); loadFilesInDir(QString("%1/%2/").arg(Utils::InsertDataPath("%%DATAPATH%%cloudconfig")).arg(path));
loadFilesInDir(QString("%1/%2/").arg(Utils::PathUtils().InsertStoragePath("%%STOREPATH%%cloudconfig")).arg(path)); loadFilesInDir(QString("%1/%2/").arg(Utils::InsertStoragePath("%%STOREPATH%%cloudconfig")).arg(path));
} }
void VehicleTemplateSelectorWidget::setupTemplateList() void VehicleTemplateSelectorWidget::setupTemplateList()

4
ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetconfiguration.cpp
View File

@ -39,7 +39,7 @@ SystemHealthGadgetConfiguration::SystemHealthGadgetConfiguration(QString classId
// if a saved configuration exists load it // if a saved configuration exists load it
if (qSettings != 0) { if (qSettings != 0) {
QString diagram = qSettings->value("diagram").toString(); QString diagram = qSettings->value("diagram").toString();
systemFile = Utils::PathUtils().InsertDataPath(diagram); systemFile = Utils::InsertDataPath(diagram);
} }
} }
@ -61,7 +61,7 @@ IUAVGadgetConfiguration *SystemHealthGadgetConfiguration::clone()
*/ */
void SystemHealthGadgetConfiguration::saveConfig(QSettings *qSettings) const void SystemHealthGadgetConfiguration::saveConfig(QSettings *qSettings) const
{ {
QString diagram = Utils::PathUtils().RemoveDataPath(systemFile); QString diagram = Utils::RemoveDataPath(systemFile);
qSettings->setValue("diagram", diagram); qSettings->setValue("diagram", diagram);
} }

4
ground/openpilotgcs/src/plugins/telemetry/monitorgadgetconfiguration.cpp
View File

@ -48,7 +48,7 @@ IUAVGadgetConfiguration *MonitorGadgetConfiguration::clone()
void MonitorGadgetConfiguration::saveConfig(QSettings *qSettings) const void MonitorGadgetConfiguration::saveConfig(QSettings *qSettings) const
{ {
Q_UNUSED(qSettings); Q_UNUSED(qSettings);
// qSettings->setValue("acFilename", Utils::PathUtils().RemoveDataPath(m_acFilename)); // qSettings->setValue("acFilename", Utils::RemoveDataPath(m_acFilename));
// qSettings->setValue("bgFilename", Utils::PathUtils().RemoveDataPath(m_bgFilename)); // qSettings->setValue("bgFilename", Utils::RemoveDataPath(m_bgFilename));
// qSettings->setValue("enableVbo", m_enableVbo); // qSettings->setValue("enableVbo", m_enableVbo);
} }