X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=e1091f110d398fd02095114a57862f060f120a8d;hp=e267885d8d214356d6e19692decf19cf7f56d796;hb=57e7e17efd833527069607595be0847080d0a6a2;hpb=c6d9cf6582589fd375e67579d42ee914ce6382a1

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index e267885d..e1091f11 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -26,11 +26,14 @@
 #include "signalbase.hpp"
 #include "signaldata.hpp"
 
+#include <QDebug>
+
 #include <pv/binding/decoder.hpp>
 #include <pv/session.hpp>
 
 using std::dynamic_pointer_cast;
 using std::make_shared;
+using std::out_of_range;
 using std::shared_ptr;
 using std::tie;
 using std::unique_lock;
@@ -38,19 +41,66 @@ using std::unique_lock;
 namespace pv {
 namespace data {
 
-const int SignalBase::ColourBGAlpha = 8 * 256 / 100;
+const int SignalBase::ColorBGAlpha = 8 * 256 / 100;
 const uint64_t SignalBase::ConversionBlockSize = 4096;
 const uint32_t SignalBase::ConversionDelay = 1000;  // 1 second
 
+
+SignalGroup::SignalGroup(const QString& name)
+{
+	name_ = name;
+}
+
+void SignalGroup::append_signal(shared_ptr<SignalBase> signal)
+{
+	if (!signal)
+		return;
+
+	signals_.push_back(signal);
+	signal->set_group(this);
+}
+
+void SignalGroup::remove_signal(shared_ptr<SignalBase> signal)
+{
+	if (!signal)
+		return;
+
+	signals_.erase(std::remove_if(signals_.begin(), signals_.end(),
+		[&](shared_ptr<SignalBase> s) { return s == signal; }),
+		signals_.end());
+}
+
+deque<shared_ptr<SignalBase>> SignalGroup::signals() const
+{
+	return signals_;
+}
+
+void SignalGroup::clear()
+{
+	for (shared_ptr<SignalBase> sb : signals_)
+		sb->set_group(nullptr);
+
+	signals_.clear();
+}
+
+const QString SignalGroup::name() const
+{
+	return name_;
+}
+
+
 SignalBase::SignalBase(shared_ptr<sigrok::Channel> channel, ChannelType channel_type) :
 	channel_(channel),
 	channel_type_(channel_type),
+	group_(nullptr),
 	conversion_type_(NoConversion),
 	min_value_(0),
 	max_value_(0)
 {
-	if (channel_)
+	if (channel_) {
 		internal_name_ = QString::fromStdString(channel_->name());
+		index_ = channel_->index();
+	}
 
 	connect(&delayed_conversion_starter_, SIGNAL(timeout()),
 		this, SLOT(on_delayed_conversion_start()));
@@ -68,26 +118,6 @@ shared_ptr<sigrok::Channel> SignalBase::channel() const
 	return channel_;
 }
 
-QString SignalBase::name() const
-{
-	return (channel_) ? QString::fromStdString(channel_->name()) : name_;
-}
-
-QString SignalBase::internal_name() const
-{
-	return internal_name_;
-}
-
-void SignalBase::set_name(QString name)
-{
-	if (channel_)
-		channel_->set_name(name.toUtf8().constData());
-
-	name_ = name;
-
-	name_changed(name);
-}
-
 bool SignalBase::enabled() const
 {
 	return (channel_) ? channel_->enabled() : true;
@@ -108,35 +138,83 @@ SignalBase::ChannelType SignalBase::type() const
 
 unsigned int SignalBase::index() const
 {
-	return (channel_) ? channel_->index() : 0;
+	return index_;
+}
+
+void SignalBase::set_index(unsigned int index)
+{
+	index_ = index;
 }
 
 unsigned int SignalBase::logic_bit_index() const
 {
 	if (channel_type_ == LogicChannel)
-		return channel_->index();
+		return index_;
 	else
 		return 0;
 }
 
-QColor SignalBase::colour() const
+void SignalBase::set_group(SignalGroup* group)
+{
+	group_ = group;
+}
+
+SignalGroup* SignalBase::group() const
 {
-	return colour_;
+	return group_;
 }
 
-void SignalBase::set_colour(QColor colour)
+QString SignalBase::name() const
 {
-	colour_ = colour;
+	return (channel_) ? QString::fromStdString(channel_->name()) : name_;
+}
 
-	bgcolour_ = colour;
-	bgcolour_.setAlpha(ColourBGAlpha);
+QString SignalBase::internal_name() const
+{
+	return internal_name_;
+}
 
-	colour_changed(colour);
+void SignalBase::set_internal_name(QString internal_name)
+{
+	internal_name_ = internal_name;
 }
 
-QColor SignalBase::bgcolour() const
+QString SignalBase::display_name() const
 {
-	return bgcolour_;
+	if ((name() != internal_name_) && (!internal_name_.isEmpty()))
+		return name() + " (" + internal_name_ + ")";
+	else
+		return name();
+}
+
+void SignalBase::set_name(QString name)
+{
+	if (channel_)
+		channel_->set_name(name.toUtf8().constData());
+
+	name_ = name;
+
+	name_changed(name);
+}
+
+QColor SignalBase::color() const
+{
+	return color_;
+}
+
+void SignalBase::set_color(QColor color)
+{
+	color_ = color;
+
+	bgcolor_ = color;
+	bgcolor_.setAlpha(ColorBGAlpha);
+
+	color_changed(color);
+}
+
+QColor SignalBase::bgcolor() const
+{
+	return bgcolor_;
 }
 
 void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
@@ -144,8 +222,8 @@ void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
 	if (data_) {
 		disconnect(data.get(), SIGNAL(samples_cleared()),
 			this, SLOT(on_samples_cleared()));
-		disconnect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
-			this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t)));
+		disconnect(data.get(), SIGNAL(samples_added(shared_ptr<Segment>, uint64_t, uint64_t)),
+			this, SLOT(on_samples_added(shared_ptr<Segment>, uint64_t, uint64_t)));
 
 		if (channel_type_ == AnalogChannel) {
 			shared_ptr<Analog> analog = analog_data();
@@ -161,8 +239,8 @@ void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
 	if (data_) {
 		connect(data.get(), SIGNAL(samples_cleared()),
 			this, SLOT(on_samples_cleared()));
-		connect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
-			this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t)));
+		connect(data.get(), SIGNAL(samples_added(SharedPtrToSegment, uint64_t, uint64_t)),
+			this, SLOT(on_samples_added(SharedPtrToSegment, uint64_t, uint64_t)));
 
 		if (channel_type_ == AnalogChannel) {
 			shared_ptr<Analog> analog = analog_data();
@@ -174,6 +252,15 @@ void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
 	}
 }
 
