From: Soeren Apel Date: Sun, 8 Dec 2019 17:34:52 +0000 (+0100) Subject: Connect DecodeSignal and DecoderOutputView X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=4b97fe09c7815411483d4682d62572092d70f8a6;p=pulseview.git Connect DecodeSignal and DecoderOutputView --- diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index 2f149145..c497b862 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -567,10 +567,13 @@ void DecodeSignal::get_binary_data_chunks_merged(uint32_t segment_id, // Determine overall size before copying to resize dest vector only once uint64_t size = 0; + int matches = 0; for (const DecodeBinaryData& d : segment->binary_data) - if ((d.sample >= start_sample) && (d.sample < end_sample)) + if ((d.sample >= start_sample) && (d.sample < end_sample)) { size += d.data.size(); - dest->reserve(size); + matches++; + } + dest->resize(size); uint64_t index = 0; for (const DecodeBinaryData& d : segment->binary_data) @@ -1371,7 +1374,7 @@ void DecodeSignal::binary_callback(srd_proto_data *pdata, void *decode_signal) DecodeBinaryData* bin_data = &(segment->binary_data.back()); bin_data->sample = pdata->start_sample; - bin_data->data.reserve(pdb->size); + bin_data->data.resize(pdb->size); memcpy(bin_data->data.data(), pdb->data, pdb->size); ds->new_binary_data(ds->current_segment_id_); diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp index cd0f6faa..6162a20e 100644 --- a/pv/data/decodesignal.hpp +++ b/pv/data/decodesignal.hpp @@ -205,7 +205,7 @@ private: Q_SIGNALS: void new_annotations(); // TODO Supply segment for which they belong to - void new_binary_data(uint32_t segment_id); + void new_binary_data(unsigned int segment_id); void decode_reset(); void decode_finished(); void channels_updated(); diff --git a/pv/views/decoder_output/QHexView.cpp b/pv/views/decoder_output/QHexView.cpp index 2289a07d..53120ce0 100644 --- a/pv/views/decoder_output/QHexView.cpp +++ b/pv/views/decoder_output/QHexView.cpp @@ -79,12 +79,16 @@ void QHexView::showFromOffset(size_t offset) int cursorY = cursorPos_ / (2 * BYTES_PER_LINE); verticalScrollBar() -> setValue(cursorY); } + + viewport()->update(); } void QHexView::clear() { verticalScrollBar()->setValue(0); data_ = nullptr; + + viewport()->update(); } QSize QHexView::getFullSize() const @@ -121,7 +125,7 @@ void QHexView::paintEvent(QPaintEvent *event) // Fill widget background painter.fillRect(event->rect(), palette().color(QPalette::Base)); - if (!data_) { + 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; diff --git a/pv/views/decoder_output/view.cpp b/pv/views/decoder_output/view.cpp index 5c3b031d..0eda5659 100644 --- a/pv/views/decoder_output/view.cpp +++ b/pv/views/decoder_output/view.cpp @@ -17,23 +17,29 @@ * along with this program; if not, see . */ -#include +#include +#include +#include #include #include #include #include +#include + #include "view.hpp" #include "QHexView.hpp" #include "pv/session.hpp" #include "pv/util.hpp" +using pv::data::DecodeSignal; using pv::data::SignalBase; using pv::util::TimeUnit; using pv::util::Timestamp; +using std::numeric_limits; using std::shared_ptr; namespace pv { @@ -47,7 +53,9 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) : signal_selector_(new QComboBox()), format_selector_(new QComboBox()), stacked_widget_(new QStackedWidget()), - hex_view_(new QHexView()) + hex_view_(new QHexView()), + signal_(nullptr), + merged_data_(new QByteArray()) { QVBoxLayout *root_layout = new QVBoxLayout(this); root_layout->setContentsMargins(0, 0, 0, 0); @@ -70,6 +78,12 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) : // Add widget stack root_layout->addWidget(stacked_widget_); stacked_widget_->addWidget(hex_view_); + stacked_widget_->setCurrentIndex(0); + + connect(signal_selector_, SIGNAL(currentIndexChanged(int)), + this, SLOT(on_selected_signal_changed(int))); + + hex_view_->setData(merged_data_); reset_view_state(); } @@ -91,12 +105,14 @@ void View::reset_view_state() void View::clear_signals() { ViewBase::clear_signalbases(); + signal_ = nullptr; } void View::clear_decode_signals() { signal_selector_->clear(); format_selector_->setCurrentIndex(0); + signal_ = nullptr; } void View::add_decode_signal(shared_ptr signal) @@ -104,15 +120,20 @@ void View::add_decode_signal(shared_ptr signal) connect(signal.get(), SIGNAL(name_changed(const QString&)), this, SLOT(on_signal_name_changed(const QString&))); - signal_selector_->addItem(signal->name(), QVariant::fromValue(signal.get())); + signal_selector_->addItem(signal->name(), QVariant::fromValue((void*)signal.get())); } void View::remove_decode_signal(shared_ptr signal) { - int index = signal_selector_->findData(QVariant::fromValue(signal.get())); + int index = signal_selector_->findData(QVariant::fromValue((void*)signal.get())); if (index != -1) signal_selector_->removeItem(index); + + if (signal.get() == signal_) { + signal_ = nullptr; + update_data(); + } } void View::save_settings(QSettings &settings) const @@ -127,6 +148,39 @@ void View::restore_settings(QSettings &settings) (void)settings; } +void View::update_data() +{ + if (!signal_) { + merged_data_->clear(); + return; + } + + if (signal_->get_binary_data_chunk_count(current_segment_) == 0) { + merged_data_->clear(); + return; + } + + vector data; + signal_->get_binary_data_chunks_merged(current_segment_, 0, + numeric_limits::max(), &data); + + merged_data_->resize(data.size()); + memcpy(merged_data_->data(), data.data(), data.size()); +} + +void View::on_selected_signal_changed(int index) +{ + if (signal_) + disconnect(signal_, SIGNAL(new_binary_data(unsigned int))); + + signal_ = (DecodeSignal*)signal_selector_->itemData(index).value(); + update_data(); + + if (signal_) + connect(signal_, SIGNAL(new_binary_data(unsigned int)), + this, SLOT(on_new_binary_data(unsigned int))); +} + void View::on_signal_name_changed(const QString &name) { SignalBase *sb = qobject_cast(QObject::sender()); @@ -137,6 +191,12 @@ void View::on_signal_name_changed(const QString &name) signal_selector_->setItemText(index, name); } +void View::on_new_binary_data(unsigned int segment_id) +{ + if (segment_id == current_segment_) + update_data(); +} + } // namespace decoder_output } // namespace views } // namespace pv diff --git a/pv/views/decoder_output/view.hpp b/pv/views/decoder_output/view.hpp index ff636e03..9f86cfae 100644 --- a/pv/views/decoder_output/view.hpp +++ b/pv/views/decoder_output/view.hpp @@ -24,6 +24,7 @@ #include #include +#include #include "QHexView.hpp" @@ -61,13 +62,22 @@ public: virtual void save_settings(QSettings &settings) const; virtual void restore_settings(QSettings &settings); +private: + void update_data(); + private Q_SLOTS: + void on_selected_signal_changed(int index); void on_signal_name_changed(const QString &name); + void on_new_binary_data(unsigned int segment_id); private: QComboBox *signal_selector_, *format_selector_; QStackedWidget *stacked_widget_; QHexView *hex_view_; + + data::DecodeSignal *signal_; + + QByteArray *merged_data_; }; } // namespace decoder_output