Revert "A file instead of a read/write buffer."

This reverts commit a9f956a.

Author: bbogush

qt/buffer_table_model.cpp

@@ -10,13 +10,13 @@
 BufferTableModel::BufferTableModel(QObject *parent):
     QAbstractTableModel(parent)
 {
-    state.bufFilePos = 0;
-    state.fileSize = 0;
+    buf = nullptr;
+    bufSize = 0;
 }
 
 int BufferTableModel::rowCount(const QModelIndex & /*parent*/) const
 {
-    qint64 tableBufferSize = state.fileSize;
+    qint64 tableBufferSize = bufSize;
 
     // Limit buffer size to avoid memory overlows for large buffers
     if (tableBufferSize > TABLE_BUFFER_LIMIT)
@@ -34,42 +34,32 @@ QVariant BufferTableModel::data(const QModelIndex &index, int role) const
 {
     QString hexString;
     QChar decodedChar;
-    qint64 start, end;
+    uint32_t start, end;
 
     if (role == Qt::DisplayRole)
     {
         switch (index.column())
         {
         case HEADER_ADDRESS_COL:
-            return QString("%1").arg(index.row() * ROW_DATA_SIZE, 10, 16,
+            return QString("%1").arg(index.row() * ROW_DATA_SIZE, 8, 16,
                 QChar('0'));
         case HEADER_HEX_COL:
             start = static_cast<uint32_t>(index.row()) * ROW_DATA_SIZE;
             end = start + ROW_DATA_SIZE;
 
-            if ((sPtr->bufFilePos > start) || ((sPtr->bufFilePos + BUF_SIZE) < end))
+            for (uint32_t i = start; i < end && i < bufSize; i++)
             {
-                sPtr->bufFilePos = start - (BUF_SIZE / 2);
-                if (sPtr->bufFilePos < 0)
-                    sPtr->bufFilePos = 0;
-
-                sPtr->file.seek(sPtr->bufFilePos);
-                sPtr->file.read((char *)sPtr->buf, BUF_SIZE);
-            }
-
-            for (qint64 i = start; i < end && i < state.fileSize; i++)
-            {
-                hexString.append(QString("%1 ").arg(sPtr->buf[i - sPtr->bufFilePos], 2, 16,
+                hexString.append(QString("%1 ").arg(buf[i], 2, 16,
                     QChar('0')));
             }
             return hexString;
         case HEADER_ASCII_COL:
             start = static_cast<uint32_t>(index.row()) * ROW_DATA_SIZE;
             end = start + ROW_DATA_SIZE;
 
-            for (qint64 i = start; i < end && i < state.fileSize; i++)
+            for (uint32_t i = start; i < end && i < bufSize; i++)
             {
-                decodedChar = QChar(state.buf[i - state.bufFilePos]);
+                decodedChar = QChar(buf[i]);
                 if (!decodedChar.isPrint())
                     decodedChar = QChar('.');
                 hexString.append(decodedChar);
@@ -103,25 +93,16 @@ QVariant BufferTableModel::headerData(int section, Qt::Orientation orientation,
     return QVariant();
 }
 
-void BufferTableModel::setFile(QString filePath)
+void BufferTableModel::setBuffer(uint8_t *buffer, uint32_t size)
 {
     beginResetModel();
-    state.file.close();
-    if (!filePath.isEmpty())
-    {
-        state.bufFilePos = 0;
-        state.fileSize = 0;
-    }
-    state.file.setFileName(filePath);
-    if (state.file.open(QIODevice::ReadOnly))
-    {
-        state.fileSize = state.file.size();
-        state.bufFilePos = INT64_MAX;
-    }
-    else
-    {
-        state.bufFilePos = 0;
-        state.fileSize = 0;
-    }
+    buf = buffer;
+    bufSize = size;
     endResetModel();
 }
+
+void BufferTableModel::getBuffer(uint8_t *&buffer, uint32_t &size)
+{
+    buffer = buf;
+    size = bufSize;
+}

qt/buffer_table_model.h

@@ -7,29 +7,19 @@
 #define BUFFER_TABLE_MODEL_H
 
 #include <QAbstractTableModel>
-#include <QFile>
 
 #define HEADER_ADDRESS_COL 0
 #define HEADER_HEX_COL 1
 #define HEADER_ASCII_COL 2
 
 #define ROW_DATA_SIZE 16
-#define BUF_SIZE 4000
 
 class BufferTableModel: public QAbstractTableModel
 {
     Q_OBJECT
 
-    typedef struct
-    {
-         uint8_t buf[BUF_SIZE];
-         qint64 fileSize;
-         qint64 bufFilePos;
-         QFile file;
-    } BufferModelState;
-
-    BufferModelState state;
-    BufferModelState *sPtr = &state;
+    uint8_t *buf;
+    uint32_t bufSize;
 
 public:
     BufferTableModel(QObject *parent = nullptr);
@@ -40,8 +30,8 @@ class BufferTableModel: public QAbstractTableModel
         const override;
     QVariant headerData(int section, Qt::Orientation orientation, int role)
         const override;
-    void setFile(QString filePath);
-
+    void setBuffer(uint8_t *buffer, uint32_t size);
+    void getBuffer(uint8_t *&buffer, uint32_t &size);
 };
 
 #endif // BUFFER_TABLE_MODEL_H