+void SignalBase::clear_sample_data()
+{
+	if (analog_data())
+		analog_data()->clear();
+
+	if (logic_data())
+		logic_data()->clear();
+}
+
 shared_ptr<data::Analog> SignalBase::analog_data() const
 {
 	shared_ptr<Analog> result = nullptr;
@@ -198,6 +285,82 @@ shared_ptr<data::Logic> SignalBase::logic_data() const
 	return result;
 }
 
+bool SignalBase::segment_is_complete(uint32_t segment_id) const
+{
+	bool result = true;
+
+	if (channel_type_ == AnalogChannel)
+	{
+		shared_ptr<Analog> data = dynamic_pointer_cast<Analog>(data_);
+		auto segments = data->analog_segments();
+		try {
+			result = segments.at(segment_id)->is_complete();
+		} catch (out_of_range&) {
+			// Do nothing
+		}
+	}
+
+	if (channel_type_ == LogicChannel)
+	{
+		shared_ptr<Logic> data = dynamic_pointer_cast<Logic>(data_);
+		auto segments = data->logic_segments();
+		try {
+			result = segments.at(segment_id)->is_complete();
+		} catch (out_of_range&) {
+			// Do nothing
+		}
+	}
+
+	return result;
+}
+
+bool SignalBase::has_samples() const
+{
+	bool result = false;
+
+	if (channel_type_ == AnalogChannel)
+	{
+		shared_ptr<Analog> data = dynamic_pointer_cast<Analog>(data_);
+		if (data) {
+			auto segments = data->analog_segments();
+			if ((segments.size() > 0) && (segments.front()->get_sample_count() > 0))
+				result = true;
+		}
+	}
+
+	if (channel_type_ == LogicChannel)
+	{
+		shared_ptr<Logic> data = dynamic_pointer_cast<Logic>(data_);
+		if (data) {
+			auto segments = data->logic_segments();
+			if ((segments.size() > 0) && (segments.front()->get_sample_count() > 0))
+				result = true;
+		}
+	}
+
+	return result;
+}
+
+double SignalBase::get_samplerate() const
+{
+	if (channel_type_ == AnalogChannel)
+	{
+		shared_ptr<Analog> data = dynamic_pointer_cast<Analog>(data_);
+		if (data)
+			return data->get_samplerate();
+	}
+
+	if (channel_type_ == LogicChannel)
+	{
+		shared_ptr<Logic> data = dynamic_pointer_cast<Logic>(data_);
+		if (data)
+			return data->get_samplerate();
+	}
+
+	// Default samplerate is 1 Hz
+	return 1.0;
+}
+
 SignalBase::ConversionType SignalBase::get_conversion_type() const
 {
 	return conversion_type_;
@@ -344,7 +507,7 @@ SignalBase::ConversionPreset SignalBase::get_current_conversion_preset() const
 	if (preset != conversion_options_.end())
 		return (ConversionPreset)((preset->second).toInt());
 
-	return NoPreset;
+	return DynamicPreset;
 }
 
 void SignalBase::set_conversion_preset(ConversionPreset id)
