#include <stdlib.h> // atoi() atof()
-#include <strstream>
+#include STL_STRSTREAM
#include "props.hxx"
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(istrstream);
+#endif
FGProps::FGProps() {
}
path = "/";
if ( is_enabled() ) {
- FG_LOG( FG_IO, FG_ALERT, "This shouldn't happen, but the channel "
+ SG_LOG( SG_IO, SG_ALERT, "This shouldn't happen, but the channel "
<< "is already in use, ignoring" );
return false;
}
SGIOChannel *io = get_io_channel();
if ( ! io->open( get_direction() ) ) {
- FG_LOG( FG_IO, FG_ALERT, "Error opening channel communication layer." );
+ SG_LOG( SG_IO, SG_ALERT, "Error opening channel communication layer." );
return false;
}
set_enabled( true );
- FG_LOG( FG_IO, FG_INFO, "Opening properties channel communication layer." );
+ SG_LOG( SG_IO, SG_INFO, "Opening properties channel communication layer." );
return true;
}
// return a human readable form of the value "type"
-static string getValueTypeString( const SGValue *v ) {
+static string getValueTypeString( const SGPropertyNode *node ) {
string result;
- if ( v == NULL ) {
+ if ( node == NULL ) {
return "unknown";
}
- SGValue::Type type = v->getType();
- if ( type == SGValue::UNKNOWN ) {
- result = "unknown";
- } else if ( type == SGValue::BOOL ) {
+ SGPropertyNode::Type type = node->getType();
+ if ( type == SGPropertyNode::UNSPECIFIED ) {
+ result = "unspecified";
+ } else if ( type == SGPropertyNode::BOOL ) {
result = "bool";
- } else if ( type == SGValue::INT ) {
+ } else if ( type == SGPropertyNode::INT ) {
result = "int";
- } else if ( type == SGValue::FLOAT ) {
+ } else if ( type == SGPropertyNode::LONG ) {
+ result = "long";
+ } else if ( type == SGPropertyNode::FLOAT ) {
result = "float";
- } else if ( type == SGValue::DOUBLE ) {
+ } else if ( type == SGPropertyNode::DOUBLE ) {
result = "double";
- } else if ( type == SGValue::STRING ) {
+ } else if ( type == SGPropertyNode::STRING ) {
result = "string";
}
} else {
string value = node->getStringValue ( name, "" );
line += " =\t'" + value + "'\t(";
- line += getValueTypeString( node->getValue( name ) );
+ line += getValueTypeString( node->getNode( name ) );
line += ")\n";
}
io->writestring( line.c_str() );
string value = node->getStringValue ( tokens[1], "" );
string tmp = tokens[1] + " = '" + value + "' (";
- tmp += getValueTypeString( node->getValue( tokens[1] ) );
+ tmp += getValueTypeString( node->getNode( tokens[1] ) );
tmp += ")\n";
io->writestring( tmp.c_str() );
if ( tokens.size() <= 2 ) {
// do nothing
} else {
- node->getValue( tokens[1], true )->setStringValue(tokens[2]);
+ node->getNode( tokens[1], true )->setStringValue(tokens[2]);
// now fetch and write out the new value as confirmation
// of the change
string value = node->getStringValue ( tokens[1], "" );
string tmp = tokens[1] + " = '" + value + "' (";
- tmp += getValueTypeString( node->getValue( tokens[1] ) );
+ tmp += getValueTypeString( node->getNode( tokens[1] ) );
tmp += ")\n";
io->writestring( tmp.c_str() );
if ( get_direction() == SG_IO_BI ) {
// cout << " (bi directional)" << endl;
while ( io->readline( buf, max_cmd_len ) > 0 ) {
- FG_LOG( FG_IO, FG_ALERT, "Success reading data." );
+ SG_LOG( SG_IO, SG_ALERT, "Success reading data." );
process_command( buf );
}
} else {
- FG_LOG( FG_IO, FG_ALERT,
+ SG_LOG( SG_IO, SG_ALERT,
"in or out direction not supported for FGProps." );
}