From: Soeren Apel <redacted>
Date: Fri, 14 Apr 2017 11:10:14 +0000 (+0200)
Subject: Rework decode sample count getters
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=0c5fe73e5b66bf31d2dcfa2b2846a86cd2fdf0c4

Rework decode sample count getters
---

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index a557e1c1..4061ef27 100644
--- 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/>.
  */
 
+#include <limits>
+
 #include "logic.hpp"
 #include "logicsegment.hpp"
 #include "decodesignal.hpp"
@@ -29,6 +31,7 @@
 #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;
@@ -160,29 +163,6 @@ void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int in
 	decoder_stack_->begin_decode();
 }
 
-int64_t DecodeSignal::sample_count() const
-{
-	shared_ptr<Logic> data;
-	shared_ptr<data::SignalBase> signalbase;
-
-	// We get the logic data of the first channel in the list.
-	// This works because we are currently assuming all
-	// LogicSignals have the same data/segment
-	for (const shared_ptr<Decoder> &dec : decoder_stack_->stack())
-		if (dec && !dec->channels().empty() &&
-			((signalbase = (*dec->channels().begin()).second)) &&
-			((data = signalbase->logic_data())))
-			break;
-
-	if (!data || data->logic_segments().empty())
-		return 0;
-
-	const shared_ptr<LogicSegment> segment = data->logic_segments().front();
-	assert(segment);
-
-	return (int64_t)segment->get_sample_count();
-}
-
 double DecodeSignal::samplerate() const
 {
 	return decoder_stack_->samplerate();
@@ -193,7 +173,34 @@ const pv::util::Timestamp& DecodeSignal::start_time() const
 	return decoder_stack_->start_time();
 }
 
-int64_t DecodeSignal::samples_decoded() const
+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();
 }
diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index cdd061a9..03b8d0af 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -88,8 +88,15 @@ public:
 
 	double samplerate() const;
 	const pv::util::Timestamp& start_time() const;
-	int64_t sample_count() const;
-	int64_t samples_decoded() const;
+
+	/**
+	 * Returns the number of samples that can be worked on,
+	 * i.e. the number of samples where samples are available
+	 * for all connected channels.
+	 */
+	int64_t get_working_sample_count() const;
+
+	int64_t get_decoded_sample_count() const;
 
 	vector<decode::Row> visible_rows() const;
 
diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index ee9b0ee2..ece5f36c 100644
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -600,11 +600,11 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, int right
 
 	double samples_per_pixel, pixels_offset;
 
-	const int64_t sample_count = decode_signal_->sample_count();
+	const int64_t sample_count = decode_signal_->get_working_sample_count();
 	if (sample_count == 0)
 		return;
 
-	const int64_t samples_decoded = decode_signal_->samples_decoded();
+	const int64_t samples_decoded = decode_signal_->get_decoded_sample_count();
 	if (sample_count == samples_decoded)
 		return;