@@ -363,12 +526,12 @@ void SignalBase::save_settings(QSettings &settings) const
 {
 	settings.setValue("name", name());
 	settings.setValue("enabled", enabled());
-	settings.setValue("colour", colour());
+	settings.setValue("color", color().rgba());
 	settings.setValue("conversion_type", (int)conversion_type_);
 
 	settings.setValue("conv_options", (int)(conversion_options_.size()));
 	int i = 0;
-	for (auto kvp : conversion_options_) {
+	for (auto& kvp : conversion_options_) {
 		settings.setValue(QString("conv_option%1_key").arg(i), kvp.first);
 		settings.setValue(QString("conv_option%1_value").arg(i), kvp.second);
 		i++;
@@ -377,18 +540,41 @@ void SignalBase::save_settings(QSettings &settings) const
 
 void SignalBase::restore_settings(QSettings &settings)
 {
-	set_name(settings.value("name").toString());
-	set_enabled(settings.value("enabled").toBool());
-	set_colour(settings.value("colour").value<QColor>());
-	set_conversion_type((ConversionType)settings.value("conversion_type").toInt());
+	if (settings.contains("name"))
+		set_name(settings.value("name").toString());
+
+	if (settings.contains("enabled"))
+		set_enabled(settings.value("enabled").toBool());
+
+	if (settings.contains("color")) {
+		QVariant value = settings.value("color");
+
+		// Workaround for Qt QColor serialization bug on OSX
+		if ((QMetaType::Type)(value.type()) == QMetaType::QColor)
+			set_color(value.value<QColor>());
+		else
+			set_color(QColor::fromRgba(value.value<uint32_t>()));
+
+		// A color with an alpha value of 0 makes the signal marker invisible
+		if (color() == QColor(0, 0, 0, 0))
+			set_color(Qt::gray);
+	}
 
-	int conv_options = settings.value("conv_options").toInt();
+	if (settings.contains("conversion_type"))
+		set_conversion_type((ConversionType)settings.value("conversion_type").toInt());
+
+	int conv_options = 0;
+	if (settings.contains("conv_options"))
+		conv_options = settings.value("conv_options").toInt();
 
 	if (conv_options)
 		for (int i = 0; i < conv_options; i++) {
-			QString key = settings.value(QString("conv_option%1_key").arg(i)).toString();
-			QVariant value = settings.value(QString("conv_option%1_value").arg(i));
-			conversion_options_[key] = value;
+			const QString key_id = QString("conv_option%1_key").arg(i);
+			const QString value_id = QString("conv_option%1_value").arg(i);
+
+			if (settings.contains(key_id) && settings.contains(value_id))
+				conversion_options_[settings.value(key_id).toString()] =
+					settings.value(value_id);
 		}
 }
 
@@ -399,131 +585,201 @@ bool SignalBase::conversion_is_a2l() const
 		(conversion_type_ == A2LConversionBySchmittTrigger)));
 }
 
