# include <windows.h>
#endif
-#include <simgear/compiler.h>
+#include <string.h> // for strcmp()
-#include <simgear/misc/sg_path.hxx>
+#include <simgear/compiler.h>
+#include <simgear/structure/exception.hxx>
#include <simgear/debug/logstream.hxx>
-#include <simgear/misc/props.hxx>
+#include <simgear/misc/sg_path.hxx>
+#include <simgear/props/props.hxx>
#include STL_IOSTREAM
#include STL_FSTREAM
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
-#include "panel.hxx"
-#include "steam.hxx"
+#include <GUI/gui.h>
+
+// #include "panel.hxx"
#include "panel_io.hxx"
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
+//built-in layers
+#include "built_in/FGMagRibbon.hxx"
+
SG_USING_STD(istream);
SG_USING_STD(ifstream);
-#endif
SG_USING_STD(string);
-\f
-////////////////////////////////////////////////////////////////////////
-// Default panel, instrument, and layer for when things go wrong...
-////////////////////////////////////////////////////////////////////////
-
-static FGCroppedTexture defaultTexture("Textures/default.rgb");
-
-
-/**
- * Default layer: the default texture.
- */
-class DefaultLayer : public FGTexturedLayer
-{
-public:
- DefaultLayer () : FGTexturedLayer(defaultTexture)
- {
- }
-
-};
-
-/**
- * Default instrument: a single default layer.
- */
-class DefaultInstrument : public FGLayeredInstrument
-{
-public:
- DefaultInstrument (int x, int y, int w, int h)
- : FGLayeredInstrument(x, y, w, h)
- {
- addLayer(new DefaultLayer());
- }
-};
-
-
-/**
- * Default panel: the default texture.
- */
-class DefaultPanel : public FGPanel
-{
-public:
- DefaultPanel (int x, int y, int w, int h) : FGPanel(x, y, w, h)
- {
- setBackground(defaultTexture.getTexture());
- }
-};
-
-
-\f
-////////////////////////////////////////////////////////////////////////
-// Built-in layer for the magnetic compass ribbon layer.
-//
-// TODO: move this out into a special directory for built-in
-// layers of various sorts.
-////////////////////////////////////////////////////////////////////////
-
-class FGMagRibbon : public FGTexturedLayer
-{
-public:
- FGMagRibbon (int w, int h);
- virtual ~FGMagRibbon () {}
-
- virtual void draw ();
-};
-
-FGMagRibbon::FGMagRibbon (int w, int h)
- : FGTexturedLayer(w, h)
-{
- FGCroppedTexture texture("Aircraft/c172/Instruments/Textures/compass-ribbon.rgb");
- setTexture(texture);
-}
-
-void
-FGMagRibbon::draw ()
-{
- double heading = FGSteam::get_MH_deg();
- double xoffset, yoffset;
-
- while (heading >= 360.0) {
- heading -= 360.0;
- }
- while (heading < 0.0) {
- heading += 360.0;
- }
-
- if (heading >= 60.0 && heading <= 180.0) {
- xoffset = heading / 240.0;
- yoffset = 0.75;
- } else if (heading >= 150.0 && heading <= 270.0) {
- xoffset = (heading - 90.0) / 240.0;
- yoffset = 0.50;
- } else if (heading >= 240.0 && heading <= 360.0) {
- xoffset = (heading - 180.0) / 240.0;
- yoffset = 0.25;
- } else {
- if (heading < 270.0)
- heading += 360.0;
- xoffset = (heading - 270.0) / 240.0;
- yoffset = 0.0;
- }
-
- xoffset = 1.0 - xoffset;
- // Adjust to put the number in the centre
- xoffset -= 0.25;
-
- FGCroppedTexture &t = getTexture();
- t.setCrop(xoffset, yoffset, xoffset + 0.5, yoffset + 0.25);
- FGTexturedLayer::draw();
-}
-
-
\f
////////////////////////////////////////////////////////////////////////
// Read and construct a panel.
static FGCroppedTexture
readTexture (const SGPropertyNode * node)
{
- FGCroppedTexture texture(node->getStringValue("path"),
- node->getFloatValue("x1"),
- node->getFloatValue("y1"),
- node->getFloatValue("x2", 1.0),
- node->getFloatValue("y2", 1.0));
- SG_LOG(SG_INPUT, SG_INFO, "Read texture " << node->getName());
- return texture;
+ FGCroppedTexture texture(node->getStringValue("path"),
+ node->getFloatValue("x1"),
+ node->getFloatValue("y1"),
+ node->getFloatValue("x2", 1.0),
+ node->getFloatValue("y2", 1.0));
+ SG_LOG(SG_COCKPIT, SG_DEBUG, "Read texture " << node->getName());
+ return texture;
+}
+
+
+/**
+ * Test for a condition in the current node.
+ */
+\f
+////////////////////////////////////////////////////////////////////////
+// Read a condition and use it if necessary.
+////////////////////////////////////////////////////////////////////////
+
+static void
+readConditions (SGConditional *component, const SGPropertyNode *node)
+{
+ const SGPropertyNode * conditionNode = node->getChild("condition");
+ if (conditionNode != 0)
+ // The top level is implicitly AND
+ component->setCondition(sgReadCondition(globals->get_props(),
+ conditionNode) );
}
* Read an action from the instrument's property list.
*
* The action will be performed when the user clicks a mouse button
- * within the specified region of the instrument. Actions always
- * work by modifying the value of a property (see the SGValue class).
+ * within the specified region of the instrument. Actions always work
+ * by modifying the value of a property (see the SGPropertyNode
+ * class).
*
* The following action types are defined:
*
static FGPanelAction *
readAction (const SGPropertyNode * node, float w_scale, float h_scale)
{
- FGPanelAction * action = 0;
-
string name = node->getStringValue("name");
- string type = node->getStringValue("type");
int button = node->getIntValue("button");
int x = int(node->getIntValue("x") * w_scale);
int y = int(node->getIntValue("y") * h_scale);
int w = int(node->getIntValue("w") * w_scale);
int h = int(node->getIntValue("h") * h_scale);
+ bool repeatable = node->getBoolValue("repeatable", true);
- if (type == "") {
- SG_LOG(SG_INPUT, SG_ALERT,
- "No type supplied for action " << name << " assuming \"adjust\"");
- type = "adjust";
- }
-
- // Adjust a property value
- if (type == "adjust") {
- string propName = node->getStringValue("property");
- SGValue * value = fgGetValue(propName, true);
- float increment = node->getFloatValue("increment", 1.0);
- float min = node->getFloatValue("min", 0.0);
- float max = node->getFloatValue("max", 0.0);
- bool wrap = node->getBoolValue("wrap", false);
- if (min == max)
- SG_LOG(SG_INPUT, SG_ALERT, "Action " << node->getName()
- << " has same min and max value");
- action = new FGAdjustAction(button, x, y, w, h, value,
- increment, min, max, wrap);
- }
+ FGPanelAction * action = new FGPanelAction(button, x, y, w, h, repeatable);
- // Swap two property values
- else if (type == "swap") {
- string propName1 = node->getStringValue("property1");
- string propName2 = node->getStringValue("property2");
- SGValue * value1 = fgGetValue(propName1, true);
- SGValue * value2 = fgGetValue(propName2, true);
- action = new FGSwapAction(button, x, y, w, h, value1, value2);
- }
+ vector<SGPropertyNode_ptr>bindings = node->getChildren("binding");
- // Toggle a boolean value
- else if (type == "toggle") {
- string propName = node->getStringValue("property");
- SGValue * value = fgGetValue(propName, true);
- action = new FGToggleAction(button, x, y, w, h, value);
- }
+ unsigned int i;
+ for (i = 0; i < bindings.size(); i++) {
+ SG_LOG(SG_INPUT, SG_INFO, "Reading binding "
+ << bindings[i]->getStringValue("command"));
+ action->addBinding(new FGBinding(bindings[i]), 0);
+ }
- // Unrecognized type
- else {
- SG_LOG(SG_INPUT, SG_ALERT, "Unrecognized action type " << type);
- return 0;
+ if (node->hasChild("mod-up")) {
+ bindings = node->getChild("mod-up")->getChildren("binding");
+ for (i = 0; i < bindings.size(); i++) {
+ action->addBinding(new FGBinding(bindings[i]), 1);
+ }
}
+ readConditions(action, node);
return action;
}
string name = node->getName();
string type = node->getStringValue("type");
string propName = node->getStringValue("property", "");
- SGValue * value = 0;
+ SGPropertyNode * target = 0;
- if (type == "") {
- SG_LOG(SG_INPUT, SG_ALERT,
- "No type supplied for transformation " << name
- << " assuming \"rotation\"");
+ if (type.empty()) {
+ SG_LOG( SG_COCKPIT, SG_INFO,
+ "No type supplied for transformation " << name
+ << " assuming \"rotation\"" );
type = "rotation";
}
- if (propName != (string)"") {
- value = fgGetValue(propName, true);
+ if (!propName.empty()) {
+ target = fgGetNode(propName.c_str(), true);
}
- t->value = value;
+ t->node = target;
t->min = node->getFloatValue("min", -9999999);
t->max = node->getFloatValue("max", 99999999);
+ t->has_mod = node->hasChild("modulator");
+ if (t->has_mod)
+ t->mod = node->getFloatValue("modulator");
t->factor = node->getFloatValue("scale", 1.0);
t->offset = node->getFloatValue("offset", 0.0);
// Check for an interpolation table
const SGPropertyNode * trans_table = node->getNode("interpolation");
if (trans_table != 0) {
- cerr << "Found interpolation table with " << trans_table->nChildren() << "children" << endl;
+ SG_LOG( SG_COCKPIT, SG_INFO, "Found interpolation table with "
+ << trans_table->nChildren() << "children" );
t->table = new SGInterpTable();
for(int i = 0; i < trans_table->nChildren(); i++) {
const SGPropertyNode * node = trans_table->getChild(i);
- if (node->getName() == "entry") {
+ if (!strcmp(node->getName(), "entry")) {
double ind = node->getDoubleValue("ind", 0.0);
double dep = node->getDoubleValue("dep", 0.0);
- cerr << "Adding interpolation entry " << ind << "==>" << dep << endl;
+ SG_LOG( SG_COCKPIT, SG_INFO, "Adding interpolation entry "
+ << ind << "==>" << dep );
t->table->addEntry(ind, dep);
} else {
- SG_LOG(SG_INPUT, SG_INFO, "Skipping " << node->getName()
- << " in interpolation");
+ SG_LOG( SG_COCKPIT, SG_INFO, "Skipping " << node->getName()
+ << " in interpolation" );
}
}
} else {
}
else {
- SG_LOG(SG_INPUT, SG_ALERT, "Unrecognized transformation type " << type);
+ SG_LOG( SG_COCKPIT, SG_ALERT, "Unrecognized transformation type " << type );
delete t;
return 0;
}
- SG_LOG(SG_INPUT, SG_INFO, "Read transformation " << name);
+ readConditions(t, node);
+ SG_LOG( SG_COCKPIT, SG_DEBUG, "Read transformation " << name );
return t;
}
string format = node->getStringValue("format");
// Default to literal text.
- if (type == "") {
- SG_LOG(SG_INPUT, SG_INFO, "No type provided for text chunk " << name
- << " assuming \"literal\"");
+ if (type.empty()) {
+ SG_LOG( SG_COCKPIT, SG_INFO, "No type provided for text chunk " << name
+ << " assuming \"literal\"");
type = "literal";
}
// The value of a string property.
else if (type == "text-value") {
- SGValue * value =
- fgGetValue(node->getStringValue("property"), true);
- chunk = new FGTextLayer::Chunk(FGTextLayer::TEXT_VALUE, value, format);
+ SGPropertyNode * target =
+ fgGetNode(node->getStringValue("property"), true);
+ chunk = new FGTextLayer::Chunk(FGTextLayer::TEXT_VALUE, target, format);
}
// The value of a float property.
else if (type == "number-value") {
string propName = node->getStringValue("property");
float scale = node->getFloatValue("scale", 1.0);
- SGValue * value = fgGetValue(propName, true);
- chunk = new FGTextLayer::Chunk(FGTextLayer::DOUBLE_VALUE, value,
- format, scale);
+ float offset = node->getFloatValue("offset", 0.0);
+ bool truncation = node->getBoolValue("truncate", false);
+ SGPropertyNode * target = fgGetNode(propName.c_str(), true);
+ chunk = new FGTextLayer::Chunk(FGTextLayer::DOUBLE_VALUE, target,
+ format, scale, offset, truncation);
}
// Unknown type.
else {
- SG_LOG(SG_INPUT, SG_ALERT, "Unrecognized type " << type
- << " for text chunk " << name);
+ SG_LOG( SG_COCKPIT, SG_ALERT, "Unrecognized type " << type
+ << " for text chunk " << name );
return 0;
}
+ readConditions(chunk, node);
return chunk;
}
h = int(h * h_scale);
- if (type == "") {
- SG_LOG(SG_INPUT, SG_ALERT,
- "No type supplied for layer " << name
- << " assuming \"texture\"");
+ if (type.empty()) {
+ SG_LOG( SG_COCKPIT, SG_INFO,
+ "No type supplied for layer " << name
+ << " assuming \"texture\"" );
type = "texture";
}
layer = new FGTexturedLayer(texture, w, h);
}
+ // A group of sublayers.
+ else if (type == "group") {
+ layer = new FGGroupLayer();
+ for (int i = 0; i < node->nChildren(); i++) {
+ const SGPropertyNode * child = node->getChild(i);
+ if (!strcmp(child->getName(), "layer"))
+ ((FGGroupLayer *)layer)->addLayer(readLayer(child, w_scale, h_scale));
+ }
+ }
+
// A textual instrument layer.
else if (type == "text") {
tlayer->setPointSize(pointSize);
// Set the font.
- // TODO
+ string fontName = node->getStringValue("font", "default");
+ tlayer->setFontName(fontName);
const SGPropertyNode * chunk_group = node->getNode("chunks");
if (chunk_group != 0) {
int nChunks = chunk_group->nChildren();
for (int i = 0; i < nChunks; i++) {
const SGPropertyNode * node = chunk_group->getChild(i);
- if (node->getName() == "chunk") {
+ if (!strcmp(node->getName(), "chunk")) {
FGTextLayer::Chunk * chunk = readTextChunk(node);
if (chunk != 0)
tlayer->addChunk(chunk);
} else {
- SG_LOG(SG_INPUT, SG_INFO, "Skipping " << node->getName()
- << " in chunks");
+ SG_LOG( SG_COCKPIT, SG_INFO, "Skipping " << node->getName()
+ << " in chunks" );
}
}
layer = tlayer;
// A switch instrument layer.
else if (type == "switch") {
- SGValue * value =
- fgGetValue(node->getStringValue("property"), true);
- FGInstrumentLayer * layer1 =
- readLayer(node->getNode("layer1"), w_scale, h_scale);
- FGInstrumentLayer * layer2 =
- readLayer(node->getNode("layer2"), w_scale, h_scale);
- layer = new FGSwitchLayer(w, h, value, layer1, layer2);
+ layer = new FGSwitchLayer();
+ for (int i = 0; i < node->nChildren(); i++) {
+ const SGPropertyNode * child = node->getChild(i);
+ if (!strcmp(child->getName(), "layer"))
+ ((FGGroupLayer *)layer)->addLayer(readLayer(child, w_scale, h_scale));
+ }
}
// A built-in instrument layer.
layer = new FGMagRibbon(w, h);
}
- else if (layerclass == "") {
- SG_LOG(SG_INPUT, SG_ALERT, "No class provided for built-in layer "
- << name);
+ else if (layerclass.empty()) {
+ SG_LOG( SG_COCKPIT, SG_ALERT, "No class provided for built-in layer "
+ << name );
return 0;
}
else {
- SG_LOG(SG_INPUT, SG_ALERT, "Unknown built-in layer class "
- << layerclass);
+ SG_LOG( SG_COCKPIT, SG_ALERT, "Unknown built-in layer class "
+ << layerclass);
return 0;
}
}
// An unknown type.
else {
- SG_LOG(SG_INPUT, SG_ALERT, "Unrecognized layer type " << type);
+ SG_LOG( SG_COCKPIT, SG_ALERT, "Unrecognized layer type " << type );
delete layer;
return 0;
}
int nTransformations = trans_group->nChildren();
for (int i = 0; i < nTransformations; i++) {
const SGPropertyNode * node = trans_group->getChild(i);
- if (node->getName() == "transformation") {
+ if (!strcmp(node->getName(), "transformation")) {
FGPanelTransformation * t = readTransformation(node, w_scale, h_scale);
if (t != 0)
layer->addTransformation(t);
} else {
- SG_LOG(SG_INPUT, SG_INFO, "Skipping " << node->getName()
- << " in transformations");
+ SG_LOG( SG_COCKPIT, SG_INFO, "Skipping " << node->getName()
+ << " in transformations" );
}
}
}
-
- SG_LOG(SG_INPUT, SG_INFO, "Read layer " << name);
+
+ readConditions(layer, node);
+ SG_LOG( SG_COCKPIT, SG_DEBUG, "Read layer " << name );
return layer;
}
static FGPanelInstrument *
readInstrument (const SGPropertyNode * node)
{
- const string &name = node->getStringValue("name");
+ const string name = node->getStringValue("name");
int x = node->getIntValue("x", -1);
int y = node->getIntValue("y", -1);
int real_w = node->getIntValue("w", -1);
int h = node->getIntValue("h-base", -1);
if (x == -1 || y == -1) {
- SG_LOG(SG_INPUT, SG_ALERT,
- "x and y positions must be specified and >0");
+ SG_LOG( SG_COCKPIT, SG_ALERT,
+ "x and y positions must be specified and > 0" );
return 0;
}
h = real_h;
}
- SG_LOG(SG_INPUT, SG_INFO, "Reading instrument " << name);
+ SG_LOG( SG_COCKPIT, SG_DEBUG, "Reading instrument " << name );
FGLayeredInstrument * instrument =
new FGLayeredInstrument(x, y, w, h);
int nActions = action_group->nChildren();
for (int i = 0; i < nActions; i++) {
const SGPropertyNode * node = action_group->getChild(i);
- if (node->getName() == "action") {
+ if (!strcmp(node->getName(), "action")) {
FGPanelAction * action = readAction(node, w_scale, h_scale);
if (action != 0)
instrument->addAction(action);
} else {
- SG_LOG(SG_INPUT, SG_INFO, "Skipping " << node->getName()
- << " in actions");
+ SG_LOG( SG_COCKPIT, SG_INFO, "Skipping " << node->getName()
+ << " in actions" );
}
}
}
int nLayers = layer_group->nChildren();
for (int i = 0; i < nLayers; i++) {
const SGPropertyNode * node = layer_group->getChild(i);
- if (node->getName() == "layer") {
+ if (!strcmp(node->getName(), "layer")) {
FGInstrumentLayer * layer = readLayer(node, w_scale, h_scale);
if (layer != 0)
instrument->addLayer(layer);
} else {
- SG_LOG(SG_INPUT, SG_INFO, "Skipping " << node->getName()
- << " in layers");
+ SG_LOG( SG_COCKPIT, SG_INFO, "Skipping " << node->getName()
+ << " in layers" );
}
}
}
-
- SG_LOG(SG_INPUT, SG_INFO, "Done reading instrument " << name);
+
+ readConditions(instrument, node);
+ SG_LOG( SG_COCKPIT, SG_DEBUG, "Done reading instrument " << name );
return instrument;
}
FGPanel *
readPanel (const SGPropertyNode * root)
{
- SG_LOG(SG_INPUT, SG_INFO, "Reading properties for panel " <<
- root->getStringValue("name", "[Unnamed Panel]"));
+ SG_LOG( SG_COCKPIT, SG_INFO, "Reading properties for panel " <<
+ root->getStringValue("name", "[Unnamed Panel]") );
- FGPanel * panel = new FGPanel(0, 0, 1024, 768);
+ FGPanel * panel = new FGPanel();
panel->setWidth(root->getIntValue("w", 1024));
panel->setHeight(root->getIntValue("h", 443));
//
// Grab the panel's initial offsets, default to 0, 0.
//
- if (!fgHasValue("/sim/panel/x-offset"))
+ if (!fgHasNode("/sim/panel/x-offset"))
fgSetInt("/sim/panel/x-offset", root->getIntValue("x-offset", 0));
- if (!fgHasValue("/sim/panel/y-offset"))
+ // conditional removed by jim wilson to allow panel xml code
+ // with y-offset defined to work...
+ if (!fgHasNode("/sim/panel/y-offset"))
fgSetInt("/sim/panel/y-offset", root->getIntValue("y-offset", 0));
//
// Assign the background texture, if any, or a bogus chequerboard.
//
string bgTexture = root->getStringValue("background");
- if (bgTexture == "")
+ if (bgTexture.empty())
bgTexture = "FOO";
panel->setBackground(FGTextureManager::createTexture(bgTexture.c_str()));
- SG_LOG(SG_INPUT, SG_INFO, "Set background texture to " << bgTexture);
+ SG_LOG( SG_COCKPIT, SG_INFO, "Set background texture to " << bgTexture );
+
+ //
+ // Get multibackground if any...
+ //
+ string mbgTexture = root->getStringValue("multibackground[0]");
+ if (!mbgTexture.empty()) {
+ panel->setMultiBackground(FGTextureManager::createTexture(mbgTexture.c_str()), 0);
+ SG_LOG( SG_COCKPIT, SG_INFO, "Set background texture to " << mbgTexture );
+
+ mbgTexture = root->getStringValue("multibackground[1]");
+ if (mbgTexture.empty())
+ mbgTexture = "FOO";
+ panel->setMultiBackground(FGTextureManager::createTexture(mbgTexture.c_str()), 1);
+ SG_LOG( SG_COCKPIT, SG_INFO, "Set background texture to " << mbgTexture );
+
+ mbgTexture = root->getStringValue("multibackground[2]");
+ if (mbgTexture.empty())
+ mbgTexture = "FOO";
+ panel->setMultiBackground(FGTextureManager::createTexture(mbgTexture.c_str()), 2);
+ SG_LOG( SG_COCKPIT, SG_INFO, "Set background texture to " << mbgTexture );
+
+ mbgTexture = root->getStringValue("multibackground[3]");
+ if (mbgTexture.empty())
+ mbgTexture = "FOO";
+ panel->setMultiBackground(FGTextureManager::createTexture(mbgTexture.c_str()), 3);
+ SG_LOG( SG_COCKPIT, SG_INFO, "Set background texture to " << mbgTexture );
+
+ mbgTexture = root->getStringValue("multibackground[4]");
+ if (mbgTexture.empty())
+ mbgTexture = "FOO";
+ panel->setMultiBackground(FGTextureManager::createTexture(mbgTexture.c_str()), 4);
+ SG_LOG( SG_COCKPIT, SG_INFO, "Set background texture to " << mbgTexture );
+
+ mbgTexture = root->getStringValue("multibackground[5]");
+ if (mbgTexture.empty())
+ mbgTexture = "FOO";
+ panel->setMultiBackground(FGTextureManager::createTexture(mbgTexture.c_str()), 5);
+ SG_LOG( SG_COCKPIT, SG_INFO, "Set background texture to " << mbgTexture );
+
+ mbgTexture = root->getStringValue("multibackground[6]");
+ if (mbgTexture.empty())
+ mbgTexture = "FOO";
+ panel->setMultiBackground(FGTextureManager::createTexture(mbgTexture.c_str()), 6);
+ SG_LOG( SG_COCKPIT, SG_INFO, "Set background texture to " << mbgTexture );
+
+ mbgTexture = root->getStringValue("multibackground[7]");
+ if (mbgTexture.empty())
+ mbgTexture = "FOO";
+ panel->setMultiBackground(FGTextureManager::createTexture(mbgTexture.c_str()), 7);
+ SG_LOG( SG_COCKPIT, SG_INFO, "Set background texture to " << mbgTexture );
+
+ }
+
//
// Create each instrument.
//
- SG_LOG(SG_INPUT, SG_INFO, "Reading panel instruments");
+ SG_LOG( SG_COCKPIT, SG_INFO, "Reading panel instruments" );
const SGPropertyNode * instrument_group = root->getChild("instruments");
if (instrument_group != 0) {
int nInstruments = instrument_group->nChildren();
for (int i = 0; i < nInstruments; i++) {
const SGPropertyNode * node = instrument_group->getChild(i);
- if (node->getName() == "instrument") {
+ if (!strcmp(node->getName(), "instrument")) {
FGPanelInstrument * instrument = readInstrument(node);
if (instrument != 0)
panel->addInstrument(instrument);
} else {
- SG_LOG(SG_INPUT, SG_INFO, "Skipping " << node->getName()
- << " in instruments section");
+ SG_LOG( SG_COCKPIT, SG_INFO, "Skipping " << node->getName()
+ << " in instruments section" );
}
}
}
- SG_LOG(SG_INPUT, SG_INFO, "Done reading panel instruments");
+ SG_LOG( SG_COCKPIT, SG_INFO, "Done reading panel instruments" );
//
{
SGPropertyNode root;
- if (!readProperties(input, &root)) {
- SG_LOG(SG_INPUT, SG_ALERT, "Malformed property list for panel.");
+ try {
+ readProperties(input, &root);
+ } catch (const sg_exception &e) {
+ guiErrorMessage("Error reading panel: ", e);
return 0;
}
return readPanel(&root);
path.append(relative_path);
SGPropertyNode root;
- if (!readProperties(path.str(), &root)) {
- SG_LOG(SG_INPUT, SG_ALERT, "Malformed property list for panel.");
+ try {
+ readProperties(path.str(), &root);
+ } catch (const sg_exception &e) {
+ guiErrorMessage("Error reading panel: ", e);
return 0;
}
return readPanel(&root);
// end of panel_io.cxx
+
+
+
projects / flightgear.git / blobdiff