From 9596d240ad1aa177033706deb8fcf1b1b3bb09ed Mon Sep 17 00:00:00 2001 From: Collin Kidder Date: Sat, 30 Mar 2019 23:46:09 -0700 Subject: [PATCH] Revert change in timestamp formatting as the new code would sometimes malfunction on Windows. --- canframemodel.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/canframemodel.cpp b/canframemodel.cpp index 4221e4f1..199a1966 100644 --- a/canframemodel.cpp +++ b/canframemodel.cpp @@ -283,11 +283,7 @@ QVariant CANFrameModel::data(const QModelIndex &index, int role) const switch (Column(index.column())) { case Column::TimeStamp: - //Reformatting the output a bit with custom code - ts = Utility::formatTimestamp(thisFrame.timestamp); - if (ts.type() == QVariant::Double) return QString::number(ts.toDouble(), 'f', 5); //never scientific notation, 5 decimal places - if (ts.type() == QVariant::LongLong) return QString::number(ts.toLongLong()); //never scientific notion, all digits shown - if (ts.type() == QVariant::DateTime) return ts.toDateTime().toString(timeFormat); //custom set format for dates and times + return Utility::formatTimestamp(thisFrame.timestamp); case Column::FrameId: return Utility::formatCANID(thisFrame.ID, thisFrame.extended); case Column::Extended: