}
-/**
- * Return terrain elevation for given longitude/latitude pair.
- */
-static bool
-do_terrain_elevation (const SGPropertyNode * arg)
-{
- SGPropertyNode *a = const_cast<SGPropertyNode *>(arg);
- const SGMaterial *mat;
- double elev;
-
- double lon = a->getDoubleValue("longitude-deg", 0.0);
- double lat = a->getDoubleValue("latitude-deg", 0.0);
- bool ret = globals->get_scenery()->get_elevation_m(lat, lon, 10000.0, elev, &mat);
-
- bool solid = true;
- const char *matname = "";
- if (mat) {
- solid = mat->get_solid();
- const vector<string> names = mat->get_names();
- if (!names.empty())
- matname = names[0].c_str();
- }
- a->setBoolValue("solid", solid);
- a->setStringValue("material", matname);
- a->setDoubleValue("elevation-m", elev);
- return ret;
-}
-
-
static bool
do_decrease_visibility (const SGPropertyNode * arg)
{
return true;
}
+
/**
* An fgcommand to allow loading of xml files via nasal,
* the xml file's structure will be made available within
- * a (definable) property tree node
+ * a property tree node defined under argument "targetnode",
+ * or in the given argument tree under "data" otherwise.
*
- * @param filename a string to hold the complete path & filename of a XML file
+ * @param filename a string to hold the complete path & filename of an XML file
* @param targetnode a string pointing to a location within the property tree
- * where to store the parsed XML file
+ * where to store the parsed XML file. If <targetnode> is undefined, then the
+ * file contents are stored under a node <data> in the argument tree.
*/
-static bool
-do_load_xml_to_proptree(const SGPropertyNode * node)
+static bool
+do_load_xml_to_proptree(const SGPropertyNode * arg)
{
- // SG_LOG(SG_GENERAL, SG_ALERT, "fgcommand loadxml executed");
+ SGPath file(arg->getStringValue("filename"));
+ if (file.str().empty())
+ return false;
+
+ if (file.extension() != "xml")
+ file.concat(".xml");
+
+ SGPropertyNode *targetnode;
+ if (arg->hasValue("targetnode"))
+ targetnode = fgGetNode(arg->getStringValue("targetnode"), true);
+ else
+ targetnode = const_cast<SGPropertyNode *>(arg)->getNode("data", true);
- SGPropertyNode * targetnode;
- targetnode = fgGetNode(node->getNode("targetnode")->getStringValue(),true);
-
- const char *filename = node->getNode("filename")->getStringValue();
try {
- fgLoadProps(filename, targetnode);
+ readProperties(file.c_str(), targetnode, true);
} catch (const sg_exception &e) {
- string errmsg = "Error reading file " + string(filename) + ":\n";
- guiErrorMessage(errmsg.c_str(), e);
+ SG_LOG(SG_IO, SG_WARN, "loadxml: " << e.getFormattedMessage());
return false;
}
/**
- * an fgcommand to allow saving of xml files via nasal,
+ * An fgcommand to allow saving of xml files via nasal,
* the file's structure will be determined based on what's
* encountered in the passed (source) property tree node
*
* XML file
* @param sourcenode a string pointing to a location within the property tree
* where to find the nodes that should be written recursively into an XML file
- *
- * TODO:
- * deal with already existing filenames, optionally return error/success
- * values in a separate node to provide status information
- *
- * note: it's directly using writeProperties, which is not necessarily
- * preferable, but for now it should work ...
+ * @param data if no sourcenode is given, then the file contents are taken from
+ * the argument tree's "data" node.
*/
-static bool
-do_save_xml_from_proptree(const SGPropertyNode * node)
+static bool
+do_save_xml_from_proptree(const SGPropertyNode * arg)
{
- //TODO: do Parameter validation !
- SGPropertyNode * sourcenode;
- sourcenode = fgGetNode(node->getNode("sourcenode")->getStringValue(),true);
+ SGPath file(arg->getStringValue("filename"));
+ if (file.str().empty())
+ return false;
+
+ if (file.extension() != "xml")
+ file.concat(".xml");
+
+ SGPropertyNode *sourcenode;
+ if (arg->hasValue("sourcenode"))
+ sourcenode = fgGetNode(arg->getStringValue("sourcenode"), true);
+ else if (arg->getNode("data", false))
+ sourcenode = const_cast<SGPropertyNode *>(arg)->getNode("data");
+ else
+ return false;
- const char *filename = node->getNode("filename")->getStringValue();
try {
- writeProperties (filename, sourcenode, true);
+ writeProperties (file.c_str(), sourcenode, true);
} catch (const sg_exception &e) {
- string errmsg = "Error writing file " + string(filename) + ":\n";
- guiErrorMessage(errmsg.c_str(), e);
+ SG_LOG(SG_IO, SG_WARN, "savexml: " << e.getFormattedMessage());
return false;
}
{ "presets-commit", do_presets_commit },
{ "log-level", do_log_level },
{ "replay", do_replay },
- { "terrain-elevation", do_terrain_elevation },
{ "decrease-visibility", do_decrease_visibility },
{ "increase-visibility", do_increase_visibility },
{ "hud-init", do_hud_init },
{ "hud-init2", do_hud_init2 },
{ "loadxml", do_load_xml_to_proptree},
- { "savexml", do_save_xml_from_proptree },
+ { "savexml", do_save_xml_from_proptree },
{ "press-cockpit-button", do_press_cockpit_button },
{ "release-cockpit-button", do_release_cockpit_button },
{ "dump-scenegraph", do_dump_scene_graph },