git-svn-id: svn://db.shs.com.ru/pip@205 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
@@ -76,11 +76,6 @@
|
||||
PIVector<PIConnection * > PIConnection::_connections;
|
||||
|
||||
|
||||
PIConnection::PIConnection(): PIObject() {
|
||||
_connections << this;
|
||||
}
|
||||
|
||||
|
||||
PIConnection::PIConnection(const PIString & name): PIObject(name) {
|
||||
_connections << this;
|
||||
}
|
||||
@@ -125,6 +120,7 @@ bool PIConnection::configure(PIConfig & conf, const PIString & name_) {
|
||||
removeAllFilters();
|
||||
removeAllDevices();
|
||||
setName(name_);
|
||||
if (name_.isEmpty()) piCoutObj << "Warning, can't configure connection with empty name";
|
||||
PIConfig::Entry ce(conf.getValue(name_));
|
||||
PIConfig::Branch db(ce.getValue("device").children()), fb(ce.getValue("filter").children()),
|
||||
cb(ce.getValue("channel").children()), sb(ce.getValue("sender").children());
|
||||
|
||||
@@ -32,12 +32,8 @@ class PIP_EXPORT PIConnection: public PIObject
|
||||
{
|
||||
PIOBJECT_SUBCLASS(PIConnection, PIObject)
|
||||
public:
|
||||
|
||||
//! Constructs an empty connection
|
||||
PIConnection();
|
||||
|
||||
//! Constructs connection with name "name"
|
||||
PIConnection(const PIString & name);
|
||||
//! Constructs connection with name "name", or with default name = "connection"
|
||||
PIConnection(const PIString & name = PIStringAscii("connection"));
|
||||
|
||||
//! Constructs connection and configure it from config file "config" from section "name"
|
||||
PIConnection(const PIString & config, const PIString & name);
|
||||
@@ -50,11 +46,11 @@ public:
|
||||
|
||||
/*! \brief Configure connection from config file "config" from section "name". Returns if configuration was successful
|
||||
* \details \b Warning: all devices, filters and channels removed before configure! */
|
||||
bool configureFromConfig(const PIString & config, const PIString & name);
|
||||
bool configureFromConfig(const PIString & config, const PIString & name = PIStringAscii("connection"));
|
||||
|
||||
/*! \brief Configure connection from config content "string" from section "name". Returns if configuration was successful
|
||||
* \details \b Warning: all devices, filters and channels removed before configure! */
|
||||
bool configureFromString(PIString * string, const PIString & name);
|
||||
bool configureFromString(PIString * string, const PIString & name = PIStringAscii("connection"));
|
||||
|
||||
//! Returns config file section of current connection configuration
|
||||
PIString makeConfig() const;
|
||||
|
||||
Reference in New Issue
Block a user