X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=7d420ac7017902e8cffa80aee9be976f1fa75e67;hp=5f6dc398f012d8507ca499f56b84887e04ec5a97;hb=4640a84e926ac4b82e2a1b6ef9fc80ef44c2bd3c;hpb=d13d95b3eaee713cc4eabbc0682ca545b4c31800

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 5f6dc398..7d420ac7 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -41,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()));
@@ -71,32 +118,10 @@ shared_ptr<sigrok::Channel> SignalBase::channel() const
 	return channel_;
 }
 
-QString SignalBase::name() const
+bool SignalBase::is_generated() const
 {
-	return (channel_) ? QString::fromStdString(channel_->name()) : name_;
-}
-
-QString SignalBase::internal_name() const
-{
-	return internal_name_;
-}
-
-QString SignalBase::display_name() const
-{
-	if (name() != internal_name_)
-		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);
+	// Only signals associated with a device have a corresponding sigrok channel
+	return channel_ == nullptr;
 }
 
 bool SignalBase::enabled() const
@@ -119,35 +144,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)
 {
-	return colour_;
+	group_ = group;
 }
 
-void SignalBase::set_colour(QColor colour)
+SignalGroup* SignalBase::group() const
 {
-	colour_ = colour;
+	return group_;
+}
 
-	bgcolour_ = colour;
-	bgcolour_.setAlpha(ColourBGAlpha);
+QString SignalBase::name() const
+{
+	return (channel_) ? QString::fromStdString(channel_->name()) : name_;
+}
 
-	colour_changed(colour);
+QString SignalBase::internal_name() const
+{
+	return internal_name_;
 }
 
-QColor SignalBase::bgcolour() const
+void SignalBase::set_internal_name(QString internal_name)
 {
-	return bgcolour_;
+	internal_name_ = internal_name;
+}
+
+QString SignalBase::display_name() const
+{
+	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)
@@ -155,16 +228,13 @@ 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)));
-
-		if (channel_type_ == AnalogChannel) {
-			shared_ptr<Analog> analog = analog_data();
-			assert(analog);
+		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)));
 
+		shared_ptr<Analog> analog = analog_data();
+		if (analog)
 			disconnect(analog.get(), SIGNAL(min_max_changed(float, float)),
 				this, SLOT(on_min_max_changed(float, float)));
-		}
 	}
 
 	data_ = data;
@@ -172,35 +242,33 @@ 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)));
-
-		if (channel_type_ == AnalogChannel) {
-			shared_ptr<Analog> analog = analog_data();
-			assert(analog);
+		connect(data.get(), SIGNAL(samples_added(SharedPtrToSegment, uint64_t, uint64_t)),
+			this, SLOT(on_samples_added(SharedPtrToSegment, uint64_t, uint64_t)));
 
+		shared_ptr<Analog> analog = analog_data();
+		if (analog)
 			connect(analog.get(), SIGNAL(min_max_changed(float, float)),
 				this, SLOT(on_min_max_changed(float, float)));
-		}
 	}
 }
 
-shared_ptr<data::Analog> SignalBase::analog_data() const
+void SignalBase::clear_sample_data()
 {
-	shared_ptr<Analog> result = nullptr;
+	if (analog_data())
+		analog_data()->clear();
 
-	if (channel_type_ == AnalogChannel)
-		result = dynamic_pointer_cast<Analog>(data_);
+	if (logic_data())
+		logic_data()->clear();
+}
 
-	return result;
+shared_ptr<data::Analog> SignalBase::analog_data() const
+{
+	return dynamic_pointer_cast<Analog>(data_);
 }
 
 shared_ptr<data::Logic> SignalBase::logic_data() const
 {
-	shared_ptr<Logic> result = nullptr;
-
-	if (channel_type_ == LogicChannel)
-		result = dynamic_pointer_cast<Logic>(data_);
+	shared_ptr<Logic> result = dynamic_pointer_cast<Logic>(data_);
 
 	if (((conversion_type_ == A2LConversionByThreshold) ||
 		(conversion_type_ == A2LConversionBySchmittTrigger)))
@@ -213,25 +281,25 @@ bool SignalBase::segment_is_complete(uint32_t segment_id) const
 {
 	bool result = true;
 
-	if (channel_type_ == AnalogChannel)
+	shared_ptr<Analog> adata = analog_data();
+	if (adata)
 	{
-		shared_ptr<Analog> data = dynamic_pointer_cast<Analog>(data_);
-		auto segments = data->analog_segments();
+		auto segments = adata->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
+	} else {
+		shared_ptr<Logic> ldata = logic_data();
+		if (ldata) {
+			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
+			}
 		}
 	}
 
@@ -242,27 +310,37 @@ bool SignalBase::has_samples() const
 {
 	bool result = false;
 
-	if (channel_type_ == AnalogChannel)
+	shared_ptr<Analog> adata = analog_data();
+	if (adata)
 	{
-		shared_ptr<Analog> data = dynamic_pointer_cast<Analog>(data_);
-		if (data) {
-			auto segments = data->analog_segments();
+		auto segments = adata->analog_segments();
+		if ((segments.size() > 0) && (segments.front()->get_sample_count() > 0))
+			result = true;
+	} else {
+		shared_ptr<Logic> ldata = logic_data();
+		if (ldata) {
+			auto segments = ldata->logic_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
+{
+	shared_ptr<Analog> adata = analog_data();
+	if (adata)
+		return adata->get_samplerate();
+	else {
+		shared_ptr<Logic> ldata = logic_data();
+		if (ldata)
+			return ldata->get_samplerate();
 	}
 
-	return result;
+	// Default samplerate is 1 Hz
+	return 1.0;
 }
 
 SignalBase::ConversionType SignalBase::get_conversion_type() const
@@ -430,12 +508,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++;
@@ -444,25 +522,47 @@ 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>()));
 
-	int conv_options = settings.value("conv_options").toInt();
+		// A color with an alpha value of 0 makes the signal marker invisible
+		if (color() == QColor(0, 0, 0, 0))
+			set_color(Qt::gray);
+	}
+
+	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);
 		}
 }
 
 bool SignalBase::conversion_is_a2l() const
 {
-	return ((channel_type_ == AnalogChannel) &&
-		((conversion_type_ == A2LConversionByThreshold) ||
+	return (((conversion_type_ == A2LConversionByThreshold) ||
 		(conversion_type_ == A2LConversionBySchmittTrigger)));
 }
 
@@ -477,7 +577,8 @@ void SignalBase::convert_single_segment_range(AnalogSegment *asegment,
 		uint8_t *lsamples = new uint8_t[ConversionBlockSize];
 
 		vector<shared_ptr<sigrok::Channel> > channels;
-		channels.push_back(channel_);
+		if (channel_)
+			channels.push_back(channel_);
 
 		vector<const sigrok::QuantityFlag*> mq_flags;
 		const sigrok::Quantity * const mq = sigrok::Quantity::VOLTAGE;
@@ -700,7 +801,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) {
@@ -714,8 +815,7 @@ void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample,
 		}
 	}
 
-	data::Segment* s = qobject_cast<data::Segment*>(segment);
-	samples_added(s->segment_id(), start_sample, end_sample);
+	samples_added(segment->segment_id(), start_sample, end_sample);
 }
 
 void SignalBase::on_min_max_changed(float min, float max)