Allow more than 256 binary output classes

[pulseview.git] / pv / views / decoder_output / view.cpp

diff --git a/pv/views/decoder_output/view.cpp b/pv/views/decoder_output/view.cpp
index 4480211ad3e29068c0b02e77720ad32fecc00fa7..d8bbb03a0cbf8fb6fda68252bae79852bbc0f4f0 100644 (file)
--- a/pv/views/decoder_output/view.cpp
+++ b/pv/views/decoder_output/view.cpp
@@ -58,8 +58,7 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) :
        class_selector_(new QComboBox()),
        stacked_widget_(new QStackedWidget()),
        hex_view_(new QHexView()),
-       signal_(nullptr),
-       merged_data_(new QByteArray())
+       signal_(nullptr)
 {
        QVBoxLayout *root_layout = new QVBoxLayout(this);
        root_layout->setContentsMargins(0, 0, 0, 0);
@@ -87,8 +86,12 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) :
 
        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)));
 
-       hex_view_->setData(merged_data_);
+       // Configure widgets
+       decoder_selector_->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+       class_selector_->setSizeAdjustPolicy(QComboBox::AdjustToContents);
 
        reset_view_state();
 }
@@ -118,6 +121,7 @@ void View::clear_decode_signals()
        ViewBase::clear_decode_signals();
 
        decoder_selector_->clear();
+       class_selector_->clear();
        format_selector_->setCurrentIndex(0);
        signal_ = nullptr;
 }
@@ -136,14 +140,17 @@ void View::add_decode_signal(shared_ptr<data::DecodeSignal> signal)
        // Add all decoders 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());
-                       decoder_selector_->addItem(title, QVariant::fromValue((void*)dec.get()));
-               }
+               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);
-                       decoder_selector_->addItem(signal->name(), QVariant::fromValue((void*)dec.get()));
+                       if (dec->get_binary_class_count() > 0)
+                               decoder_selector_->addItem(signal->name(), QVariant::fromValue((void*)dec.get()));
                }
 }
 
@@ -182,45 +189,56 @@ void View::restore_settings(QSettings &settings)
 void View::update_data()
 {
        if (!signal_) {
-               merged_data_->clear();
+               hex_view_->clear();
                return;
        }
 
        if (signal_->get_binary_data_chunk_count(current_segment_, decoder_, bin_class_id_) == 0) {
-               merged_data_->clear();
+               hex_view_->clear();
                return;
        }
 
-       vector<uint8_t> data;
-       signal_->get_binary_data_chunks_merged(current_segment_, decoder_, bin_class_id_,
-               0, numeric_limits<uint64_t>::max(), &data);
+       const DecodeBinaryClass* bin_class =
+               signal_->get_binary_data_class(current_segment_, decoder_, bin_class_id_);
 
-       merged_data_->resize(data.size());
-       memcpy(merged_data_->data(), data.data(), data.size());
+       hex_view_->setData(bin_class);
 }
 
 void View::on_selected_decoder_changed(int index)
 {
        if (signal_)
-               disconnect(signal_, SIGNAL(new_binary_data(unsigned int, unsigned int)));
+               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<data::SignalBase>& sb : signalbases_) {
-               shared_ptr<DecodeSignal> ds = dynamic_pointer_cast<DecodeSignal>(sb);
+       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->name, QVariant::fromValue(i));
+               }
 
-               if (ds)
-                       for (const shared_ptr<Decoder>& dec : ds->decoder_stack())
-                               if (decoder_ == dec.get())
-                                       signal_ = ds.get();
+               connect(signal_, SIGNAL(new_binary_data(unsigned int, void*, unsigned int)),
+                       this, SLOT(on_new_binary_data(unsigned int, void*, unsigned int)));
        }
 
-       if (signal_)
-               connect(signal_, SIGNAL(new_binary_data(unsigned int, unsigned int)),
-                       this, SLOT(on_new_binary_data(unsigned int, unsigned int)));
+       update_data();
+}
+
+void View::on_selected_class_changed(int index)
+{
+       bin_class_id_ = class_selector_->itemData(index).value<uint32_t>();
 
        update_data();
 }
@@ -255,9 +273,9 @@ void View::on_signal_name_changed(const QString &name)
                }
 }
 
-void View::on_new_binary_data(unsigned int segment_id, unsigned int bin_class_id)
+void View::on_new_binary_data(unsigned int segment_id, void* decoder, unsigned int bin_class_id)
 {
-       if ((segment_id == current_segment_) && (bin_class_id == bin_class_id_))
+       if ((segment_id == current_segment_) && (decoder == decoder_) && (bin_class_id == bin_class_id_))
                update_data();
 }
 
@@ -267,6 +285,10 @@ void View::on_decoder_stacked(void* decoder)
 
        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;