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

version 2.93 ready to master

Browse Source 
remove PIString << operators
This commit is contained in:
Пелипенко Иван
2022-06-24 12:10:57 +03:00
parent b66272a68a
commit 1b04d7ecce
19 changed files with 119 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
libs/main/io_utils/piconnection.cpp
View File

@@ -19,6 +19,7 @@
#include "piconnection.h"
#include "piconfig.h"
#include "piiostream.h"
/** \class PIConnection
* \brief Complex Input/Output point
@@ -259,18 +260,19 @@ bool PIConnection::configure(PIConfig & conf, const PIString & name_) {
PIString PIConnection::makeConfig() const {
PIString ret;
ret << "[" << name() << "]\n";
PIIOTextStream ts(&ret);
ts << "[" << name() << "]\n";
PIVector<PIIODevice * > devs(boundedDevices());
int dn(-1);
piForeachC (PIIODevice * d, devs) {
PIStringList dnl(deviceNames(d));
if (dnl.isEmpty()) dnl << PIString::fromNumber(++dn);
piForeachC (PIString & dname, dnl) {
ret << "device." << dname << " = " << d->constructFullPath() << " #s\n";
ret << "device." << dname << ".bufferSize = " << d->threadedReadBufferSize() << " #n\n";
ts << "device." << dname << " = " << d->constructFullPath() << " #s\n";
ts << "device." << dname << ".bufferSize = " << d->threadedReadBufferSize() << " #n\n";
PIDiagnostics * diag = diags_.value(const_cast<PIIODevice * >(d), 0);
if (diag != 0)
ret << "device." << dname << ".disconnectTimeout = " << diag->disconnectTimeout() << " #f\n";
ts << "device." << dname << ".disconnectTimeout = " << diag->disconnectTimeout() << " #f\n";
}
}
piForeachC (PEPair & f, extractors) {
@@ -280,27 +282,27 @@ PIString PIConnection::makeConfig() const {
for (int i = 0; i < f.second->devices.size_s(); ++i) {
PIString dname = device_names.key(f.second->devices[i]);
if (dname.isEmpty()) dname = devPath(f.second->devices[i]);
ret << prefix << ".device." << i << " = " << dname << " #s\n";
ts << prefix << ".device." << i << " = " << dname << " #s\n";
}
PIDiagnostics * diag = diags_.value(f.second->extractor, 0);
ret << prefix << ".bufferSize = " << f.second->extractor->bufferSize() << " #n\n";
ts << prefix << ".bufferSize = " << f.second->extractor->bufferSize() << " #n\n";
if (diag != 0)
ret << prefix << ".disconnectTimeout = " << diag->disconnectTimeout() << " #f\n";
ret << prefix << ".splitMode = ";
ts << prefix << ".disconnectTimeout = " << diag->disconnectTimeout() << " #f\n";
ts << prefix << ".splitMode = ";
switch (f.second->extractor->splitMode()) {
case PIPacketExtractor::None: ret << "none"; break;
case PIPacketExtractor::Header: ret << "header"; break;
case PIPacketExtractor::Footer: ret << "footer"; break;
case PIPacketExtractor::HeaderAndFooter: ret << "header & footer"; break;
case PIPacketExtractor::Size: ret << "size"; break;
case PIPacketExtractor::Timeout: ret << "timeout"; break;
case PIPacketExtractor::None: ts << "none"; break;
case PIPacketExtractor::Header: ts << "header"; break;
case PIPacketExtractor::Footer: ts << "footer"; break;
case PIPacketExtractor::HeaderAndFooter: ts << "header & footer"; break;
case PIPacketExtractor::Size: ts << "size"; break;
case PIPacketExtractor::Timeout: ts << "timeout"; break;
}
ret << " #s\n";
ret << prefix << ".payloadSize = " << f.second->extractor->payloadSize() << " #n\n";
ret << prefix << ".packetSize = " << f.second->extractor->packetSize() << " #n\n";
ret << prefix << ".timeout = " << f.second->extractor->timeout() << " #f\n";
ret << prefix << ".header = " << f.second->extractor->header().toString() << " #s\n";
ret << prefix << ".footer = " << f.second->extractor->footer().toString() << " #s\n";
ts << " #s\n";
ts << prefix << ".payloadSize = " << f.second->extractor->payloadSize() << " #n\n";
ts << prefix << ".packetSize = " << f.second->extractor->packetSize() << " #n\n";
ts << prefix << ".timeout = " << f.second->extractor->timeout() << " #f\n";
ts << prefix << ".header = " << f.second->extractor->header().toString() << " #s\n";
ts << prefix << ".footer = " << f.second->extractor->footer().toString() << " #s\n";
}
dn = 0;
piForeachC (CPair & c, channels_) {
@@ -308,10 +310,10 @@ PIString PIConnection::makeConfig() const {
PIString prefix = "channel." + PIString::fromNumber(dn); ++dn;
PIString dname = device_names.key(c.first);
if (dname.isEmpty()) dname = devPath(c.first);
ret << prefix << ".from = " << dname << " #s\n";
ts << prefix << ".from = " << dname << " #s\n";
dname = device_names.key(const_cast<PIIODevice *>(d));
if (dname.isEmpty()) dname = devPath(d);
ret << prefix << ".to = " << dname << " #s\n";
ts << prefix << ".to = " << dname << " #s\n";
}
}
piForeachC (SPair & s, senders) {
@@ -320,15 +322,15 @@ PIString PIConnection::makeConfig() const {
for (int i = 0; i < s.second->devices.size_s(); ++i) {
PIString dname = device_names.key(s.second->devices[i]);
if (dname.isEmpty()) dname = devPath(s.second->devices[i]);
ret << prefix << ".device." << i << " = " << dname << " #s\n";
ts << prefix << ".device." << i << " = " << dname << " #s\n";
}
double int_ = s.second->int_;
if (int_ > 0.)
ret << prefix << ".frequency = " << (1000. / int_) << " #f\n";
ts << prefix << ".frequency = " << (1000. / int_) << " #f\n";
if (!s.second->sdata.isEmpty())
ret << prefix << ".fixedData = " << s.second->sdata.toString() << " #s\n";
ts << prefix << ".fixedData = " << s.second->sdata.toString() << " #s\n";
}
ret << "[]\n";
ts << "[]\n";
return ret;
}