From 63bbe7de75780857d2d8896dd6af72e380fd97ab Mon Sep 17 00:00:00 2001 From: curt Date: Wed, 4 Oct 2000 20:51:12 +0000 Subject: [PATCH] Working on a new protocal that allows you to remotely browse, examine, and change items in the property manager. --- src/Network/props.cxx | 164 ++++++++++++++++++++++++++++++++++++++++-- src/Network/props.hxx | 3 + 2 files changed, 162 insertions(+), 5 deletions(-) diff --git a/src/Network/props.cxx b/src/Network/props.cxx index d97dbba9a..29730db42 100644 --- a/src/Network/props.cxx +++ b/src/Network/props.cxx @@ -25,6 +25,9 @@ #include #include #include +#include + +#include // atoi() atof() #include @@ -42,6 +45,8 @@ FGProps::~FGProps() { // open hailing frequencies bool FGProps::open() { + path = "/"; + if ( is_enabled() ) { FG_LOG( FG_IO, FG_ALERT, "This shouldn't happen, but the channel " << "is already in use, ignoring" ); @@ -61,8 +66,37 @@ bool FGProps::open() { } +// return a human readable form of the value "type" +static string getValueTypeString( const SGValue *v ) { + string result; + + if ( v == NULL ) { + return "unknown"; + } + + SGValue::Type type = v->getType(); + if ( type == SGValue::UNKNOWN ) { + result = "unknown"; + } else if ( type == SGValue::BOOL ) { + result = "bool"; + } else if ( type == SGValue::INT ) { + result = "int"; + } else if ( type == SGValue::FLOAT ) { + result = "float"; + } else if ( type == SGValue::DOUBLE ) { + result = "double"; + } else if ( type == SGValue::STRING ) { + result = "string"; + } + + return result; +} + + bool FGProps::process_command( const char *cmd ) { - cout << "processing command = " << cmd << endl; + SGIOChannel *io = get_io_channel(); + + cout << "processing command = " << cmd; string_list tokens; tokens.clear(); @@ -76,10 +110,128 @@ bool FGProps::process_command( const char *cmd ) { string command = tokens[0]; + SGPropertyNode node( path, ¤t_properties ); + if ( node.getPath() == "" ) { + node.setPath( "/" ); + } + if ( command == "ls" ) { - + for (int i = 0; i < (int)node.size(); i++) { + SGPropertyNode child = node.getChild(i); + string name = child.getName(); + string line = name; + if ( child.size() > 0 ) { + line += "/\n"; + } else { + string value = node.getStringValue ( name, "" ); + line += " =\t'" + value + "'\t("; + line += getValueTypeString( node.getValue( name ) ); + line += ")\n"; + } + io->writestring( line.c_str() ); + } + } else if ( command == "cd" ) { + // string tmp = "current path = " + node.getPath() + "\n"; + // io->writestring( tmp.c_str() ); + + if ( tokens.size() <= 1 ) { + // do nothing + } else if ( tokens[1] == "." ) { + // do nothing + } else if ( tokens[1] == ".." ) { + // go back one level + string current = node.getPath(); + int pos = current.rfind("/"); + // cout << "path = " << current << endl; + // cout << "new path = " << current.substr(0, pos) << endl;d + string tmp = current.substr(0, pos); + node.setPath( tmp ); + path = tmp; + } else { + // decend to specified child + string tmp = node.getPath(); + tmp += "/" + tokens[1]; + node.setPath( tmp ); + path = tmp; + } + } else if ( command == "show" ) { + if ( tokens.size() <= 1 ) { + // do nothing + } else { + string ttt = "debug = '" + tokens[1] + "'\n"; + io->writestring( ttt.c_str() ); + + string value = node.getStringValue ( tokens[1], "" ); + string tmp = tokens[1] + " = '" + value + "' ("; + tmp += getValueTypeString( node.getValue( tokens[1] ) ); + tmp += ")\n"; + + io->writestring( tmp.c_str() ); + } + } else if ( command == "set" ) { + if ( tokens.size() <= 2 ) { + // do nothing + } else { + SGValue *v = node.getValue( tokens[1] ); + if ( v != NULL ) { + SGValue::Type type = v->getType(); + if ( type == SGValue::UNKNOWN ) { + v->setUnknownValue( tokens[2] ); + } else if ( type == SGValue::BOOL ) { + if ( tokens[2] == "true" ) { + v->setBoolValue( true ); + } else if ( tokens[2] == "false" ) { + v->setBoolValue( false ); + } else { + v->setBoolValue( atoi( tokens[2].c_str() ) ); + } + } else if ( type == SGValue::INT ) { + v->setIntValue( atoi( tokens[2].c_str() ) ); + } else if ( type == SGValue::FLOAT ) { + v->setFloatValue( atof( tokens[2].c_str() ) ); + } else if ( type == SGValue::DOUBLE ) { + v->setDoubleValue( atof( tokens[2].c_str() ) ); + } else if ( type == SGValue::STRING ) { + v->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 += ")\n"; + + io->writestring( tmp.c_str() ); + } else { + string tmp = tokens[1] + " is unknown.\n"; + + io->writestring( tmp.c_str() ); + } + + } + } else if ( command == "quit" ) { + close(); + } else { + io->writestring( "\n" ); + io->writestring( "Valid commands are:\n" ); + io->writestring( "\n" ); + io->writestring( "help show help message\n" ); + io->writestring( "ls list current directory\n" ); + io->writestring( "cd cd to a directory, '..' to move back\n" ); + io->writestring( "show show the value of a parameter\n" ); + io->writestring( "set set to a new \n" ); + io->writestring( "quit terminate connection\n" ); + io->writestring( "\n" ); } + string prompt = node.getPath(); + if ( prompt == "" ) { + prompt = "/"; + } + prompt += "> "; + io->writestring( prompt.c_str() ); + return true; } @@ -88,11 +240,11 @@ bool FGProps::process_command( const char *cmd ) { bool FGProps::process() { SGIOChannel *io = get_io_channel(); - cout << "processing incoming props command" << endl; + // cout << "processing incoming props command" << endl; if ( get_direction() == SG_IO_BI ) { - cout << " (bi directional)" << endl; - while ( io->read( buf, max_cmd_len ) > 0 ) { + // cout << " (bi directional)" << endl; + while ( io->readline( buf, max_cmd_len ) > 0 ) { FG_LOG( FG_IO, FG_ALERT, "Success reading data." ); process_command( buf ); } @@ -115,5 +267,7 @@ bool FGProps::close() { return false; } + cout << "successfully closed channel\n"; + return true; } diff --git a/src/Network/props.hxx b/src/Network/props.hxx index 92481a93d..bd173bf05 100644 --- a/src/Network/props.hxx +++ b/src/Network/props.hxx @@ -42,6 +42,9 @@ class FGProps : public FGProtocol { char buf[max_cmd_len]; int length; + // tree view of property list + string path; + public: FGProps(); -- 2.39.5