From ed84e7e9f8ea342577a3a01e33f56041ae39ca63 Mon Sep 17 00:00:00 2001
From: Collin Kidder <collink@kkmfg.com>
Date: Tue, 21 Jun 2022 21:12:22 -0400
Subject: [PATCH] Fix to sniffer when viewing bits, output formatting change
 for ID

---
 re/sniffer/SnifferDelegate.cpp | 8 ++++----
 re/sniffer/sniffermodel.cpp    | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/re/sniffer/SnifferDelegate.cpp b/re/sniffer/SnifferDelegate.cpp
index 34cdd5e..9f11431 100644
--- a/re/sniffer/SnifferDelegate.cpp
+++ b/re/sniffer/SnifferDelegate.cpp
@@ -43,17 +43,17 @@ void SnifferDelegate::paint(QPainter *painter, const QStyleOptionViewItem &optio
 {
     //qDebug() << "SnifferDelegate Paint Event";
 
-    if (index.column() < 2) //allow default handling of the first two columns
+    if (index.column() < 3) //allow default handling of the first two columns
     {
         QItemDelegate::paint(painter, option, index);
         return;
     }
 
-    if (index.column() > 9) return;
+    if (index.column() > 10) return;
 
     int x;
     SnifferItem *item = static_cast<SnifferItem*>(index.internalPointer());
-    int idx = index.column() - 2;
+    int idx = index.column() - 3;
     int val = item->getData(idx);
     int prevVal = item->getLastData(idx);
     int notchPattern = item->getNotchPattern(idx);
@@ -70,7 +70,7 @@ void SnifferDelegate::paint(QPainter *painter, const QStyleOptionViewItem &optio
     //qDebug() << "XSpan" << xSpan << " YSpan " << ySpan;
 
     int xSector = xSpan / 8;
-    int v = item->getSeqInterval(index.column() - 2) * 10;
+    int v = item->getSeqInterval(index.column() - 3) * 10;
     if (v > 225) v = 225;
     if (v < 0) v = 0;
 
diff --git a/re/sniffer/sniffermodel.cpp b/re/sniffer/sniffermodel.cpp
index 01d1353..55736b4 100644
--- a/re/sniffer/sniffermodel.cpp
+++ b/re/sniffer/sniffermodel.cpp
@@ -66,9 +66,10 @@ QVariant SnifferModel::data(const QModelIndex &index, int role) const
                 case tc::DELTA:
                     return QString::number(item->getDelta(), 'f');
                 case tc::FREQUENCY:
+                    if (item->getDelta() == 0) return QString("0 hz");
                     return QString("%1 hz").arg(qRound(1.00 / item->getDelta()));
                 case tc::ID:
-                    return "0x" + QString("%1").arg(item->getId(), 5, 16, QLatin1Char(' ')).toUpper();
+                    return "0x" + QString("%1").arg(item->getId(), 5, 16, QLatin1Char('0')).toUpper();
                 default:
                     break;
             }
@@ -272,7 +273,7 @@ void SnifferModel::refresh()
     }
     else
         /* refresh data */
-        dataChanged(createIndex(0, 0),
+        emit dataChanged(createIndex(0, 0),
                     createIndex(rowCount()-1, columnCount()-1), QVector<int>(Qt::DisplayRole));
 }