commit request
git-svn-id: svn://db.shs.com.ru/libs@274 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -324,8 +324,8 @@ void ConnectionEdit::recreateConnection() {
|
|||||||
PIPacketExtractor * pe = conn->addFilter(Q2PIString(fi_t->name()),conn->deviceByName(name_from), fi_t->mode());
|
PIPacketExtractor * pe = conn->addFilter(Q2PIString(fi_t->name()),conn->deviceByName(name_from), fi_t->mode());
|
||||||
if (!pe) continue;
|
if (!pe) continue;
|
||||||
pe->setBufferSize(fi_t->bufferSize());
|
pe->setBufferSize(fi_t->bufferSize());
|
||||||
pe->setHeader(PIByteArray::fromString(Q2PIString(fi_t->header())));
|
pe->setHeader(PIByteArray::fromUserInput(Q2PIString(fi_t->header())));
|
||||||
pe->setFooter(PIByteArray::fromString(Q2PIString(fi_t->footer())));
|
pe->setFooter(PIByteArray::fromUserInput(Q2PIString(fi_t->footer())));
|
||||||
pe->setTimeout(fi_t->timeout());
|
pe->setTimeout(fi_t->timeout());
|
||||||
pe->setPacketSize(fi_t->packetSize());
|
pe->setPacketSize(fi_t->packetSize());
|
||||||
pe->setPayloadSize(fi_t->packetSize());
|
pe->setPayloadSize(fi_t->packetSize());
|
||||||
@@ -365,7 +365,7 @@ void ConnectionEdit::recreateConnection() {
|
|||||||
si->name();
|
si->name();
|
||||||
conn->addSender(Q2PIString(si->name()), Q2PIString(di_t->path()), si->frequency());
|
conn->addSender(Q2PIString(si->name()), Q2PIString(di_t->path()), si->frequency());
|
||||||
if (!si->data().isEmpty())
|
if (!si->data().isEmpty())
|
||||||
conn->setSenderFixedData(Q2PIString(si->name()), PIByteArray::fromString(Q2PIString(si->data())));
|
conn->setSenderFixedData(Q2PIString(si->name()), PIByteArray::fromUserInput(Q2PIString(si->data())));
|
||||||
} else {
|
} else {
|
||||||
if (type == __CV_Device) name_from = ((DeviceItem*)bi_f)->name();
|
if (type == __CV_Device) name_from = ((DeviceItem*)bi_f)->name();
|
||||||
if (type == __CV_Filter) name_from = ((FilterItem*)bi_f)->name();
|
if (type == __CV_Filter) name_from = ((FilterItem*)bi_f)->name();
|
||||||
|
|||||||
Reference in New Issue
Block a user