matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert stream preflight checks to bullet points

Browse Source
This commit is contained in:
Srivats P 2016-12-10 13:50:52 +05:30
parent a838d09fbd
commit cfa7d80f7b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/streamconfigdialog.cpp
View File

@ -1236,15 +1236,15 @@ void StreamConfigDialog::on_pbOk_clicked()
if ((mPort.transmitMode() == OstProto::kInterleavedTransmit) if ((mPort.transmitMode() == OstProto::kInterleavedTransmit)
&& (mpStream->isFrameVariable())) && (mpStream->isFrameVariable()))
{ {
log += "In 'Interleaved Streams' transmit mode, the count for " log += "* In 'Interleaved Streams' transmit mode, the count for "
"varying fields at transmit time may not be same as configured\n"; "varying fields at transmit time may not be same as configured\n";
} }
if (!mPort.trackStreamStats() if (!mPort.trackStreamStats()
&& mpStream->hasProtocol(OstProto::Protocol::kSignFieldNumber)) && mpStream->hasProtocol(OstProto::Protocol::kSignFieldNumber))
{ {
log += "Stream contains special signature, but per stream statistics " log += "* Stream contains special signature, but per stream statistics "
"will not be available till it is enabled on the port.\n"; "will not be available till it is enabled on the port\n";
} }
mpStream->preflightCheck(log); mpStream->preflightCheck(log);

8
common/streambase.cpp
View File

@ -611,8 +611,8 @@ bool StreamBase::preflightCheck(QString &result) const
if (chkTrunc && (pktLen < (frameProtocolLength(i) + kFcsSize))) if (chkTrunc && (pktLen < (frameProtocolLength(i) + kFcsSize)))
{ {
result += QString("One or more frames may be truncated - " result += QString("* One or more frames may be truncated - "
"frame length should be at least %1.\n") "frame length should be at least %1\n")
.arg(frameProtocolLength(i) + kFcsSize); .arg(frameProtocolLength(i) + kFcsSize);
chkTrunc = false; chkTrunc = false;
pass = false; pass = false;
@ -620,8 +620,8 @@ bool StreamBase::preflightCheck(QString &result) const
if (chkJumbo && (pktLen > 1522)) if (chkJumbo && (pktLen > 1522))
{ {
result += QString("Jumbo frames may be truncated or dropped " result += QString("* Jumbo frames may be truncated or dropped "
"if not supported by the hardware.\n"); "if not supported by the hardware\n");
chkJumbo = false; chkJumbo = false;
pass = false; pass = false;
} }