X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=89bfc25298369bf1431e3fa05f325bba1abd0e74;hp=5a35218f3a2501e87d5e27ef8656532f27191e74;hb=144e72c9ec677e7df35d37d7de6e8a18bb3f2ba1;hpb=4640a84e926ac4b82e2a1b6ef9fc80ef44c2bd3c

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index 5a35218f..89bfc252 100644
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -112,6 +112,9 @@ public:
 		DynamicPreset = 0  ///< Conversion uses calculated values
 	};
 
+	static const QColor AnalogSignalColors[8];
+	static const QColor LogicSignalColors[10];
+
 private:
 	static const int ColorBGAlpha;
 	static const uint64_t ConversionBlockSize;
@@ -350,10 +353,10 @@ private:
 	uint8_t convert_a2l_schmitt_trigger(float lo_thr, float hi_thr,
 		float value, uint8_t &state);
 
-	void convert_single_segment_range(AnalogSegment *asegment,
-		LogicSegment *lsegment, uint64_t start_sample, uint64_t end_sample);
-	void convert_single_segment(pv::data::AnalogSegment *asegment,
-		pv::data::LogicSegment *lsegment);
+	void convert_single_segment_range(shared_ptr<AnalogSegment> asegment,
+		shared_ptr<LogicSegment> lsegment, uint64_t start_sample, uint64_t end_sample);
+	void convert_single_segment(shared_ptr<AnalogSegment> asegment,
+		shared_ptr<LogicSegment> lsegment);
 	void conversion_thread_proc();
 
 	void stop_conversion();