(UniSetTypes): доработал IDList, чтобы при добавлении можно было задать

либо название датчика либо сразу его id.

(UniSetTypes): доработал IDList, чтобы при добавлении можно было задать
2a9f1eb1 · Pavel Vainerman · c5ef2617 · 2a9f1eb1
Commit 2a9f1eb1 authored Aug 31, 2015 by Pavel Vainerman
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

UniSetTypes.cc src/ObjectRepository/UniSetTypes.cc +12 -1

No files found.
--- a/src/ObjectRepository/UniSetTypes.cc
+++ b/src/ObjectRepository/UniSetTypes.cc
@@ -126,8 +126,19 @@ UniSetTypes::IDList::IDList( std::vector<std::string>&& svec ):
 UniSetTypes::IDList::IDList( std::vector<std::string>& svec ):
 	UniSetTypes::IDList::IDList()
 {
+	auto conf = uniset_conf();
+
 	for( const auto& s : svec )
-		add( uni_atoi(s) );
+	{
+		ObjectId id;
+
+		if( is_digit(s) )
+			id = uni_atoi(s);
+		else
+			id = conf->getSensorID(s);
+
+		add(id);
+	}
 }
 // -------------------------------------------------------------------------
 UniSetTypes::IDList::IDList():