X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Fdecoder_output%2FQHexView.cpp;h=945e5ed3364bdabae1a6ae4ab7d5e8b8cbb02dd0;hb=628b45cc0ba7ac38ac6a003fedbbc746f15dd724;hp=b379026c1b16a74cf2169867e2852ac4ddfc31e9;hpb=560f837745f9779417b6984d3e6c838ae8451838;p=pulseview.git diff --git a/pv/views/decoder_output/QHexView.cpp b/pv/views/decoder_output/QHexView.cpp index b379026c..945e5ed3 100644 --- a/pv/views/decoder_output/QHexView.cpp +++ b/pv/views/decoder_output/QHexView.cpp @@ -38,34 +38,20 @@ #include "QHexView.hpp" -using std::size_t; - const unsigned int BYTES_PER_LINE = 16; const unsigned int HEXCHARS_IN_LINE = BYTES_PER_LINE * 3 - 1; const unsigned int GAP_ADR_HEX = 10; const unsigned int GAP_HEX_ASCII = 10; const unsigned int GAP_ASCII_SLIDER = 5; -DataStorageArray::DataStorageArray(const QByteArray &arr) -{ - data_ = arr; -} - -QByteArray DataStorageArray::getData(size_t position, size_t length) -{ - return data_.mid(position, length); -} - -size_t DataStorageArray::size() -{ - return data_.count(); -} - - QHexView::QHexView(QWidget *parent): QAbstractScrollArea(parent), - pdata_(nullptr) + mode_(ChunkedDataMode), + data_(nullptr), + selectBegin_(0), + selectEnd_(0), + cursorPos_(0) { setFont(QFont("Courier", 10)); @@ -80,50 +66,91 @@ QHexView::QHexView(QWidget *parent): setFocusPolicy(Qt::StrongFocus); } -QHexView::~QHexView() +void QHexView::setMode(Mode m) { - if (pdata_) - delete pdata_; + mode_ = m; + + // This is not expected to be set when data is showing, + // so we don't update the viewport here } -void QHexView::setData(DataStorage *pData) +void QHexView::setData(const DecodeBinaryClass* data) { - verticalScrollBar()->setValue(0); + data_ = data; + + data_size_ = 0; + for (const DecodeBinaryDataChunk& chunk : data_->chunks) + data_size_ += chunk.data.size(); + + viewport()->update(); +} - if (pdata_) - delete pdata_; +void QHexView::clear() +{ + verticalScrollBar()->setValue(0); + data_ = nullptr; + data_size_ = 0; - pdata_ = pData; - cursorPos_ = 0; - resetSelection(0); + viewport()->update(); } void QHexView::showFromOffset(size_t offset) { - if (pdata_ && (offset < pdata_->size())) { + if (data_ && (offset < data_size_)) { setCursorPos(offset * 2); int cursorY = cursorPos_ / (2 * BYTES_PER_LINE); verticalScrollBar() -> setValue(cursorY); } + + viewport()->update(); } -void QHexView::clear() +void QHexView::initialize_byte_iterator(size_t offset) { - verticalScrollBar()->setValue(0); + current_chunk_id_ = 0; + current_chunk_offset_ = 0; + + for (const DecodeBinaryDataChunk& chunk : data_->chunks) + if (offset >= chunk.data.size()) { + current_chunk_id_++; + offset -= chunk.data.size(); + } else { + current_chunk_offset_ = offset; + break; + } + + current_chunk_ = &(data_->chunks[current_chunk_id_]); } -QSize QHexView::getFullSize() const +uint8_t QHexView::get_next_byte(bool* is_next_chunk) { - if (!pdata_) - return QSize(0, 0); + if (is_next_chunk != nullptr) + *is_next_chunk = (current_chunk_offset_ == 0); + + uint8_t v = current_chunk_->data[current_chunk_offset_]; + current_chunk_offset_++; + if (current_chunk_offset_ == current_chunk_->data.size()) { + current_chunk_id_++; + current_chunk_offset_ = 0; + current_chunk_ = &(data_->chunks[current_chunk_id_]); + } + + return v; +} + +QSize QHexView::getFullSize() const +{ size_t width = posAscii_ + (BYTES_PER_LINE * charWidth_) + GAP_ASCII_SLIDER + verticalScrollBar()->width(); - size_t height = pdata_->size() / BYTES_PER_LINE; + if (!data_) + return QSize(width, 0); + + size_t height = data_size_ / BYTES_PER_LINE; - if (pdata_->size() % BYTES_PER_LINE) + if (data_size_ % BYTES_PER_LINE) height++; height *= charHeight_; @@ -133,31 +160,40 @@ QSize QHexView::getFullSize() const void QHexView::paintEvent(QPaintEvent *event) { - if (!pdata_) - return; - QPainter painter(viewport()); // Calculate and update the widget and paint area sizes - QSize areaSize = viewport()->size(); QSize widgetSize = getFullSize(); setMinimumWidth(widgetSize.width()); setMaximumWidth(widgetSize.width()); + QSize areaSize = viewport()->size(); verticalScrollBar()->setPageStep(areaSize.height() / charHeight_); verticalScrollBar()->setRange(0, (widgetSize.height() - areaSize.height()) / charHeight_ + 1); + // Fill widget background + painter.fillRect(event->rect(), palette().color(QPalette::Base)); + + if (!data_ || (data_size_ == 0)) { + painter.setPen(palette().color(QPalette::Text)); + QString s = tr("No data available"); + int x = (areaSize.width() - fontMetrics().boundingRect(s).width()) / 2; + int y = areaSize.height() / 2; + painter.drawText(x, y, s); + return; + } + + // Determine first/last line indices size_t firstLineIdx = verticalScrollBar()->value(); size_t lastLineIdx = firstLineIdx + areaSize.height() / charHeight_; - if (lastLineIdx > (pdata_->size() / BYTES_PER_LINE)) { - lastLineIdx = pdata_->size() / BYTES_PER_LINE; - if (pdata_->size() % BYTES_PER_LINE) + if (lastLineIdx > (data_size_ / BYTES_PER_LINE)) { + lastLineIdx = data_size_ / BYTES_PER_LINE; + if (data_size_ % BYTES_PER_LINE) lastLineIdx++; } - // Fill widget and address area backgrounds - painter.fillRect(event->rect(), palette().color(QPalette::Base)); + // Fill address area background painter.fillRect(QRect(posAddr_, event->rect().top(), posHex_ - (GAP_ADR_HEX / 2), height()), palette().color(QPalette::Window)); @@ -180,15 +216,15 @@ void QHexView::paintEvent(QPaintEvent *event) // Paint hex values QBrush regular = painter.brush(); QBrush selected = QBrush(palette().color(QPalette::Highlight)); - QByteArray data = pdata_->getData(firstLineIdx * BYTES_PER_LINE, (lastLineIdx - firstLineIdx) * BYTES_PER_LINE); + initialize_byte_iterator(firstLineIdx * BYTES_PER_LINE); yStart = charHeight_; for (size_t lineIdx = firstLineIdx, y = yStart; lineIdx < lastLineIdx; lineIdx++) { painter.setBackgroundMode(Qt::OpaqueMode); int x = posHex_; - for (size_t i = 0; i < BYTES_PER_LINE && ((lineIdx - firstLineIdx) * BYTES_PER_LINE + i) < (size_t)data.size(); i++) { + for (size_t i = 0; i < BYTES_PER_LINE && ((lineIdx - firstLineIdx) * BYTES_PER_LINE + i) < data_size_; i++) { size_t pos = (lineIdx * BYTES_PER_LINE + i) * 2; if ((pos >= selectBegin_) && (pos < selectEnd_)) { @@ -199,12 +235,15 @@ void QHexView::paintEvent(QPaintEvent *event) painter.setPen(palette().color(QPalette::Text)); } + // Fetch byte + uint8_t byte_value = get_next_byte(); + // First nibble - QString val = QString::number((data.at((lineIdx - firstLineIdx) * BYTES_PER_LINE + i) & 0xF0) >> 4, 16).toUpper(); + QString val = QString::number((byte_value & 0xF0) >> 4, 16).toUpper(); painter.drawText(x, y, val); // Second nibble - val = QString::number((data.at((lineIdx - firstLineIdx) * BYTES_PER_LINE + i) & 0xF), 16).toUpper(); + val = QString::number((byte_value & 0xF), 16).toUpper(); painter.drawText(x + charWidth_, y, val); x += 3 * charWidth_; @@ -214,12 +253,14 @@ void QHexView::paintEvent(QPaintEvent *event) } // Paint ASCII characters + initialize_byte_iterator(firstLineIdx * BYTES_PER_LINE); yStart = charHeight_; for (size_t lineIdx = firstLineIdx, y = yStart; lineIdx < lastLineIdx; lineIdx++) { int x = posAscii_; - for (size_t i = 0; ((lineIdx - firstLineIdx) * BYTES_PER_LINE + i) < (size_t)data.size() && (i < BYTES_PER_LINE); i++) { - char ch = data[(unsigned int)((lineIdx - firstLineIdx) * BYTES_PER_LINE + i)]; + for (size_t i = 0; ((lineIdx - firstLineIdx) * BYTES_PER_LINE + i) < data_size_ && (i < BYTES_PER_LINE); i++) { + // Fetch byte + uint8_t ch = get_next_byte(); if ((ch < 0x20) || (ch > 0x7E)) ch = '.'; @@ -299,8 +340,7 @@ void QHexView::keyPressEvent(QKeyEvent *event) setVisible = true; } if (event->matches(QKeySequence::MoveToEndOfDocument)) { - if (pdata_) - setCursorPos(pdata_->size() * 2); + setCursorPos(data_size_ * 2); resetSelection(cursorPos_); setVisible = true; } @@ -313,8 +353,7 @@ void QHexView::keyPressEvent(QKeyEvent *event) // Select commands if (event->matches(QKeySequence::SelectAll)) { resetSelection(0); - if (pdata_) - setSelection(2 * pdata_->size() + 1); + setSelection(2 * data_size_); setVisible = true; } if (event->matches(QKeySequence::SelectNextChar)) { @@ -367,52 +406,38 @@ void QHexView::keyPressEvent(QKeyEvent *event) setVisible = true; } if (event->matches(QKeySequence::SelectEndOfDocument)) { - int pos = 0; - if (pdata_) - pos = pdata_->size() * 2; + int pos = data_size_ * 2; setCursorPos(pos); setSelection(pos); setVisible = true; } if (event->matches(QKeySequence::SelectStartOfDocument)) { - int pos = 0; - setCursorPos(pos); - setSelection(pos); + setCursorPos(0); + setSelection(0); setVisible = true; } - if (event->matches(QKeySequence::Copy) && (pdata_)) { + if (event->matches(QKeySequence::Copy) && (data_)) { QString text; - int idx = 0; - int copyOffset = 0; - - QByteArray data = pdata_->getData(selectBegin_ / 2, (selectEnd_ - selectBegin_) / 2 + 1); - if (selectBegin_ % 2) { - text += QString::number((data.at((idx+1) / 2) & 0xF), 16); - text += " "; - idx++; - copyOffset = 1; - } - int selectedSize = selectEnd_ - selectBegin_; - while (idx < selectedSize) { - QString val = QString::number((data.at((copyOffset + idx) / 2) & 0xF0) >> 4, 16); - if ((idx + 1) < selectedSize) { - val += QString::number((data.at((copyOffset + idx) / 2) & 0xF), 16); - val += " "; - } - text += val; + initialize_byte_iterator(selectBegin_ / 2); - if ((idx/2) % BYTES_PER_LINE == (BYTES_PER_LINE - 1)) - text += "\n"; + size_t selectedSize = (selectEnd_ - selectBegin_ + 1) / 2; + for (size_t i = 0; i < selectedSize; i++) { + uint8_t byte_value = get_next_byte(); + + QString s = QString::number((byte_value & 0xF0) >> 4, 16).toUpper() + + QString::number((byte_value & 0xF), 16).toUpper() + " "; + text += s; - idx += 2; + if (i % BYTES_PER_LINE == (BYTES_PER_LINE - 1)) + text += "\n"; } QClipboard *clipboard = QApplication::clipboard(); - clipboard->setText(text); + clipboard->setText(text, QClipboard::Clipboard); if (clipboard->supportsSelection()) - clipboard->setText(text); + clipboard->setText(text, QClipboard::Selection); } if (setVisible) @@ -446,25 +471,27 @@ void QHexView::mousePressEvent(QMouseEvent *event) size_t QHexView::cursorPosFromMousePos(const QPoint &position) { - int pos = -1; + size_t pos = -1; if (((size_t)position.x() >= posHex_) && ((size_t)position.x() < (posHex_ + HEXCHARS_IN_LINE * charWidth_))) { // Note: We add 1.5 character widths so that selection across // byte gaps is smoother - int x = (position.x() + (1.5 * charWidth_ / 2) - posHex_) / charWidth_; + size_t x = (position.x() + (1.5 * charWidth_ / 2) - posHex_) / charWidth_; // Note: We allow only full bytes to be selected, not nibbles, // so we round to the nearest byte gap x = (2 * x + 1) / 3; - int firstLineIdx = verticalScrollBar()->value(); - int y = (position.y() / charHeight_) * 2 * BYTES_PER_LINE; + size_t firstLineIdx = verticalScrollBar()->value(); + size_t y = (position.y() / charHeight_) * 2 * BYTES_PER_LINE; pos = x + y + firstLineIdx * BYTES_PER_LINE * 2; } - return pos; + size_t max_pos = data_size_ * 2; + + return std::min(pos, max_pos); } void QHexView::resetSelection() @@ -502,15 +529,10 @@ void QHexView::setCursorPos(int position) if (position < 0) position = 0; - int maxPos = 0; - if (pdata_) { - maxPos = pdata_->size() * 2; - if (pdata_->size() % BYTES_PER_LINE) - maxPos++; - } + int max_pos = data_size_ * 2; - if (position > maxPos) - position = maxPos; + if (position > max_pos) + position = max_pos; cursorPos_ = position; } @@ -519,13 +541,14 @@ void QHexView::ensureVisible() { QSize areaSize = viewport()->size(); - int firstLineIdx = verticalScrollBar() -> value(); + int firstLineIdx = verticalScrollBar()->value(); int lastLineIdx = firstLineIdx + areaSize.height() / charHeight_; int cursorY = cursorPos_ / (2 * BYTES_PER_LINE); if (cursorY < firstLineIdx) - verticalScrollBar() -> setValue(cursorY); - else if(cursorY >= lastLineIdx) - verticalScrollBar() -> setValue(cursorY - areaSize.height() / charHeight_ + 1); + verticalScrollBar()->setValue(cursorY); + else + if(cursorY >= lastLineIdx) + verticalScrollBar()->setValue(cursorY - areaSize.height() / charHeight_ + 1); }