X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=f49d95ebe8b0206f9f020dc0cba4bc7dd7ae1493;hp=2ca5a835db2d2ffb3cb1836f49bcd5db844f7e74;hb=4b018bf1eeed0f7b80120d41d7881673a2f29e61;hpb=1f3033cb3e63de7cfe98dab537460443917fece3

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 2ca5a835..f49d95eb 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -45,15 +45,62 @@ 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,63 +118,83 @@ shared_ptr<sigrok::Channel> SignalBase::channel() const
 	return channel_;
 }
 
-QString SignalBase::name() const
+bool SignalBase::enabled() const
 {
-	return (channel_) ? QString::fromStdString(channel_->name()) : name_;
+	return (channel_) ? channel_->enabled() : true;
 }
 
-QString SignalBase::internal_name() const
+void SignalBase::set_enabled(bool value)
 {
-	return internal_name_;
+	if (channel_) {
+		channel_->set_enabled(value);
+		enabled_changed(value);
+	}
 }
 
-QString SignalBase::display_name() const
+SignalBase::ChannelType SignalBase::type() const
 {
-	if ((name() != internal_name_) && (!internal_name_.isEmpty()))
-		return name() + " (" + internal_name_ + ")";
-	else
-		return name();
+	return channel_type_;
 }
 
-void SignalBase::set_name(QString name)
+unsigned int SignalBase::index() const
 {
-	if (channel_)
-		channel_->set_name(name.toUtf8().constData());
+	return index_;
+}
 
-	name_ = name;
+void SignalBase::set_index(unsigned int index)
+{
+	index_ = index;
+}
 
-	name_changed(name);
+unsigned int SignalBase::logic_bit_index() const
+{
+	if (channel_type_ == LogicChannel)
+		return index_;
+	else
+		return 0;
 }
 
-bool SignalBase::enabled() const
+void SignalBase::set_group(SignalGroup* group)
 {
-	return (channel_) ? channel_->enabled() : true;
+	group_ = group;
 }
 
-void SignalBase::set_enabled(bool value)
+SignalGroup* SignalBase::group() const
 {
-	if (channel_) {
-		channel_->set_enabled(value);
-		enabled_changed(value);
-	}
+	return group_;
 }
 
-SignalBase::ChannelType SignalBase::type() const
+QString SignalBase::name() const
 {
-	return channel_type_;
+	return (channel_) ? QString::fromStdString(channel_->name()) : name_;
 }
 
-unsigned int SignalBase::index() const
+QString SignalBase::internal_name() const
 {
-	return (channel_) ? channel_->index() : 0;
+	return internal_name_;
 }
 
-unsigned int SignalBase::logic_bit_index() const
+void SignalBase::set_internal_name(QString internal_name)
 {
-	if (channel_type_ == LogicChannel)
-		return channel_->index();
+	internal_name_ = internal_name;
+}
+
+QString SignalBase::display_name() const
+{
+	if ((name() != internal_name_) && (!internal_name_.isEmpty()))
+		return name() + " (" + internal_name_ + ")";
 	else
-		return 0;
+		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
@@ -158,13 +225,10 @@ void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
 		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();
-			assert(analog);
-
+		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,16 +236,13 @@ 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(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();
-			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)));
-		}
 	}
 }
 
@@ -196,20 +257,12 @@ void SignalBase::clear_sample_data()
 
 shared_ptr<data::Analog> SignalBase::analog_data() const
 {
-	shared_ptr<Analog> result = nullptr;
-
-	if (channel_type_ == AnalogChannel)
-		result = dynamic_pointer_cast<Analog>(data_);
-
-	return result;
+	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)))
@@ -222,25 +275,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
+			}
 		}
 	}
 
@@ -251,21 +304,16 @@ 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<Analog> adata = analog_data();
+	if (adata)
 	{
-		shared_ptr<Logic> data = dynamic_pointer_cast<Logic>(data_);
-		if (data) {
-			auto segments = data->logic_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;
 		}
@@ -276,18 +324,13 @@ bool SignalBase::has_samples() const
 
 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();
+	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();
 	}
 
 	// Default samplerate is 1 Hz
@@ -513,8 +556,7 @@ void SignalBase::restore_settings(QSettings &settings)
 
 bool SignalBase::conversion_is_a2l() const
 {
-	return ((channel_type_ == AnalogChannel) &&
-		((conversion_type_ == A2LConversionByThreshold) ||
+	return (((conversion_type_ == A2LConversionByThreshold) ||
 		(conversion_type_ == A2LConversionBySchmittTrigger)));
 }
 
@@ -752,7 +794,7 @@ void SignalBase::on_samples_cleared()
 	samples_cleared();
 }
 
-void SignalBase::on_samples_added(shared_ptr<Segment> segment, uint64_t start_sample,
+void SignalBase::on_samples_added(SharedPtrToSegment segment, uint64_t start_sample,
 	uint64_t end_sample)
 {
 	if (conversion_type_ != NoConversion) {