Merge pull request #96 from Semant1ka/add_ext_addr

Add extended addressing to iso tp window
This commit is contained in:
Collin Kidder
2017-10-15 14:44:49 -04:00
committed by GitHub
3 changed files with 18 additions and 2 deletions
+7
View File
@@ -28,6 +28,7 @@ ISOTP_InterpreterWindow::ISOTP_InterpreterWindow(const QVector<CANFrame> *frames
connect(ui->tableIsoFrames, &QTableWidget::itemSelectionChanged, this, &ISOTP_InterpreterWindow::showDetailView); connect(ui->tableIsoFrames, &QTableWidget::itemSelectionChanged, this, &ISOTP_InterpreterWindow::showDetailView);
connect(ui->btnClearList, &QPushButton::clicked, this, &ISOTP_InterpreterWindow::clearList); connect(ui->btnClearList, &QPushButton::clicked, this, &ISOTP_InterpreterWindow::clearList);
connect(ui->cbUseExtendedAddressing, SIGNAL(toggled(bool)), this, SLOT(useExtendedAddressing(bool)));
QStringList headers; QStringList headers;
headers << "Timestamp" << "ID" << "Bus" << "Dir" << "Length" << "Data"; headers << "Timestamp" << "ID" << "Bus" << "Dir" << "Length" << "Data";
@@ -132,6 +133,12 @@ void ISOTP_InterpreterWindow::clearList()
//idFilters.clear(); //idFilters.clear();
} }
void ISOTP_InterpreterWindow::useExtendedAddressing(bool checked)
{
decoder->setExtendedAddressing(checked);
this->interpretCapturedFrames();
}
void ISOTP_InterpreterWindow::updatedFrames(int numFrames) void ISOTP_InterpreterWindow::updatedFrames(int numFrames)
{ {
if (numFrames == -1) //all frames deleted. Kill the display if (numFrames == -1) //all frames deleted. Kill the display
+2
View File
@@ -30,6 +30,7 @@ private slots:
void filterAll(); void filterAll();
void filterNone(); void filterNone();
void interpretCapturedFrames(); void interpretCapturedFrames();
void useExtendedAddressing(bool checked);
private: private:
Ui::ISOTP_InterpreterWindow *ui; Ui::ISOTP_InterpreterWindow *ui;
@@ -43,6 +44,7 @@ private:
void closeEvent(QCloseEvent *event); void closeEvent(QCloseEvent *event);
void readSettings(); void readSettings();
void writeSettings(); void writeSettings();
}; };
#endif // ISOTP_INTERPRETERWINDOW_H #endif // ISOTP_INTERPRETERWINDOW_H
+9 -2
View File
@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>792</width> <width>830</width>
<height>725</height> <height>725</height>
</rect> </rect>
</property> </property>
@@ -42,13 +42,20 @@
</item> </item>
</layout> </layout>
</item> </item>
<item alignment="Qt::AlignHCenter"> <item alignment="Qt::AlignLeft">
<widget class="QCheckBox" name="cbShowIncomplete"> <widget class="QCheckBox" name="cbShowIncomplete">
<property name="text"> <property name="text">
<string>Show incomplete and/or corrupted messages</string> <string>Show incomplete and/or corrupted messages</string>
</property> </property>
</widget> </widget>
</item> </item>
<item alignment="Qt::AlignLeft">
<widget class="QCheckBox" name="cbUseExtendedAddressing">
<property name="text">
<string>Use extended addressing</string>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>