Switched up the way time stamp formatting is done. Now tracked by an

enum for easier determination. Also changed graphing window to respect
"system clock" style timestamps and display them properly.
This commit is contained in:
Collin Kidder
2023-03-15 19:50:58 -04:00
parent 1e0cd3c14d
commit 39b43ebf38
9 changed files with 69 additions and 61 deletions
+6 -25
View File
@@ -76,7 +76,7 @@ CANFrameModel::CANFrameModel(QObject *parent)
overwriteDups = false;
filtersPersistDuringClear = false;
useHexMode = true;
timeSeconds = false;
timeStyle = TS_MICROS;
timeOffset = 0;
needFilterRefresh = false;
lastUpdateNumFrames = 0;
@@ -101,32 +101,13 @@ void CANFrameModel::setHexMode(bool mode)
}
}
void CANFrameModel::setSecondsMode(bool mode)
void CANFrameModel::setTimeStyle(TimeStyle newStyle)
{
if (Utility::secondsMode != mode)
if (timeStyle != newStyle)
{
this->beginResetModel();
Utility::secondsMode = mode;
this->endResetModel();
}
}
void CANFrameModel::setSysTimeMode(bool mode)
{
if (Utility::sysTimeMode != mode)
{
this->beginResetModel();
Utility::sysTimeMode = mode;
this->endResetModel();
}
}
void CANFrameModel::setMillisMode(bool mode)
{
if (Utility::millisMode != mode)
{
this->beginResetModel();
Utility::millisMode = mode;
timeStyle = newStyle;
Utility::timeStyle = newStyle;
this->endResetModel();
}
}
@@ -487,7 +468,7 @@ QVariant CANFrameModel::data(const QModelIndex &index, int role) const
//Reformatting the output a bit with custom code
if (overwriteDups)
{
if (timeSeconds) return QString::number(thisFrame.timedelta / 1000000.0, 'f', 5);
if (timeStyle == TS_SECONDS) return QString::number(thisFrame.timedelta / 1000000.0, 'f', 5);
return QString::number(thisFrame.timedelta);
}
else ts = Utility::formatTimestamp(thisFrame.timeStamp().microSeconds());