From 4e645a8674b31b31056fbe85be3572fe9fb64b48 Mon Sep 17 00:00:00 2001
From: Ubuntu <polina>
Date: Sun, 15 Oct 2017 09:17:48 -0700
Subject: [PATCH] add extended addressing to iso tp window

---
 re/isotp_interpreterwindow.cpp |  7 +++++++
 re/isotp_interpreterwindow.h   |  2 ++
 ui/isotp_interpreterwindow.ui  | 11 +++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/re/isotp_interpreterwindow.cpp b/re/isotp_interpreterwindow.cpp
index 4d166f8..0907be2 100644
--- a/re/isotp_interpreterwindow.cpp
+++ b/re/isotp_interpreterwindow.cpp
@@ -28,6 +28,7 @@ ISOTP_InterpreterWindow::ISOTP_InterpreterWindow(const QVector<CANFrame> *frames
 
     connect(ui->tableIsoFrames, &QTableWidget::itemSelectionChanged, this, &ISOTP_InterpreterWindow::showDetailView);
     connect(ui->btnClearList, &QPushButton::clicked, this, &ISOTP_InterpreterWindow::clearList);
+    connect(ui->cbUseExtendedAddressing, SIGNAL(toggled(bool)), this, SLOT(useExtendedAddressing(bool)));
 
     QStringList headers;
     headers << "Timestamp" << "ID" << "Bus" << "Dir" << "Length" << "Data";
@@ -132,6 +133,12 @@ void ISOTP_InterpreterWindow::clearList()
     //idFilters.clear();
 }
 
+void ISOTP_InterpreterWindow::useExtendedAddressing(bool checked)
+{
+    decoder->setExtendedAddressing(checked);
+    this->interpretCapturedFrames();
+}
+
 void ISOTP_InterpreterWindow::updatedFrames(int numFrames)
 {
     if (numFrames == -1) //all frames deleted. Kill the display
diff --git a/re/isotp_interpreterwindow.h b/re/isotp_interpreterwindow.h
index 3ec1f4c..76c8ce5 100644
--- a/re/isotp_interpreterwindow.h
+++ b/re/isotp_interpreterwindow.h
@@ -30,6 +30,7 @@ private slots:
     void filterAll();
     void filterNone();
     void interpretCapturedFrames();
+    void useExtendedAddressing(bool checked);
 
 private:
     Ui::ISOTP_InterpreterWindow *ui;
@@ -43,6 +44,7 @@ private:
     void closeEvent(QCloseEvent *event);
     void readSettings();
     void writeSettings();
+
 };
 
 #endif // ISOTP_INTERPRETERWINDOW_H
diff --git a/ui/isotp_interpreterwindow.ui b/ui/isotp_interpreterwindow.ui
index cb6e353..77e398e 100644
--- a/ui/isotp_interpreterwindow.ui
+++ b/ui/isotp_interpreterwindow.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>792</width>
+    <width>830</width>
     <height>725</height>
    </rect>
   </property>
@@ -42,13 +42,20 @@
      </item>
     </layout>
    </item>
-   <item alignment="Qt::AlignHCenter">
+   <item alignment="Qt::AlignLeft">
     <widget class="QCheckBox" name="cbShowIncomplete">
      <property name="text">
       <string>Show incomplete and/or corrupted messages</string>
      </property>
     </widget>
    </item>
+   <item alignment="Qt::AlignLeft">
+    <widget class="QCheckBox" name="cbUseExtendedAddressing">
+     <property name="text">
+      <string>Use extended addressing</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>