X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Fdecoder_output%2Fview.cpp;h=18cb3b449726ad19e953624d334d3f3e4fb17460;hb=6961eab0d4bf976cee015afacfa7c25795e574b9;hp=d407747605e8f03a8ec9948bb5ac0a8d7af7b545;hpb=bdbc561f1ac395449f1b3afa7d2d0538dd1aa400;p=pulseview.git

diff --git a/pv/views/decoder_output/view.cpp b/pv/views/decoder_output/view.cpp
index d4077476..18cb3b44 100644
--- a/pv/views/decoder_output/view.cpp
+++ b/pv/views/decoder_output/view.cpp
@@ -17,22 +17,32 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libsigrokdecode/libsigrokdecode.h>
+#include <climits>
 
+#include <QByteArray>
+#include <QDebug>
 #include <QLabel>
 #include <QMenu>
 #include <QToolBar>
 #include <QVBoxLayout>
 
+#include <libsigrokdecode/libsigrokdecode.h>
+
 #include "view.hpp"
+#include "QHexView.hpp"
 
 #include "pv/session.hpp"
 #include "pv/util.hpp"
+#include "pv/data/decode/decoder.hpp"
 
+using pv::data::DecodeSignal;
 using pv::data::SignalBase;
+using pv::data::decode::Decoder;
 using pv::util::TimeUnit;
 using pv::util::Timestamp;
 
+using std::dynamic_pointer_cast;
+using std::numeric_limits;
 using std::shared_ptr;
 
 namespace pv {
@@ -43,7 +53,13 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) :
 	ViewBase(session, is_main_view, parent),
 
 	// Note: Place defaults in View::reset_view_state(), not here
-	signal_selector_(new QComboBox())
+	parent_(parent),
+	decoder_selector_(new QComboBox()),
+	format_selector_(new QComboBox()),
+	class_selector_(new QComboBox()),
+	stacked_widget_(new QStackedWidget()),
+	hex_view_(new QHexView()),
+	signal_(nullptr)
 {
 	QVBoxLayout *root_layout = new QVBoxLayout(this);
 	root_layout->setContentsMargins(0, 0, 0, 0);
@@ -55,7 +71,30 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) :
 
 	// Populate toolbar
 	toolbar->addWidget(new QLabel(tr("Decoder:")));
-	toolbar->addWidget(signal_selector_);
+	toolbar->addWidget(decoder_selector_);
+	toolbar->addWidget(class_selector_);
+	toolbar->addSeparator();
+	toolbar->addWidget(new QLabel(tr("Show data as")));
+	toolbar->addWidget(format_selector_);
+
+	// Add format types
+	format_selector_->addItem(tr("Hexdump"), qVariantFromValue(QString("text/hexdump")));
+
+	// Add widget stack
+	root_layout->addWidget(stacked_widget_);
+	stacked_widget_->addWidget(hex_view_);
+	stacked_widget_->setCurrentIndex(0);
+
+	connect(decoder_selector_, SIGNAL(currentIndexChanged(int)),
+		this, SLOT(on_selected_decoder_changed(int)));
+	connect(class_selector_, SIGNAL(currentIndexChanged(int)),
+		this, SLOT(on_selected_class_changed(int)));
+
+	// Configure widgets
+	decoder_selector_->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+	class_selector_->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+
+	parent->setSizePolicy(hex_view_->sizePolicy()); // TODO Must be updated when selected widget changes
 
 	reset_view_state();
 }
@@ -77,27 +116,65 @@ void View::reset_view_state()
 void View::clear_signals()
 {
 	ViewBase::clear_signalbases();
+	signal_ = nullptr;
 }
 
 void View::clear_decode_signals()
 {
-	signal_selector_->clear();
+	ViewBase::clear_decode_signals();
+
+	decoder_selector_->clear();
+	class_selector_->clear();
+	format_selector_->setCurrentIndex(0);
+	signal_ = nullptr;
 }
 
 void View::add_decode_signal(shared_ptr<data::DecodeSignal> signal)
 {
+	ViewBase::add_decode_signal(signal);
+
 	connect(signal.get(), SIGNAL(name_changed(const QString&)),
 		this, SLOT(on_signal_name_changed(const QString&)));
+	connect(signal.get(), SIGNAL(decoder_stacked(void*)),
+		this, SLOT(on_decoder_stacked(void*)));
+	connect(signal.get(), SIGNAL(decoder_removed(void*)),
+		this, SLOT(on_decoder_removed(void*)));
 
-	signal_selector_->addItem(signal->name(), qVariantFromValue(signal.get()));
+	// Add all decoders provided by this signal
+	auto stack = signal->decoder_stack();
+	if (stack.size() > 1) {
+		for (const shared_ptr<Decoder>& dec : stack)
+			// Only add the decoder if it has binary output
+			if (dec->get_binary_class_count() > 0) {
+				QString title = QString("%1 (%2)").arg(signal->name(), dec->name());
+				decoder_selector_->addItem(title, QVariant::fromValue((void*)dec.get()));
+			}
+	} else
+		if (!stack.empty()) {
+			shared_ptr<Decoder>& dec = stack.at(0);
+			if (dec->get_binary_class_count() > 0)
+				decoder_selector_->addItem(signal->name(), QVariant::fromValue((void*)dec.get()));
+		}
 }
 
 void View::remove_decode_signal(shared_ptr<data::DecodeSignal> signal)
 {
-	int index = signal_selector_->findData(qVariantFromValue(signal.get()));
+	// Remove all decoders provided by this signal
+	for (const shared_ptr<Decoder>& dec : signal->decoder_stack()) {
+		int index = decoder_selector_->findData(QVariant::fromValue((void*)dec.get()));
 
-	if (index != -1)
-		signal_selector_->removeItem(index);
+		if (index != -1)
+			decoder_selector_->removeItem(index);
+	}
+
+	ViewBase::remove_decode_signal(signal);
+
+	if (signal.get() == signal_) {
+		signal_ = nullptr;
+		decoder_ = nullptr;
+		bin_class_id_ = 0;
+		update_data();
+	}
 }
 
 void View::save_settings(QSettings &settings) const
