return (getRawDouble() == 0.0 ? false : true);
case UNKNOWN:
case STRING:
- return ((getRawString() == "false" || getIntValue() == 0) ? false : true);
+ return ((getRawString() == "true" || getIntValue() != 0) ? true : false);
}
return false;
}
SGValue::getFloatValue () const
{
switch (_type) {
- case UNKNOWN:
- return 0.0;
case BOOL:
return (float)(getRawBool());
case INT:
return getRawFloat();
case DOUBLE:
return (float)(getRawDouble());
+ case UNKNOWN:
case STRING:
return (float)atof(getRawString().c_str());
}
SGValue::getDoubleValue () const
{
switch (_type) {
- case UNKNOWN:
- return 0.0;
case BOOL:
return (double)(getRawBool());
case INT:
return (double)(getRawFloat());
case DOUBLE:
return getRawDouble();
+ case UNKNOWN:
case STRING:
return atof(getRawString().c_str());
}
{
char buf[512];
switch (_type) {
- case UNKNOWN:
- return getRawString();
case BOOL:
if (getRawBool())
string_val = "true";
sprintf(buf, "%f", getRawDouble());
string_val = buf;
return string_val;
+ case UNKNOWN:
case STRING:
return getRawString();
}
bool
SGValue::setBoolValue (bool value)
{
- if (_type == UNKNOWN || _type == BOOL) {
- _type = BOOL;
+ if (_type == UNKNOWN)
+ _type = INT;
+ switch (_type) {
+ case BOOL:
return setRawBool(value);
- } else {
- return false;
+ case INT:
+ return setRawInt((int)value);
+ case FLOAT:
+ return setRawFloat((float)value);
+ case DOUBLE:
+ return setRawDouble((double)value);
+ case STRING:
+ if (value)
+ return setRawString("true");
+ else
+ return setRawString("false");
}
+ return false;
}
bool
SGValue::setIntValue (int value)
{
- if (_type == UNKNOWN || _type == INT) {
+ if (_type == UNKNOWN)
_type = INT;
+ switch (_type) {
+ case BOOL:
+ if (value == 0)
+ return setRawBool(false);
+ else
+ return setRawBool(true);
+ case INT:
return setRawInt(value);
- } else {
- return false;
+ case FLOAT:
+ return setRawFloat((float)value);
+ case DOUBLE:
+ return setRawDouble((double)value);
+ case STRING:
+ char buf[128];
+ sprintf(buf, "%d", value);
+ return setRawString(buf);
}
+ return false;
}
bool
SGValue::setFloatValue (float value)
{
- if (_type == UNKNOWN || _type == FLOAT) {
+ if (_type == UNKNOWN)
_type = FLOAT;
+ switch (_type) {
+ case BOOL:
+ if (value == 0.0)
+ return setRawBool(false);
+ else
+ return setRawBool(true);
+ case INT:
+ return setRawInt((int)value);
+ case FLOAT:
return setRawFloat(value);
- } else {
- return false;
+ case DOUBLE:
+ return setRawDouble((double)value);
+ case STRING:
+ char buf[128];
+ sprintf(buf, "%f", value);
+ return setRawString(buf);
}
+ return false;
}
bool
SGValue::setDoubleValue (double value)
{
- if (_type == UNKNOWN || _type == DOUBLE) {
+ if (_type == UNKNOWN)
_type = DOUBLE;
+ switch (_type) {
+ case BOOL:
+ if (value == 0.0L)
+ return setRawBool(false);
+ else
+ return setRawBool(true);
+ case INT:
+ return setRawInt((int)value);
+ case FLOAT:
+ return setRawFloat((float)value);
+ case DOUBLE:
return setRawDouble(value);
- } else {
- return false;
+ case STRING:
+ char buf[128];
+ sprintf(buf, "%lf", value);
+ return setRawString(buf);
}
+ return false;
}
bool
SGValue::setStringValue (const string &value)
{
- if (_type == UNKNOWN || _type == STRING) {
+ if (_type == UNKNOWN)
_type = STRING;
+
+ switch (_type) {
+ case BOOL:
+ if (value == "true" || atoi(value.c_str()) != 0)
+ return setRawBool(true);
+ else
+ return setRawBool(false);
+ case INT:
+ return setRawInt(atoi(value.c_str()));
+ case FLOAT:
+ return setRawFloat(atof(value.c_str()));
+ case DOUBLE:
+ return setRawDouble(atof(value.c_str()));
+ case STRING:
return setRawString(value);
- } else {
- return false;
}
+ return false;
}
bool
SGValue::setUnknownValue (const string &value)
{
- if (_type == UNKNOWN || _type == STRING) {
+ switch (_type) {
+ case BOOL:
+ if (value == "true" || atoi(value.c_str()) != 0)
+ return setRawBool(true);
+ else
+ return setRawBool(false);
+ case INT:
+ return setRawInt(atoi(value.c_str()));
+ case FLOAT:
+ return setRawFloat(atof(value.c_str()));
+ case DOUBLE:
+ return setRawDouble(atof(value.c_str()));
+ case STRING:
+ case UNKNOWN:
return setRawString(value);
- } else {
- return false;
}
+ return false;
}
* Returns true on success (i.e. the value is not currently tied).
*/
bool
-SGValue::tieBool (bool_getter getter, bool_setter setter = 0,
- bool useDefault = true)
+SGValue::tieBool (bool_getter getter, bool_setter setter,
+ bool useDefault)
{
if (_tied) {
return false;
} else {
- if (useDefault && setter && _type != UNKNOWN)
+ if (useDefault && setter)
(*setter)(getBoolValue());
_tied = true;
_type = BOOL;
* Returns true on success (i.e. the value is not currently tied).
*/
bool
-SGValue::tieInt (int_getter getter, int_setter setter = 0,
- bool useDefault = true)
+SGValue::tieInt (int_getter getter, int_setter setter,
+ bool useDefault)
{
if (_tied) {
return false;
} else {
- if (useDefault && setter && _type != UNKNOWN)
+ if (useDefault && setter)
(*setter)(getIntValue());
_tied = true;
_type = INT;
* Returns true on success (i.e. the value is not currently tied).
*/
bool
-SGValue::tieFloat (float_getter getter, float_setter setter = 0,
- bool useDefault = true)
+SGValue::tieFloat (float_getter getter, float_setter setter,
+ bool useDefault)
{
if (_tied) {
return false;
} else {
- if (useDefault && setter && _type != UNKNOWN)
+ if (useDefault && setter)
(*setter)(getFloatValue());
_tied = true;
_type = FLOAT;
* Returns true on success (i.e. the value is not currently tied).
*/
bool
-SGValue::tieDouble (double_getter getter, double_setter setter = 0,
- bool useDefault = true)
+SGValue::tieDouble (double_getter getter, double_setter setter,
+ bool useDefault)
{
if (_tied) {
return false;
} else {
- if (useDefault && setter && _type != UNKNOWN)
+ if (useDefault && setter)
(*setter)(getDoubleValue());
_tied = true;
_type = DOUBLE;
* Returns true on success (i.e. the value is not currently tied).
*/
bool
-SGValue::tieString (string_getter getter, string_setter setter = 0,
- bool useDefault = true)
+SGValue::tieString (string_getter getter, string_setter setter,
+ bool useDefault)
{
if (_tied) {
return false;
} else {
- if (useDefault && setter && _type != UNKNOWN)
+ if (useDefault && setter)
(*setter)(getStringValue());
_tied = true;
_type = STRING;
}
+/**
+ * Return true if a value is present.
+ */
+bool
+SGPropertyList::hasValue (const string &name) const
+{
+ const_iterator el = _props.find(name);
+ if (el == _props.end())
+ return false;
+ else
+ return true;
+}
+
+
/**
* Look up the SGValue structure associated with a property.
*
* and must not end with '/'.
*/
SGValue *
-SGPropertyList::getValue (const string &name, bool create = false)
+SGPropertyList::getValue (const string &name, bool create)
{
const_iterator el = _props.find(name);
if (el == _props.end()) {
* better to get the SGValue and query it repeatedly.
*/
bool
-SGPropertyList::getBoolValue (const string &name) const
+SGPropertyList::getBoolValue (const string &name, bool defaultValue) const
{
const SGValue * val = getValue(name);
if (val == 0)
- return false;
+ return defaultValue;
else
return val->getBoolValue();
}
* better to get the SGValue and query it repeatedly.
*/
int
-SGPropertyList::getIntValue (const string &name) const
+SGPropertyList::getIntValue (const string &name, int defaultValue) const
{
const SGValue * val = getValue(name);
if (val == 0)
- return 0;
+ return defaultValue;
else
return val->getIntValue();
}
* better to get the SGValue and query it repeatedly.
*/
float
-SGPropertyList::getFloatValue (const string &name) const
+SGPropertyList::getFloatValue (const string &name, float defaultValue) const
{
const SGValue * val = getValue(name);
if (val == 0)
- return 0.0;
+ return defaultValue;
else
return val->getFloatValue();
}
* better to get the SGValue and query it repeatedly.
*/
double
-SGPropertyList::getDoubleValue (const string &name) const
+SGPropertyList::getDoubleValue (const string &name, double defaultValue) const
{
const SGValue * val = getValue(name);
if (val == 0)
- return 0.0;
+ return defaultValue;
else
return val->getDoubleValue();
}
* better to save the SGValue and query it repeatedly.
*/
const string &
-SGPropertyList::getStringValue (const string &name) const
+SGPropertyList::getStringValue (const string &name,
+ const string &defaultValue) const
{
const SGValue * val = getValue(name);
if (val == 0)
- return empty_string;
+ return defaultValue;
else
return val->getStringValue();
}
SGPropertyList::tieBool (const string &name,
bool_getter getter,
bool_setter setter,
- bool useDefault = true)
+ bool useDefault)
{
FG_LOG(FG_GENERAL, FG_INFO, "Tying bool property '" << name << '\'');
+ useDefault = useDefault && hasValue(name);
return getValue(name, true)->tieBool(getter, setter, useDefault);
}
SGPropertyList::tieInt (const string &name,
int_getter getter,
int_setter setter,
- bool useDefault = true)
+ bool useDefault)
{
FG_LOG(FG_GENERAL, FG_INFO, "Tying int property '" << name << '\'');
+ useDefault = useDefault && hasValue(name);
return getValue(name, true)->tieInt(getter, setter, useDefault);
}
SGPropertyList::tieFloat (const string &name,
float_getter getter,
float_setter setter,
- bool useDefault = true)
+ bool useDefault)
{
FG_LOG(FG_GENERAL, FG_INFO, "Tying float property '" << name << '\'');
+ useDefault = useDefault && hasValue(name);
return getValue(name, true)->tieFloat(getter, setter, useDefault);
}
SGPropertyList::tieDouble (const string &name,
double_getter getter,
double_setter setter,
- bool useDefault = true)
+ bool useDefault)
{
FG_LOG(FG_GENERAL, FG_INFO, "Tying double property '" << name << '\'');
+ useDefault = useDefault && hasValue(name);
return getValue(name, true)->tieDouble(getter, setter, useDefault);
}
SGPropertyList::tieString (const string &name,
string_getter getter,
string_setter setter,
- bool useDefault = true)
+ bool useDefault)
{
FG_LOG(FG_GENERAL, FG_INFO, "Tying string property '" << name << '\'');
+ useDefault = useDefault && hasValue(name);
return getValue(name, true)->tieString(getter, setter, useDefault);
}
/**
* Constructor.
*/
-SGPropertyNode::SGPropertyNode (const string &path = "",
- SGPropertyList * props = 0)
- : _props(props)
+SGPropertyNode::SGPropertyNode (const string &path,
+ SGPropertyList * props)
+ : _props(props), _node(0)
{
setPath(path);
}
*/
SGPropertyNode::~SGPropertyNode ()
{
+ delete _node;
+ _node = 0;
}
}
-/**
- * Return the value of the current node.
- *
- * Currently, this does a lookup each time, but we could cache the
- * value safely as long as it's non-zero.
- *
- * Note that this will not create the value if it doesn't already exist.
- */
-SGValue *
-SGPropertyNode::getValue ()
-{
- if (_props == 0 || _path.size() == 0)
- return 0;
- else
- return _props->getValue(_path);
-}
-
-
/**
* Return the number of children for the current node.
*/
* A return value of true means success; otherwise, the node supplied
* is unmodified.
*/
-bool
-SGPropertyNode::getParent (SGPropertyNode &parent) const
+SGPropertyNode &
+SGPropertyNode::getParent () const
{
+ if (_node == 0)
+ _node = new SGPropertyNode();
+
string::size_type pos = _path.rfind('/');
if (pos != string::npos) {
- parent.setPath(_path.substr(0, pos-1));
- parent.setPropertyList(_props);
- return true;
- } else {
- return false;
+ _node->setPropertyList(_props);
+ _node->setPath(_path.substr(0, pos-1));
}
+ return *_node;
}
* A return value of true means success; otherwise, the node supplied
* is unmodified.
*/
-bool
-SGPropertyNode::getChild (SGPropertyNode &child, int n) const
+SGPropertyNode &
+SGPropertyNode::getChild (int n) const
{
+ if (_node == 0)
+ _node = new SGPropertyNode();
+
if (_props == 0)
- return false;
+ return *_node;
int s = 0;
string base;
while (it != end) {
if (get_base(pattern, it->first, base) && base != lastBase) {
if (s == n) {
- string path = _path;
- path += '/';
- path += base;
- child.setPath(path);
- child.setPropertyList(_props);
- return true;
+ _node->setPropertyList(_props);
+ _node->setPath(_path + string("/") + base);
+ return *_node;
} else {
s++;
lastBase = base;
it++;
}
- return false;
+ return *_node;
+}
+
+
+/**
+ * Return a node for an arbitrary subpath.
+ *
+ * Never returns 0.
+ */
+SGPropertyNode &
+SGPropertyNode::getSubNode (const string &subpath) const
+{
+ if (_node == 0)
+ _node = new SGPropertyNode();
+
+ _node->setPropertyList(_props);
+ _node->setPath(_path + string("/") + subpath);
+ return *_node;
+}
+
+
+/**
+ * Test whether the specified subpath has a value.
+ */
+bool
+SGPropertyNode::hasValue (const string &subpath) const
+{
+ if (_props == 0)
+ return false;
+
+ if (subpath.size() == 0)
+ return _props->hasValue(_path);
+ else
+ return _props->hasValue(_path + string("/") + subpath);
}
+
+/**
+ * Return the value of the current node.
+ *
+ * Currently, this does a lookup each time, but we could cache the
+ * value safely as long as it's non-zero.
+ *
+ * Note that this will not create the value if it doesn't already exist.
+ */
+SGValue *
+SGPropertyNode::getValue (const string &subpath)
+{
+ if (_props == 0)
+ return 0;
+
+ if (subpath.size() == 0)
+ return _props->getValue(_path);
+ else
+ return _props->getValue(_path + string("/") + subpath);
+}
+
+
+/**
+ * Return a bool value.
+ */
+bool
+SGPropertyNode::getBoolValue (const string &subpath, bool defaultValue) const
+{
+ if (_props == 0)
+ return defaultValue;
+
+ if (subpath == "")
+ return _props->getBoolValue(_path, defaultValue);
+ else
+ return _props->getBoolValue(_path + string("/") + subpath,
+ defaultValue);
+}
+
+
+/**
+ * Return an int value.
+ */
+int
+SGPropertyNode::getIntValue (const string &subpath, int defaultValue) const
+{
+ if (_props == 0)
+ return defaultValue;
+
+ if (subpath == "")
+ return _props->getIntValue(_path, defaultValue);
+ else
+ return _props->getIntValue(_path + string("/") + subpath,
+ defaultValue);
+}
+
+
+/**
+ * Return a float value.
+ */
+float
+SGPropertyNode::getFloatValue (const string &subpath, float defaultValue) const
+{
+ if (_props == 0)
+ return defaultValue;
+
+ if (subpath == "")
+ return _props->getFloatValue(_path, defaultValue);
+ else
+ return _props->getFloatValue(_path + string("/") + subpath,
+ defaultValue);
+}
+
+
+/**
+ * Return a double value.
+ */
+double
+SGPropertyNode::getDoubleValue (const string &subpath,
+ double defaultValue) const
+{
+ if (_props == 0)
+ return defaultValue;
+
+ if (subpath == "")
+ return _props->getDoubleValue(_path, defaultValue);
+ else
+ return _props->getDoubleValue(_path + string("/") + subpath,
+ defaultValue);
+}
+
+
+/**
+ * Return a string value.
+ */
+const string &
+SGPropertyNode::getStringValue (const string &subpath,
+ const string &defaultValue) const
+{
+ if (_props == 0)
+ return defaultValue;
+
+ if (subpath == "")
+ return _props->getStringValue(_path, defaultValue);
+ else
+ return _props->getStringValue(_path + string("/") + subpath,
+ defaultValue);
+}
+
+
// end of props.cxx
projects / simgear.git / blobdiff