-void SignalBase::conversion_thread_proc(QObject* segment)
+void SignalBase::convert_single_segment_range(AnalogSegment *asegment,
+	LogicSegment *lsegment, uint64_t start_sample, uint64_t end_sample)
 {
-	// TODO Support for multiple segments is missing
+	if (end_sample > start_sample) {
+		tie(min_value_, max_value_) = asegment->get_min_max();
 
-	uint64_t start_sample, end_sample;
-	start_sample = end_sample = 0;
+		// Create sigrok::Analog instance
+		float *asamples = new float[ConversionBlockSize];
+		uint8_t *lsamples = new uint8_t[ConversionBlockSize];
 
-	do {
-		if (conversion_is_a2l()) {
+		vector<shared_ptr<sigrok::Channel> > channels;
+		channels.push_back(channel_);
+
+		vector<const sigrok::QuantityFlag*> mq_flags;
+		const sigrok::Quantity * const mq = sigrok::Quantity::VOLTAGE;
+		const sigrok::Unit * const unit = sigrok::Unit::VOLT;
+
+		shared_ptr<sigrok::Packet> packet =
+			Session::sr_context->create_analog_packet(channels,
+			asamples, ConversionBlockSize, mq, unit, mq_flags);
 
-			AnalogSegment *asegment = qobject_cast<AnalogSegment*>(segment);
+		shared_ptr<sigrok::Analog> analog =
+			dynamic_pointer_cast<sigrok::Analog>(packet->payload());
 
-			const shared_ptr<Logic> logic_data = dynamic_pointer_cast<Logic>(converted_data_);
+		// Convert
+		uint64_t i = start_sample;
 
-			// Create the initial logic data segment if needed
-			if (logic_data->segments().size() == 0) {
-				shared_ptr<LogicSegment> lsegment =
-					make_shared<LogicSegment>(*logic_data.get(), 1, asegment->samplerate());
-				logic_data->push_segment(lsegment);
+		if (conversion_type_ == A2LConversionByThreshold) {
+			const double threshold = get_conversion_thresholds()[0];
+
+			// Convert as many sample blocks as we can
+			while ((end_sample - i) > ConversionBlockSize) {
+				asegment->get_samples(i, i + ConversionBlockSize, asamples);
+
+				shared_ptr<sigrok::Logic> logic =
+					analog->get_logic_via_threshold(threshold, lsamples);
+
+				lsegment->append_payload(logic->data_pointer(), logic->data_length());
+				samples_added(lsegment->segment_id(), i, i + ConversionBlockSize);
+				i += ConversionBlockSize;
 			}
 
-			LogicSegment *lsegment = dynamic_cast<LogicSegment*>(logic_data->segments().front().get());
+			// Re-create sigrok::Analog and convert remaining samples
+			packet = Session::sr_context->create_analog_packet(channels,
+				asamples, end_sample - i, mq, unit, mq_flags);
 
-			start_sample = lsegment->get_sample_count();
-			end_sample = asegment->get_sample_count();
+			analog = dynamic_pointer_cast<sigrok::Analog>(packet->payload());
 
-			if (end_sample > start_sample) {
-				tie(min_value_, max_value_) = asegment->get_min_max();
+			asegment->get_samples(i, end_sample, asamples);
+			shared_ptr<sigrok::Logic> logic =
+				analog->get_logic_via_threshold(threshold, lsamples);
+			lsegment->append_payload(logic->data_pointer(), logic->data_length());
+			samples_added(lsegment->segment_id(), i, end_sample);
+		}
 
-				// Create sigrok::Analog instance
-				float *asamples = new float[ConversionBlockSize];
-				uint8_t *lsamples = new uint8_t[ConversionBlockSize];
+		if (conversion_type_ == A2LConversionBySchmittTrigger) {
+			const vector<double> thresholds = get_conversion_thresholds();
+			const double lo_thr = thresholds[0];
+			const double hi_thr = thresholds[1];
 
-				vector<shared_ptr<sigrok::Channel> > channels;
-				channels.push_back(channel_);
+			uint8_t state = 0;  // TODO Use value of logic sample n-1 instead of 0
 
-				vector<const sigrok::QuantityFlag*> mq_flags;
-				const sigrok::Quantity * const mq = sigrok::Quantity::VOLTAGE;
-				const sigrok::Unit * const unit = sigrok::Unit::VOLT;
+			// Convert as many sample blocks as we can
+			while ((end_sample - i) > ConversionBlockSize) {
+				asegment->get_samples(i, i + ConversionBlockSize, asamples);
 
-				shared_ptr<sigrok::Packet> packet =
-					Session::sr_context->create_analog_packet(channels,
-					asamples, ConversionBlockSize, mq, unit, mq_flags);
+				shared_ptr<sigrok::Logic> logic =
+					analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr,
+						&state, lsamples);
 
-				shared_ptr<sigrok::Analog> analog =
-					dynamic_pointer_cast<sigrok::Analog>(packet->payload());
+				lsegment->append_payload(logic->data_pointer(), logic->data_length());
+				samples_added(lsegment->segment_id(), i, i + ConversionBlockSize);
+				i += ConversionBlockSize;
+			}
 
-				// Convert
-				uint64_t i = start_sample;
+			// Re-create sigrok::Analog and convert remaining samples
+			packet = Session::sr_context->create_analog_packet(channels,
+				asamples, end_sample - i, mq, unit, mq_flags);
 
-				if (conversion_type_ == A2LConversionByThreshold) {
-					const double threshold = get_conversion_thresholds()[0];
+			analog = dynamic_pointer_cast<sigrok::Analog>(packet->payload());
 
-					// Convert as many sample blocks as we can
-					while ((end_sample - i) > ConversionBlockSize) {
-						asegment->get_samples(i, i + ConversionBlockSize, asamples);
+			asegment->get_samples(i, end_sample, asamples);
+			shared_ptr<sigrok::Logic> logic =
+				analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr,
+					&state, lsamples);
+			lsegment->append_payload(logic->data_pointer(), logic->data_length());
+			samples_added(lsegment->segment_id(), i, end_sample);
+		}
 
-						shared_ptr<sigrok::Logic> logic =
-							analog->get_logic_via_threshold(threshold, lsamples);
+		// If acquisition is ongoing, start-/endsample may have changed
+		end_sample = asegment->get_sample_count();
 
-						lsegment->append_payload(logic->data_pointer(), logic->data_length());
+		delete[] lsamples;
+		delete[] asamples;
+	}
+}
 
-						samples_added(lsegment, i, i + ConversionBlockSize);
-						i += ConversionBlockSize;
-					}
+void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *lsegment)
+{
+	uint64_t start_sample, end_sample, old_end_sample;
+	start_sample = end_sample = 0;
+	bool complete_state, old_complete_state;
 
-					// Re-create sigrok::Analog and convert remaining samples
-					packet = Session::sr_context->create_analog_packet(channels,
-						asamples, end_sample - i, mq, unit, mq_flags);
+	start_sample = lsegment->get_sample_count();
+	end_sample = asegment->get_sample_count();
+	complete_state = asegment->is_complete();
 
-					analog = dynamic_pointer_cast<sigrok::Analog>(packet->payload());
+	// Don't do anything if the segment is still being filled and the sample count is too small
+	if ((!complete_state) && (end_sample - start_sample < ConversionBlockSize))
+		return;
 
-					asegment->get_samples(i, end_sample, asamples);
-					shared_ptr<sigrok::Logic> logic =
-						analog->get_logic_via_threshold(threshold, lsamples);
-					lsegment->append_payload(logic->data_pointer(), logic->data_length());
-					samples_added(lsegment, i, end_sample);
-				}
+	do {
+		convert_single_segment_range(asegment, lsegment, start_sample, end_sample);
 
-				if (conversion_type_ == A2LConversionBySchmittTrigger) {
-					const vector<double> thresholds = get_conversion_thresholds();
-					const double lo_thr = thresholds[0];
-					const double hi_thr = thresholds[1];
+		old_end_sample = end_sample;
+		old_complete_state = complete_state;
 
-					uint8_t state = 0;  // TODO Use value of logic sample n-1 instead of 0
+		start_sample = lsegment->get_sample_count();
+		end_sample = asegment->get_sample_count();
+		complete_state = asegment->is_complete();
 
-					// Convert as many sample blocks as we can
-					while ((end_sample - i) > ConversionBlockSize) {
-						asegment->get_samples(i, i + ConversionBlockSize, asamples);
+		// If the segment has been incomplete when we were called and has been
+		// completed in the meanwhile, we convert the remaining samples as well.
+		// Also, if a sufficient number of samples was added in the meanwhile,
+		// we do another round of sample conversion.
+	} while ((complete_state != old_complete_state) ||
+		(end_sample - old_end_sample >= ConversionBlockSize));
+}
 
-						shared_ptr<sigrok::Logic> logic =
-							analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr,
-								&state, lsamples);
+void SignalBase::conversion_thread_proc()
+{
+	shared_ptr<Analog> analog_data;
 
-						lsegment->append_payload(logic->data_pointer(), logic->data_length());
+	if (conversion_is_a2l()) {
+		analog_data = dynamic_pointer_cast<Analog>(data_);
 
-						samples_added(lsegment, i, i + ConversionBlockSize);
-						i += ConversionBlockSize;
-					}
+		if (analog_data->analog_segments().size() == 0) {
+			unique_lock<mutex> input_lock(conversion_input_mutex_);
+			conversion_input_cond_.wait(input_lock);
+		}
+
+	} else
+		// Currently, we only handle A2L conversions
+		return;
 
-					// Re-create sigrok::Analog and convert remaining samples
-					packet = Session::sr_context->create_analog_packet(channels,
-						asamples, end_sample - i, mq, unit, mq_flags);
+	// If we had to wait for input data, we may have been notified to terminate
+	if (conversion_interrupt_)
+		return;
 
-					analog = dynamic_pointer_cast<sigrok::Analog>(packet->payload());
+	uint32_t segment_id = 0;
 
-					asegment->get_samples(i, end_sample, asamples);
-					shared_ptr<sigrok::Logic> logic =
-						analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr,
-							&state, lsamples);
-					lsegment->append_payload(logic->data_pointer(), logic->data_length());
-					samples_added(lsegment, i, end_sample);
-				}
+	AnalogSegment *asegment = analog_data->analog_segments().front().get();
+	assert(asegment);
 
