X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=9f35725f8df1cc540e032680cb70d31b4fe6b5ad;hp=2972d4043cf7a7bb3e6b48b49e9b190589b92884;hb=b571a8e7e0dc3e3b6daa58f27050e76466f006dd;hpb=30677c1392b54604b01558cf29b44572731659fc

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 2972d404..9f35725f 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -41,7 +41,7 @@ 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
 
@@ -130,24 +130,24 @@ unsigned int SignalBase::logic_bit_index() const
 		return 0;
 }
 
-QColor SignalBase::colour() const
+QColor SignalBase::color() const
 {
-	return colour_;
+	return color_;
 }
 
-void SignalBase::set_colour(QColor colour)
+void SignalBase::set_color(QColor color)
 {
-	colour_ = colour;
+	color_ = color;
 
-	bgcolour_ = colour;
-	bgcolour_.setAlpha(ColourBGAlpha);
+	bgcolor_ = color;
+	bgcolor_.setAlpha(ColorBGAlpha);
 
-	colour_changed(colour);
+	color_changed(color);
 }
 
-QColor SignalBase::bgcolour() const
+QColor SignalBase::bgcolor() const
 {
-	return bgcolour_;
+	return bgcolor_;
 }
 
 void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
@@ -238,6 +238,53 @@ bool SignalBase::segment_is_complete(uint32_t segment_id) const
 	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_;
@@ -403,12 +450,12 @@ void SignalBase::save_settings(QSettings &settings) const
 {
 	settings.setValue("name", name());
 	settings.setValue("enabled", enabled());
-	settings.setValue("colour", colour());
+	settings.setValue("color", color());
 	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++;
@@ -417,18 +464,30 @@ 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());
 
-	int conv_options = settings.value("conv_options").toInt();
+	if (settings.contains("enabled"))
+		set_enabled(settings.value("enabled").toBool());
+
+	if (settings.contains("color"))
+		set_color(settings.value("color").value<QColor>());
+
+	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);
 		}
 }