@@ -112,16 +189,142 @@ void View::restore_settings(QSettings &settings)
 	(void)settings;
 }
 
+void View::update_data()
+{
+	if (!signal_) {
+		hex_view_->clear();
+		return;
+	}
+
+	if (signal_->get_binary_data_chunk_count(current_segment_, decoder_, bin_class_id_) == 0) {
+		hex_view_->clear();
+		return;
+	}
+
+	const DecodeBinaryClass* bin_class =
+		signal_->get_binary_data_class(current_segment_, decoder_, bin_class_id_);
+
+	hex_view_->setData(bin_class);
+}
+
+void View::on_selected_decoder_changed(int index)
+{
+	if (signal_)
+		disconnect(signal_, SIGNAL(new_binary_data(unsigned int, void*, unsigned int)));
+
+	decoder_ = (Decoder*)decoder_selector_->itemData(index).value<void*>();
+
+	// Find the signal that contains the selected decoder
+	signal_ = nullptr;
+
+	for (const shared_ptr<DecodeSignal>& ds : decode_signals_)
+		for (const shared_ptr<Decoder>& dec : ds->decoder_stack())
+			if (decoder_ == dec.get())
+				signal_ = ds.get();
+
+	class_selector_->clear();
+
+	if (signal_) {
+		// Populate binary class selector
+		uint32_t bin_classes = decoder_->get_binary_class_count();
+		for (uint32_t i = 0; i < bin_classes; i++) {
+			const data::decode::DecodeBinaryClassInfo* class_info = decoder_->get_binary_class(i);
+			class_selector_->addItem(class_info->description, QVariant::fromValue(i));
+		}
+
+		connect(signal_, SIGNAL(new_binary_data(unsigned int, void*, unsigned int)),
+			this, SLOT(on_new_binary_data(unsigned int, void*, unsigned int)));
+	}
+
+	update_data();
+}
+
+void View::on_selected_class_changed(int index)
+{
+	bin_class_id_ = class_selector_->itemData(index).value<uint32_t>();
+
+	update_data();
+}
+
 void View::on_signal_name_changed(const QString &name)
 {
-	SignalBase *sb = qobject_cast<SignalBase*>(QObject::sender());
+	(void)name;
+
+	SignalBase* sb = qobject_cast<SignalBase*>(QObject::sender());
 	assert(sb);
 
-	int index = signal_selector_->findData(qVariantFromValue(sb));
+	DecodeSignal* signal = dynamic_cast<DecodeSignal*>(sb);
+	assert(signal);
+
+	// Update all decoder entries provided by this signal
+	auto stack = signal->decoder_stack();
+	if (stack.size() > 1) {
+		for (const shared_ptr<Decoder>& dec : stack) {
+			QString title = QString("%1 (%2)").arg(signal->name(), dec->name());
+			int index = decoder_selector_->findData(QVariant::fromValue((void*)dec.get()));
+
+			if (index != -1)
+				decoder_selector_->setItemText(index, title);
+		}
+	} else
+		if (!stack.empty()) {
+			shared_ptr<Decoder>& dec = stack.at(0);
+			int index = decoder_selector_->findData(QVariant::fromValue((void*)dec.get()));
+
+			if (index != -1)
+				decoder_selector_->setItemText(index, signal->name());
+		}
+}
+
+void View::on_new_binary_data(unsigned int segment_id, void* decoder, unsigned int bin_class_id)
+{
+	if ((segment_id == current_segment_) && (decoder == decoder_) && (bin_class_id == bin_class_id_))
+		if (!delayed_view_updater_.isActive())
+			delayed_view_updater_.start();
+}
+
+void View::on_decoder_stacked(void* decoder)
+{
+	// TODO This doesn't change existing entries for the same signal - but it should as the naming scheme may change
+
+	Decoder* d = static_cast<Decoder*>(decoder);
+
+	// Only add the decoder if it has binary output
+	if (d->get_binary_class_count() == 0)
+		return;
+
+	// Find the signal that contains the selected decoder
+	DecodeSignal* signal = nullptr;
+
+	for (const shared_ptr<DecodeSignal>& ds : decode_signals_)
+		for (const shared_ptr<Decoder>& dec : ds->decoder_stack())
+			if (d == dec.get())
+				signal = ds.get();
+
+	assert(signal);
+
+	// Add the decoder to the list
+	QString title = QString("%1 (%2)").arg(signal->name(), d->name());
+	decoder_selector_->addItem(title, QVariant::fromValue((void*)d));
+}
+
+void View::on_decoder_removed(void* decoder)
+{
+	Decoder* d = static_cast<Decoder*>(decoder);
+
+	// Remove the decoder from the list
+	int index = decoder_selector_->findData(QVariant::fromValue((void*)d));
+
 	if (index != -1)
-		signal_selector_->setItemText(index, name);
+		decoder_selector_->removeItem(index);
 }
 
+void View::perform_delayed_view_update()
+{
+	update_data();
+}
+
+
 } // namespace decoder_output
 } // namespace views
 } // namespace pv