X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=274de1a12667350a2acb1ad5ca7f2959958610b3;hb=eb8f22c04d1f5b7f9c831f9bec0778d3f3583626;hp=fb68724401c4f979acb79d66191192653a8d0a72;hpb=27ff2925665ce9c916d68c637827095e27b99ee7;p=pulseview.git

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index fb687244..274de1a1 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -28,8 +28,9 @@
 
 #include <QDebug>
 
-#include <pv/binding/decoder.hpp>
+#include <extdef.h>
 #include <pv/session.hpp>
+#include <pv/binding/decoder.hpp>
 
 using std::dynamic_pointer_cast;
 using std::make_shared;
@@ -41,6 +42,33 @@ using std::unique_lock;
 namespace pv {
 namespace data {
 
+const QColor SignalBase::AnalogSignalColors[8] =
+{
+	QColor(0xC4, 0xA0, 0x00),	// Yellow   HSV:  49 / 100 / 77
+	QColor(0x87, 0x20, 0x7A),	// Magenta  HSV: 308 /  70 / 53
+	QColor(0x20, 0x4A, 0x87),	// Blue     HSV: 216 /  76 / 53
+	QColor(0x4E, 0x9A, 0x06),	// Green    HSV:  91 /  96 / 60
+	QColor(0xBF, 0x6E, 0x00),	// Orange   HSV:  35 / 100 / 75
+	QColor(0x5E, 0x20, 0x80),	// Purple   HSV: 280 /  75 / 50
+	QColor(0x20, 0x80, 0x7A),	// Turqoise HSV: 177 /  75 / 50
+	QColor(0x80, 0x20, 0x24)	// Red      HSV: 358 /  75 / 50
+};
+
+const QColor SignalBase::LogicSignalColors[10] =
+{
+	QColor(0x16, 0x19, 0x1A),	// Black
+	QColor(0x8F, 0x52, 0x02),	// Brown
+	QColor(0xCC, 0x00, 0x00),	// Red
+	QColor(0xF5, 0x79, 0x00),	// Orange
+	QColor(0xED, 0xD4, 0x00),	// Yellow
+	QColor(0x73, 0xD2, 0x16),	// Green
+	QColor(0x34, 0x65, 0xA4),	// Blue
+	QColor(0x75, 0x50, 0x7B),	// Violet
+	QColor(0x88, 0x8A, 0x85),	// Grey
+	QColor(0xEE, 0xEE, 0xEC),	// White
+};
+
+
 const int SignalBase::ColorBGAlpha = 8 * 256 / 100;
 const uint64_t SignalBase::ConversionBlockSize = 4096;
 const uint32_t SignalBase::ConversionDelay = 1000;  // 1 second
@@ -106,6 +134,13 @@ SignalBase::SignalBase(shared_ptr<sigrok::Channel> channel, ChannelType channel_
 		this, SLOT(on_delayed_conversion_start()));
 	delayed_conversion_starter_.setSingleShot(true);
 	delayed_conversion_starter_.setInterval(ConversionDelay);
+
+	// Only logic and analog SR channels can have their colors auto-set
+	// because for them, we have an index that can be used
+	if (channel_type == LogicChannel)
+		set_color(LogicSignalColors[index() % countof(LogicSignalColors)]);
+	else if (channel_type == AnalogChannel)
+		set_color(AnalogSignalColors[index() % countof(AnalogSignalColors)]);
 }
 
 SignalBase::~SignalBase()
@@ -566,8 +601,8 @@ bool SignalBase::conversion_is_a2l() const
 		(conversion_type_ == A2LConversionBySchmittTrigger)));
 }
 
-void SignalBase::convert_single_segment_range(AnalogSegment *asegment,
-	LogicSegment *lsegment, uint64_t start_sample, uint64_t end_sample)
+void SignalBase::convert_single_segment_range(shared_ptr<AnalogSegment> asegment,
+	shared_ptr<LogicSegment> lsegment, uint64_t start_sample, uint64_t end_sample)
 {
 	if (end_sample > start_sample) {
 		tie(min_value_, max_value_) = asegment->get_min_max();
@@ -666,7 +701,8 @@ void SignalBase::convert_single_segment_range(AnalogSegment *asegment,
 	}
 }
 
-void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *lsegment)
+void SignalBase::convert_single_segment(shared_ptr<AnalogSegment> asegment,
+	shared_ptr<LogicSegment> lsegment)
 {
 	uint64_t start_sample, end_sample, old_end_sample;
 	start_sample = end_sample = 0;
@@ -720,7 +756,7 @@ void SignalBase::conversion_thread_proc()
 
 	uint32_t segment_id = 0;
 
-	AnalogSegment *asegment = analog_data->analog_segments().front().get();
+	shared_ptr<AnalogSegment> asegment = analog_data->analog_segments().front();
 	assert(asegment);
 
 	const shared_ptr<Logic> logic_data = dynamic_pointer_cast<Logic>(converted_data_);
@@ -733,7 +769,7 @@ void SignalBase::conversion_thread_proc()
 		logic_data->push_segment(new_segment);
 	}
 
-	LogicSegment *lsegment = logic_data->logic_segments().front().get();
+	shared_ptr<LogicSegment> lsegment = logic_data->logic_segments().front();
 	assert(lsegment);
 
 	do {
@@ -746,7 +782,7 @@ void SignalBase::conversion_thread_proc()
 			segment_id++;
 
 			try {
-				asegment = analog_data->analog_segments().at(segment_id).get();
+				asegment = analog_data->analog_segments().at(segment_id);
 			} catch (out_of_range&) {
 				qDebug() << "Conversion error for" << name() << ": no analog segment" \
 					<< segment_id << ", segments size is" << analog_data->analog_segments().size();
@@ -757,7 +793,7 @@ void SignalBase::conversion_thread_proc()
 				*logic_data.get(), segment_id, 1, asegment->samplerate());
 			logic_data->push_segment(new_segment);
 
-			lsegment = logic_data->logic_segments().back().get();
+			lsegment = logic_data->logic_segments().back();
 		} else {
 			// No more samples/segments to process, wait for data or interrupt
 			if (!conversion_interrupt_) {