Merge branch 'WIP' of github.com:collin80/SavvyCAN into WIP
This commit is contained in:
+1
-5
@@ -283,11 +283,7 @@ QVariant CANFrameModel::data(const QModelIndex &index, int role) const
|
|||||||
switch (Column(index.column()))
|
switch (Column(index.column()))
|
||||||
{
|
{
|
||||||
case Column::TimeStamp:
|
case Column::TimeStamp:
|
||||||
//Reformatting the output a bit with custom code
|
return Utility::formatTimestamp(thisFrame.timestamp);
|
||||||
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
|
|
||||||
case Column::FrameId:
|
case Column::FrameId:
|
||||||
return Utility::formatCANID(thisFrame.ID, thisFrame.extended);
|
return Utility::formatCANID(thisFrame.ID, thisFrame.extended);
|
||||||
case Column::Extended:
|
case Column::Extended:
|
||||||
|
|||||||
Reference in New Issue
Block a user