X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=eb2996d04105d605dc5472a182ab42a496352c89;hb=641574bcc118be0b6dc3a65039ab3497f9d7241a;hp=54063b1d236bc1eff9a8ca1e44ad76aa95409cae;hpb=784f6c75bf8d878b395b8eb7b5e92fa24d9b32ba;p=pulseview.git

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 54063b1..eb2996d 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)
@@ -219,7 +219,7 @@ bool SignalBase::segment_is_complete(uint32_t segment_id) const
 		auto segments = data->analog_segments();
 		try {
 			result = segments.at(segment_id)->is_complete();
-		} catch (out_of_range) {
+		} catch (out_of_range&) {
 			// Do nothing
 		}
 	}
@@ -230,7 +230,7 @@ bool SignalBase::segment_is_complete(uint32_t segment_id) const
 		auto segments = data->logic_segments();
 		try {
 			result = segments.at(segment_id)->is_complete();
-		} catch (out_of_range) {
+		} catch (out_of_range&) {
 			// Do nothing
 		}
 	}
@@ -238,6 +238,33 @@ 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;
+}
+
 SignalBase::ConversionType SignalBase::get_conversion_type() const
 {
 	return conversion_type_;
@@ -403,7 +430,7 @@ 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()));
@@ -419,7 +446,7 @@ 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_color(settings.value("color").value<QColor>());
 	set_conversion_type((ConversionType)settings.value("conversion_type").toInt());
 
 	int conv_options = settings.value("conv_options").toInt();
@@ -617,7 +644,7 @@ void SignalBase::conversion_thread_proc()
 
 			try {
 				asegment = analog_data->analog_segments().at(segment_id).get();
-			} catch (out_of_range) {
+			} catch (out_of_range&) {
 				qDebug() << "Conversion error for" << name() << ": no analog segment" \
 					<< segment_id << ", segments size is" << analog_data->analog_segments().size();
 				return;