Merged v2.19

This commit is contained in:
Fred Gleason
2018-05-18 14:12:15 +00:00
5 changed files with 26 additions and 4 deletions

View File

@@ -928,6 +928,14 @@ bool RDEventLine::linkLog(RDLogEvent *e,const QString &svcname,
delete logline;
logline=NULL;
//
// Clear Leading Event Values
//
time_type=RDLogLine::Relative;
trans_type=event_default_transtype;
// time=time.addMSecs(length);
grace_time=-1;
//
// Calculate Event Time Boundaries
//
@@ -1104,15 +1112,17 @@ bool RDEventLine::linkLog(RDLogEvent *e,const QString &svcname,
logline->setCartNumber(q->value(0).toUInt());
}
}
/*
//
// Clear Leading Event Values
//
time_type=RDLogLine::Relative;
trans_type=event_default_transtype;
*/
time=time.addMSecs(length);
/*
grace_time=-1;
*/
}
delete q;