SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

replace PIConfig::Entry operators to functions

Browse Source
This commit is contained in:
Бычков Андрей
2020-04-29 17:17:59 +03:00
parent 6a6907b136
commit fda8c61c3f
6 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src_main/io_devices/piconfig.h
View File

@@ -263,43 +263,43 @@ public:
//! Convertion to boolean
operator bool() {return _value.toBool();}
bool toBool() const {return _value.toBool();}
//! Convertion to char
operator char() {return (_value.isEmpty() ? 0 : _value[0].toAscii());}
char toChar() const {return (_value.isEmpty() ? 0 : _value[0].toAscii());}
//! Convertion to short
operator short() {return _value.toShort();}
short toShort() const {return _value.toShort();}
//! Convertion to int
operator int() {return _value.toInt();}
int toInt() const {return _value.toInt();}
//! Convertion to long
operator long() {return _value.toLong();}
long toLong() const {return _value.toLong();}
//! Convertion to uchar
operator uchar() {return _value.toInt();}
uchar toUChar() const {return _value.toInt();}
//! Convertion to ushort
operator ushort() {return _value.toShort();}
ushort toUShort() const {return _value.toShort();}
//! Convertion to uint
operator uint() {return _value.toInt();}
uint toUInt() const {return _value.toInt();}
//! Convertion to ulong
operator ulong() {return _value.toLong();}
ulong toULong() const {return _value.toLong();}
//! Convertion to float
operator float() {return _value.toFloat();}
float toFloat() const {return _value.toFloat();}
//! Convertion to double
operator double() {return _value.toDouble();}
double toDouble() const {return _value.toDouble();}
//! Convertion to PIString
operator PIString() {return _value;}
PIString toString() const {return _value;}
//! Convertion to PIStringList
operator PIStringList() {return _value.split("%|%");}
PIStringList toStringList() const {return _value.split("%|%");}
private:
typedef PIConfig::Entry * EntryPtr;
@@ -443,7 +443,7 @@ public:
int entryIndex(const PIString & name);
PIString getName(uint number) {return entryByIndex(number)._name;}
PIString getValue(uint number) {return entryByIndex(number)._value;}
PIString getValueByIndex(uint number) {return entryByIndex(number)._value;}
PIChar getType(uint number) {return entryByIndex(number)._type[0];}
PIString getComment(uint number) {return entryByIndex(number)._comment;}
@@ -525,15 +525,15 @@ inline PICout operator <<(PICout s, const PIConfig::Entry & v) {s << v.value();
* from configuration file in implementation \a PIIODevice::configureDevice() function */
template<typename T>
T readDeviceSetting(const PIString & name, const T & def, const PIConfig::Entry * em, const PIConfig::Entry * ep) {
PIVariant v = PIVariant::fromValue<T>(T());
if (ep != 0) {
T ret;
bool ex;
ret = ep->getValue(name, def, &ex);
if (!ex) ret = em->getValue(name, def);
return ret;
v.setValueFromString(ep->getValue(name, def, &ex).toString());
if (!ex) v.setValueFromString(em->getValue(name, def).toString());
return v.value<T>();
}
return em->getValue(name, def);
v.setValueFromString(em->getValue(name, def).toString());
return v.value<T>();
}
#endif // PICONFIG_H

18
src_main/io_devices/piiodevice.cpp
View File

@@ -332,16 +332,16 @@ bool PIIODevice::configure(const PIString & config_file, const PIString & sectio
PIConfig::Entry * ep = 0;
if (parent_section) ep = em.parent();
if (ep != 0) {
setReopenEnabled(ep->getValue("reopenEnabled", isReopenEnabled(), &ex));
if (!ex) setReopenEnabled(em.getValue("reopenEnabled", isReopenEnabled()));
setReopenTimeout(ep->getValue("reopenTimeout", reopenTimeout(), &ex));
if (!ex) setReopenTimeout(em.getValue("reopenTimeout", reopenTimeout()));
setThreadedReadBufferSize(ep->getValue("threadedReadBufferSize", int(threaded_read_buffer_size), &ex));
if (!ex) setThreadedReadBufferSize(em.getValue("threadedReadBufferSize", int(threaded_read_buffer_size)));
setReopenEnabled(ep->getValue("reopenEnabled", isReopenEnabled(), &ex).toBool());
if (!ex) setReopenEnabled(em.getValue("reopenEnabled", isReopenEnabled()).toBool());
setReopenTimeout(ep->getValue("reopenTimeout", reopenTimeout(), &ex).toInt());
if (!ex) setReopenTimeout(em.getValue("reopenTimeout", reopenTimeout()).toInt());
setThreadedReadBufferSize(ep->getValue("threadedReadBufferSize", int(threaded_read_buffer_size), &ex).toInt());
if (!ex) setThreadedReadBufferSize(em.getValue("threadedReadBufferSize", int(threaded_read_buffer_size)).toInt());
} else {
setReopenEnabled(em.getValue("reopenEnabled", isReopenEnabled()));
setReopenTimeout(em.getValue("reopenTimeout", reopenTimeout()));
setThreadedReadBufferSize(em.getValue("threadedReadBufferSize", int(threaded_read_buffer_size)));
setReopenEnabled(em.getValue("reopenEnabled", isReopenEnabled()).toBool());
setReopenTimeout(em.getValue("reopenTimeout", reopenTimeout()).toInt());
setThreadedReadBufferSize(em.getValue("threadedReadBufferSize", int(threaded_read_buffer_size)).toInt());
}
return configureDevice(&em, ep);
}

2
src_main/io_devices/pipeer.cpp
View File

@@ -858,7 +858,7 @@ bool PIPeer::openDevice() {
"pip.conf"
#endif
, PIIODevice::ReadOnly);
server_ip = conf.getValue("peer_server_ip", "");
server_ip = conf.getValue("peer_server_ip", "").toString();
reinit();
diag_d.reset();
diag_s.reset();