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

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 79109403..2ca5a835 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -83,7 +83,7 @@ QString SignalBase::internal_name() const
 
 QString SignalBase::display_name() const
 {
-	if (name() != internal_name_)
+	if ((name() != internal_name_) && (!internal_name_.isEmpty()))
 		return name() + " (" + internal_name_ + ")";
 	else
 		return name();
@@ -155,8 +155,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();
@@ -172,8 +172,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(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();
@@ -185,6 +185,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;
@@ -265,6 +274,26 @@ bool SignalBase::has_samples() const
 	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_;
@@ -430,12 +459,12 @@ void SignalBase::save_settings(QSettings &settings) const
 {
 	settings.setValue("name", name());
 	settings.setValue("enabled", enabled());
-	settings.setValue("color", color());
+	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++;
@@ -450,8 +479,19 @@ void SignalBase::restore_settings(QSettings &settings)
 	if (settings.contains("enabled"))
 		set_enabled(settings.value("enabled").toBool());
 
-	if (settings.contains("color"))
-		set_color(settings.value("color").value<QColor>());
+	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);
+	}
 
 	if (settings.contains("conversion_type"))
 		set_conversion_type((ConversionType)settings.value("conversion_type").toInt());
@@ -712,7 +752,7 @@ void SignalBase::on_samples_cleared()
 	samples_cleared();
 }
 
-void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample,
+void SignalBase::on_samples_added(shared_ptr<Segment> segment, uint64_t start_sample,
 	uint64_t end_sample)
 {
 	if (conversion_type_ != NoConversion) {
@@ -726,8 +766,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)