v0.2.52..v0.2.53 changeset Settings.h
Garret Voltz edited this page Feb 12, 2020
·
1 revision
diff --git a/hoot-core/src/main/cpp/hoot/core/util/Settings.h b/hoot-core/src/main/cpp/hoot/core/util/Settings.h
index c5a83a3..43bdd36 100644
--- a/hoot-core/src/main/cpp/hoot/core/util/Settings.h
+++ b/hoot-core/src/main/cpp/hoot/core/util/Settings.h
@@ -22,7 +22,7 @@
* This will properly maintain the copyright information. DigitalGlobe
* copyrights will be updated automatically.
*
- * @copyright Copyright (C) 2015, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
*/
#ifndef CONFIGURATION_H
@@ -101,7 +101,8 @@ public:
double getDouble(const QString& key) const;
double getDouble(const QString& key, double defaultValue) const;
- double getDouble(const QString& key, double defaultValue, double minValue, double maxValue ) const;
+ double getDouble(const QString& key, double defaultValue, double minValue,
+ double maxValue ) const;
/**
* Returns the double represented in the supplied string. Where necessary variables will be
* resolved.
@@ -136,10 +137,11 @@ public:
* Parses common arguments (e.g. "-D foo=bar --debug")
* Any arguments parsed are removed from args.
*/
- static void parseCommonArguments(QStringList &args);
+ static void parseCommonArguments(QStringList& args);
void set(const QString& key, const char* value) { set(key, QString(value)); }
- void set(const QString& key, const std::string& value) { set(key, QString::fromStdString(value)); }
+ void set(const QString& key, const std::string& value)
+ { set(key, QString::fromStdString(value)); }
void set(const QString& key, const QString& value);
void set(const QString& key, double value) { _settings[key] = QVariant(value); }
void set(const QString& key, int value) { _settings[key] = QVariant(value); }
@@ -176,6 +178,12 @@ private:
QString _replaceVariables(const QString& key, std::set<QString> used) const;
QString _replaceVariablesValue(QString value) const;
QString _replaceVariablesValue(QString value, std::set<QString> used) const;
+
+ /*
+ * This validates input for options that take a list of hoot operators (factory configurable
+ * ElementVisitor or OsmMapOperation)
+ */
+ static void _validateOperatorRefs(const QStringList& operators);
};
inline Settings& conf() { return Settings::getInstance(); }