-				// If acquisition is ongoing, start-/endsample may have changed
-				end_sample = asegment->get_sample_count();
+	const shared_ptr<Logic> logic_data = dynamic_pointer_cast<Logic>(converted_data_);
+	assert(logic_data);
 
-				delete[] lsamples;
-				delete[] asamples;
+	// Create the initial logic data segment if needed
+	if (logic_data->logic_segments().size() == 0) {
+		shared_ptr<LogicSegment> new_segment =
+			make_shared<LogicSegment>(*logic_data.get(), 0, 1, asegment->samplerate());
+		logic_data->push_segment(new_segment);
+	}
+
+	LogicSegment *lsegment = logic_data->logic_segments().front().get();
+	assert(lsegment);
+
+	do {
+		convert_single_segment(asegment, lsegment);
+
+		// Only advance to next segment if the current input segment is complete
+		if (asegment->is_complete() &&
+			analog_data->analog_segments().size() > logic_data->logic_segments().size()) {
+			// There are more segments to process
+			segment_id++;
+
+			try {
+				asegment = analog_data->analog_segments().at(segment_id).get();
+			} catch (out_of_range&) {
+				qDebug() << "Conversion error for" << name() << ": no analog segment" \
+					<< segment_id << ", segments size is" << analog_data->analog_segments().size();
+				return;
 			}
-		}
 
-		if (!conversion_interrupt_ && (start_sample == end_sample)) {
-			unique_lock<mutex> input_lock(conversion_input_mutex_);
-			conversion_input_cond_.wait(input_lock);
+			shared_ptr<LogicSegment> new_segment = make_shared<LogicSegment>(
+				*logic_data.get(), segment_id, 1, asegment->samplerate());
+			logic_data->push_segment(new_segment);
+
+			lsegment = logic_data->logic_segments().back().get();
+		} else {
+			// No more samples/segments to process, wait for data or interrupt
+			if (!conversion_interrupt_) {
+				unique_lock<mutex> input_lock(conversion_input_mutex_);
+				conversion_input_cond_.wait(input_lock);
+			}
 		}
 	} while (!conversion_interrupt_);
 }
