X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Fdecoder_output%2FQHexView.cpp;h=0fca4161fe02f6467799619a56862cb09db8b8c1;hb=13b726cda35835a120ade2d9cc1ab58770d4ef3f;hp=2c99ba97e99ae3f58cec314605e0874957735064;hpb=cbf428c209788f1c0860cc7a1247a279379db303;p=pulseview.git

diff --git a/pv/views/decoder_output/QHexView.cpp b/pv/views/decoder_output/QHexView.cpp
index 2c99ba97..0fca4161 100644
--- a/pv/views/decoder_output/QHexView.cpp
+++ b/pv/views/decoder_output/QHexView.cpp
@@ -29,6 +29,7 @@
 
 #include <QApplication>
 #include <QClipboard>
+#include <QDebug>
 #include <QFont>
 #include <QKeyEvent>
 #include <QScrollBar>
@@ -90,9 +91,11 @@ void QHexView::setData(const DecodeBinaryClass* data)
 {
 	data_ = data;
 
-	data_size_ = 0;
-	for (const DecodeBinaryDataChunk& chunk : data_->chunks)
-		data_size_ += chunk.data.size();
+	size_t size = 0;
+	size_t chunks = data_->chunks.size();
+	for (size_t i = 0; i < chunks; i++)
+		size += data_->chunks[i].data.size();
+	data_size_ = size;
 
 	viewport()->update();
 }
@@ -118,22 +121,47 @@ void QHexView::showFromOffset(size_t offset)
 	viewport()->update();
 }
 
+QSizePolicy QHexView::sizePolicy() const
+{
+	return QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+}
+
+pair<size_t, size_t> QHexView::get_selection() const
+{
+	size_t start = selectBegin_ / 2;
+	size_t end = selectEnd_ / 2;
+
+	if (start == end) {
+		// Nothing is currently selected
+		start = 0;
+		end = data_size_;
+	} else
+		end++;
+
+	return std::make_pair(start, end);
+}
+
 void QHexView::initialize_byte_iterator(size_t offset)
 {
 	current_chunk_id_ = 0;
 	current_chunk_offset_ = 0;
 	current_offset_ = offset;
 
-	for (const DecodeBinaryDataChunk& chunk : data_->chunks)
-		if (offset >= chunk.data.size()) {
+	size_t chunks = data_->chunks.size();
+	for (size_t i = 0; i < chunks; i++) {
+		size_t size = data_->chunks[i].data.size();
+
+		if (offset >= size) {
 			current_chunk_id_++;
-			offset -= chunk.data.size();
+			offset -= size;
 		} else {
 			current_chunk_offset_ = offset;
 			break;
 		}
+	}
 
-	current_chunk_ = &(data_->chunks[current_chunk_id_]);
+	if (current_chunk_id_ < data_->chunks.size())
+		current_chunk_ = data_->chunks[current_chunk_id_];
 }
 
 uint8_t QHexView::get_next_byte(bool* is_next_chunk)
@@ -141,15 +169,23 @@ uint8_t QHexView::get_next_byte(bool* is_next_chunk)
 	if (is_next_chunk != nullptr)
 		*is_next_chunk = (current_chunk_offset_ == 0);
 
-	uint8_t v = current_chunk_->data[current_chunk_offset_];
+	uint8_t v = 0;
+	if (current_chunk_offset_ < current_chunk_.data.size())
+		v = current_chunk_.data[current_chunk_offset_];
 
 	current_offset_++;
 	current_chunk_offset_++;
 
-	if (current_chunk_offset_ == current_chunk_->data.size()) {
+	if (current_offset_ > data_size_) {
+		qWarning() << "QHexView::get_next_byte() overran binary data boundary:" <<
+			current_offset_ << "of" << data_size_ << "bytes";
+		return 0xEE;
+	}
+
+	if ((current_chunk_offset_ == current_chunk_.data.size()) && (current_offset_ < data_size_)) {
 		current_chunk_id_++;
 		current_chunk_offset_ = 0;
-		current_chunk_ = &(data_->chunks[current_chunk_id_]);
+		current_chunk_ = data_->chunks[current_chunk_id_];
 	}
 
 	return v;
@@ -157,10 +193,12 @@ uint8_t QHexView::get_next_byte(bool* is_next_chunk)
 
 QSize QHexView::getFullSize() const
 {
-	size_t width = posAscii_ + (BYTES_PER_LINE * charWidth_) +
-		GAP_ASCII_SLIDER + verticalScrollBar()->width();
+	size_t width = posAscii_ + (BYTES_PER_LINE * charWidth_);
+
+	if (verticalScrollBar()->isEnabled())
+		width += GAP_ASCII_SLIDER + verticalScrollBar()->width();
 
-	if (!data_)
+	if (!data_ || (data_size_ == 0))
 		return QSize(width, 0);
 
 	size_t height = data_size_ / BYTES_PER_LINE;
@@ -183,8 +221,13 @@ void QHexView::paintEvent(QPaintEvent *event)
 	setMaximumWidth(widgetSize.width());
 	QSize areaSize = viewport()->size();
 
-	verticalScrollBar()->setPageStep(areaSize.height() / charHeight_);
-	verticalScrollBar()->setRange(0, (widgetSize.height() - areaSize.height()) / charHeight_ + 1);
+	// Only show scrollbar if the content goes beyond the visible area
+	if (widgetSize.height() > areaSize.height()) {
+		verticalScrollBar()->setEnabled(true);
+		verticalScrollBar()->setPageStep(areaSize.height() / charHeight_);
+		verticalScrollBar()->setRange(0, ((widgetSize.height() - areaSize.height())) / charHeight_ + 1);
+	} else
+		verticalScrollBar()->setEnabled(false);
 
 	// Fill widget background
 	painter.fillRect(event->rect(), palette().color(QPalette::Base));