t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add sniffer window frequency & 0x to address

Browse Source
This commit is contained in:
Viktor Verebelyi
2021-11-26 01:24:30 +00:00
parent 774e9ddafd
commit efe1247bbb
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
re/sniffer/sniffermodel.cpp
+5 -1
View File
@@ -65,8 +65,10 @@ QVariant SnifferModel::data(const QModelIndex &index, int role) const
{ {
case tc::DELTA: case tc::DELTA:
return QString::number(item->getDelta(), 'f'); return QString::number(item->getDelta(), 'f');
case tc::FREQUENCY:
return QString("%1 hz").arg(qRound(1.00 / item->getDelta()));
case tc::ID: case tc::ID:
return QString("%1").arg(item->getId(), 5, 16, QLatin1Char(' ')).toUpper(); return "0x" + QString("%1").arg(item->getId(), 5, 16, QLatin1Char(' ')).toUpper();
default: default:
break; break;
} }
@@ -148,6 +150,8 @@ QVariant SnifferModel::headerData(int section, Qt::Orientation orientation, int
{ {
case tc::DELTA: case tc::DELTA:
return QString("Delta"); return QString("Delta");
case tc::FREQUENCY:
return QString("Delta");
case tc::ID: case tc::ID:
return QString("ID"); return QString("ID");
default: default:
re/sniffer/snifferwindow.cpp
+20 -18
View File
@@ -82,15 +82,16 @@ void SnifferWindow::readSettings()
resize(settings.value("Sniffer/WindowSize", QSize(1100, 750)).toSize()); resize(settings.value("Sniffer/WindowSize", QSize(1100, 750)).toSize());
move(Utility::constrainedWindowPos(settings.value("Sniffer/WindowPos", QPoint(50, 50)).toPoint())); move(Utility::constrainedWindowPos(settings.value("Sniffer/WindowPos", QPoint(50, 50)).toPoint()));
ui->treeView->setColumnWidth(0, settings.value("Sniffer/DeltaColumn", 110).toUInt()); ui->treeView->setColumnWidth(0, settings.value("Sniffer/DeltaColumn", 110).toUInt());
ui->treeView->setColumnWidth(1, settings.value("Sniffer/IDColumn", 70).toUInt()); ui->treeView->setColumnWidth(1, settings.value("Sniffer/FrequencyColumn", 110).toUInt());
ui->treeView->setColumnWidth(2, settings.value("Sniffer/Data0Column", 92).toUInt()); ui->treeView->setColumnWidth(2, settings.value("Sniffer/IDColumn", 70).toUInt());
ui->treeView->setColumnWidth(3, settings.value("Sniffer/Data1Column", 92).toUInt()); ui->treeView->setColumnWidth(3, settings.value("Sniffer/Data0Column", 92).toUInt());
ui->treeView->setColumnWidth(4, settings.value("Sniffer/Data2Column", 92).toUInt()); ui->treeView->setColumnWidth(4, settings.value("Sniffer/Data1Column", 92).toUInt());
ui->treeView->setColumnWidth(5, settings.value("Sniffer/Data3Column", 92).toUInt()); ui->treeView->setColumnWidth(5, settings.value("Sniffer/Data2Column", 92).toUInt());
ui->treeView->setColumnWidth(6, settings.value("Sniffer/Data4Column", 92).toUInt()); ui->treeView->setColumnWidth(6, settings.value("Sniffer/Data3Column", 92).toUInt());
ui->treeView->setColumnWidth(7, settings.value("Sniffer/Data5Column", 92).toUInt()); ui->treeView->setColumnWidth(7, settings.value("Sniffer/Data4Column", 92).toUInt());
ui->treeView->setColumnWidth(8, settings.value("Sniffer/Data6Column", 92).toUInt()); ui->treeView->setColumnWidth(8, settings.value("Sniffer/Data5Column", 92).toUInt());
ui->treeView->setColumnWidth(9, settings.value("Sniffer/Data7Column", 92).toUInt()); ui->treeView->setColumnWidth(9, settings.value("Sniffer/Data6Column", 92).toUInt());
ui->treeView->setColumnWidth(10, settings.value("Sniffer/Data7Column", 92).toUInt());
} }
} }
@@ -103,15 +104,16 @@ void SnifferWindow::writeSettings()
settings.setValue("Sniffer/WindowSize", size()); settings.setValue("Sniffer/WindowSize", size());
settings.setValue("Sniffer/WindowPos", pos()); settings.setValue("Sniffer/WindowPos", pos());
settings.setValue("Sniffer/DeltaColumn", ui->treeView->columnWidth(0)); settings.setValue("Sniffer/DeltaColumn", ui->treeView->columnWidth(0));
settings.setValue("Sniffer/IDColumn", ui->treeView->columnWidth(1)); settings.setValue("Sniffer/FrequencyColumn", ui->treeView->columnWidth(1));
settings.setValue("Sniffer/Data0Column", ui->treeView->columnWidth(2)); settings.setValue("Sniffer/IDColumn", ui->treeView->columnWidth(2));
settings.setValue("Sniffer/Data1Column", ui->treeView->columnWidth(3)); settings.setValue("Sniffer/Data0Column", ui->treeView->columnWidth(3));
settings.setValue("Sniffer/Data2Column", ui->treeView->columnWidth(4)); settings.setValue("Sniffer/Data1Column", ui->treeView->columnWidth(4));
settings.setValue("Sniffer/Data3Column", ui->treeView->columnWidth(5)); settings.setValue("Sniffer/Data2Column", ui->treeView->columnWidth(5));
settings.setValue("Sniffer/Data4Column", ui->treeView->columnWidth(6)); settings.setValue("Sniffer/Data3Column", ui->treeView->columnWidth(6));
settings.setValue("Sniffer/Data5Column", ui->treeView->columnWidth(7)); settings.setValue("Sniffer/Data4Column", ui->treeView->columnWidth(7));
settings.setValue("Sniffer/Data6Column", ui->treeView->columnWidth(8)); settings.setValue("Sniffer/Data5Column", ui->treeView->columnWidth(8));
settings.setValue("Sniffer/Data7Column", ui->treeView->columnWidth(9)); settings.setValue("Sniffer/Data6Column", ui->treeView->columnWidth(9));
settings.setValue("Sniffer/Data7Column", ui->treeView->columnWidth(10));
} }
} }
re/sniffer/snifferwindow.h
+1
View File
@@ -13,6 +13,7 @@ class snifferWindow;
enum tc enum tc
{ {
DELTA = 0, DELTA = 0,
FREQUENCY,
ID, ID,
DATA_0, DATA_0,
DATA_1, DATA_1,