Skip to content

U
uniset2
Commit 9c4d0ee5 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

(admin): Исправил ошибки в формате вывода в некоторых фукнциях

parent 3301571b
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
Utilities/Admin/admin.cc
View file @ 9c4d0ee5
...@@ -551,7 +551,6 @@ int getValue( const string args, UniversalInterface &ui, Configuration* conf ) ...@@ -551,7 +551,6 @@ int getValue( const string args, UniversalInterface &ui, Configuration* conf )
try try
{ {
UniversalIO::IOTypes t = conf->getIOType(it->si.id); UniversalIO::IOTypes t = conf->getIOType(it->si.id);
cout << " value: " << it->val << endl;
cout << " name: (" << it->si.id << ") " << it->fname << endl; cout << " name: (" << it->si.id << ") " << it->fname << endl;
cout << " iotype: " << t << endl; cout << " iotype: " << t << endl;
cout << " text: " << conf->oind->getTextName(it->si.id) << "\n\n"; cout << " text: " << conf->oind->getTextName(it->si.id) << "\n\n";
...@@ -592,13 +591,12 @@ int getCalibrate( const std::string args, UniversalInterface &ui ) ...@@ -592,13 +591,12 @@ int getCalibrate( const std::string args, UniversalInterface &ui )
int err = 0; int err = 0;
typedef std::list<UniSetTypes::ParamSInfo> SList; typedef std::list<UniSetTypes::ParamSInfo> SList;
SList sl = UniSetTypes::getSInfoList( args, UniSetTypes::conf ); SList sl = UniSetTypes::getSInfoList( args, UniSetTypes::conf );
cout << "====== getValue ======" << endl; cout << "====== getCalibrate ======" << endl;
for( SList::iterator it=sl.begin(); it!=sl.end(); it++ ) for( SList::iterator it=sl.begin(); it!=sl.end(); it++ )
{ {
if( it->si.node == DefaultObjectId ) if( it->si.node == DefaultObjectId )
it->si.node = conf->getLocalNode(); it->si.node = conf->getLocalNode();
cout << "getCalibrate --------\n";
cout << " name: (" << it->si.id << ") " << it->fname << endl; cout << " name: (" << it->si.id << ") " << it->fname << endl;
cout << " text: " << conf->oind->getTextName(it->si.id) << "\n"; cout << " text: " << conf->oind->getTextName(it->si.id) << "\n";
try try
...@@ -623,13 +621,12 @@ int getRawValue( const std::string args, UniversalInterface &ui ) ...@@ -623,13 +621,12 @@ int getRawValue( const std::string args, UniversalInterface &ui )
int err = 0; int err = 0;
typedef std::list<UniSetTypes::ParamSInfo> SList; typedef std::list<UniSetTypes::ParamSInfo> SList;
SList sl = UniSetTypes::getSInfoList( args, UniSetTypes::conf ); SList sl = UniSetTypes::getSInfoList( args, UniSetTypes::conf );
cout << "====== getValue ======" << endl; cout << "====== getRawValue ======" << endl;
for( SList::iterator it=sl.begin(); it!=sl.end(); it++ ) for( SList::iterator it=sl.begin(); it!=sl.end(); it++ )
{ {
if( it->si.node == DefaultObjectId ) if( it->si.node == DefaultObjectId )
it->si.node = conf->getLocalNode(); it->si.node = conf->getLocalNode();
cout << "getRawValue --------\n";
cout << " name: (" << it->si.id << ") " << it->fname << endl; cout << " name: (" << it->si.id << ") " << it->fname << endl;
cout << " text: " << conf->oind->getTextName(it->si.id) << "\n\n"; cout << " text: " << conf->oind->getTextName(it->si.id) << "\n\n";
try try
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment