Rework decode sample count getters

[pulseview.git] / pv / data / decodesignal.cpp

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 6bc691abb5d49a29185a6b404c80bb88f22a548f..4061ef2760098ea32f810a98bd28e5535e35479f 100644 (file)
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -17,6 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 

+#include <limits>
+

 #include "logic.hpp"
 #include "logicsegment.hpp"
 #include "decodesignal.hpp"
 #include "logic.hpp"
 #include "logicsegment.hpp"
 #include "decodesignal.hpp"


@@ -29,6 +31,7 @@
 #include <pv/session.hpp>
 
 using std::make_shared;
 #include <pv/session.hpp>
 
 using std::make_shared;

+using std::min;

 using std::shared_ptr;
 using pv::data::decode::Decoder;
 using pv::data::decode::Row;
 using std::shared_ptr;
 using pv::data::decode::Decoder;
 using pv::data::decode::Row;


@@ -36,13 +39,16 @@ using pv::data::decode::Row;
 namespace pv {
 namespace data {
 
 namespace pv {
 namespace data {
 

-DecodeSignal::DecodeSignal(shared_ptr<pv::data::DecoderStack> decoder_stack) :
+DecodeSignal::DecodeSignal(shared_ptr<pv::data::DecoderStack> decoder_stack,
+       const unordered_set< shared_ptr<data::SignalBase> > &all_signals) :

        SignalBase(nullptr, SignalBase::DecodeChannel),
        SignalBase(nullptr, SignalBase::DecodeChannel),

-       decoder_stack_(decoder_stack)
+       decoder_stack_(decoder_stack),
+       all_signals_(all_signals)

 {
        set_name(QString::fromUtf8(decoder_stack_->stack().front()->decoder()->name));
 
        update_channel_list();
 {
        set_name(QString::fromUtf8(decoder_stack_->stack().front()->decoder()->name));
 
        update_channel_list();

+       auto_assign_signals();

 
        connect(decoder_stack_.get(), SIGNAL(new_annotations()),
                this, SLOT(on_new_annotations()));
 
        connect(decoder_stack_.get(), SIGNAL(new_annotations()),
                this, SLOT(on_new_annotations()));


@@ -72,7 +78,11 @@ void DecodeSignal::stack_decoder(srd_decoder *decoder)
        assert(decoder);
        assert(decoder_stack);
        decoder_stack_->push(make_shared<data::decode::Decoder>(decoder));
        assert(decoder);
        assert(decoder_stack);
        decoder_stack_->push(make_shared<data::decode::Decoder>(decoder));

+
+       // Include the newly created decode channels in the channel list

        update_channel_list();
        update_channel_list();

+
+       auto_assign_signals();

        decoder_stack_->begin_decode();
 }
 
        decoder_stack_->begin_decode();
 }
 


@@ -103,6 +113,11 @@ bool DecodeSignal::toggle_decoder_visibility(int index)
        return state;
 }
 
        return state;
 }
 

+void DecodeSignal::begin_decode()
+{
+       decoder_stack_->begin_decode();
+}
+

 QString DecodeSignal::error_message() const
 {
        return decoder_stack_->error_message();
 QString DecodeSignal::error_message() const
 {
        return decoder_stack_->error_message();


@@ -113,6 +128,19 @@ const list<data::DecodeChannel> DecodeSignal::get_channels() const
        return channels_;
 }
 
        return channels_;
 }
 

+void DecodeSignal::auto_assign_signals()
+{
+       // Try to auto-select channels that don't have signals assigned yet
+       for (data::DecodeChannel &ch : channels_) {
+               if (ch.assigned_signal)
+                       continue;
+
+               for (shared_ptr<data::SignalBase> s : all_signals_)
+                       if (s->logic_data() && (ch.name.toLower().contains(s->name().toLower())))
+                               ch.assigned_signal = s.get();
+       }
+}
+

 void DecodeSignal::assign_signal(const uint16_t channel_id, const SignalBase *signal)
 {
        for (data::DecodeChannel &ch : channels_)
 void DecodeSignal::assign_signal(const uint16_t channel_id, const SignalBase *signal)
 {
        for (data::DecodeChannel &ch : channels_)


@@ -135,6 +163,48 @@ void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int in
        decoder_stack_->begin_decode();
 }
 
        decoder_stack_->begin_decode();
 }
 

+double DecodeSignal::samplerate() const
+{
+       return decoder_stack_->samplerate();
+}
+
+const pv::util::Timestamp& DecodeSignal::start_time() const
+{
+       return decoder_stack_->start_time();
+}
+
+int64_t DecodeSignal::get_working_sample_count() const
+{
+       // The working sample count is the highest sample number for
+       // which all used signals have data available, so go through
+       // all channels and use the lowest overall sample count of the
+       // current segment
+
+       // TODO Currently, we assume only a single segment exists
+
+       int64_t count = std::numeric_limits<int64_t>::max();
+       bool no_signals_assigned = true;
+
+       for (const data::DecodeChannel &ch : channels_)
+               if (ch.assigned_signal) {
+                       no_signals_assigned = false;
+
+                       const shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
+                       if (!logic_data || logic_data->logic_segments().empty())
+                               return 0;
+
+                       const shared_ptr<LogicSegment> segment = logic_data->logic_segments().front();
+                       count = min(count, (int64_t)segment->get_sample_count());
+               }
+
+       return (no_signals_assigned ? 0 : count);
+}
+
+int64_t DecodeSignal::get_decoded_sample_count() const
+{
+       return decoder_stack_->samples_decoded();
+}
+

 vector<Row> DecodeSignal::visible_rows() const
 {
        return decoder_stack_->get_visible_rows();
 vector<Row> DecodeSignal::visible_rows() const
 {
        return decoder_stack_->get_visible_rows();