@@ -539,19 +795,11 @@ void SignalBase::start_conversion(bool delayed_start)
 
 	if (converted_data_)
 		converted_data_->clear();
+	samples_cleared();
 
-	if (conversion_is_a2l()) {
-		shared_ptr<Analog> analog_data = dynamic_pointer_cast<Analog>(data_);
-
-		if (analog_data->analog_segments().size() > 0) {
-			// TODO Support for multiple segments is missing
-			AnalogSegment *asegment = analog_data->analog_segments().front().get();
-
-			conversion_interrupt_ = false;
-			conversion_thread_ = std::thread(
-				&SignalBase::conversion_thread_proc, this, asegment);
-		}
-	}
+	conversion_interrupt_ = false;
+	conversion_thread_ = std::thread(
+		&SignalBase::conversion_thread_proc, this);
 }
 
 void SignalBase::stop_conversion()
@@ -571,7 +819,7 @@ void SignalBase::on_samples_cleared()
 	samples_cleared();
 }
 
-void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample,
+void SignalBase::on_samples_added(SharedPtrToSegment segment, uint64_t start_sample,
 	uint64_t end_sample)
 {
 	if (conversion_type_ != NoConversion) {
@@ -585,7 +833,7 @@ void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample,
 		}
 	}
 
-	samples_added(segment, start_sample, end_sample);
+	samples_added(segment->segment_id(), start_sample, end_sample);
 }
 
 void SignalBase::on_min_max_changed(float min, float max)