X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Flogicsignal.cpp;h=350f495048f3344d66a3d367e86a38a57138d27b;hb=c583ea05e31967f78870ebbe19f6794e51f512c6;hp=8c4c982cd3507165b256d6a7a4cadd331c4155de;hpb=7a0d99e6d48870c51d00c25617eb309181dc2a60;p=pulseview.git

diff --git a/pv/views/trace/logicsignal.cpp b/pv/views/trace/logicsignal.cpp
index 8c4c982c..350f4950 100644
--- a/pv/views/trace/logicsignal.cpp
+++ b/pv/views/trace/logicsignal.cpp
@@ -70,19 +70,6 @@ const QColor LogicSignal::HighColor(0x00, 0xC0, 0x00);
 const QColor LogicSignal::LowColor(0xC0, 0x00, 0x00);
 const QColor LogicSignal::SamplingPointColor(0x77, 0x77, 0x77);
 
-const QColor LogicSignal::SignalColors[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
-};
-
 QColor LogicSignal::TriggerMarkerBackgroundColor = QColor(0xED, 0xD4, 0x00);
 const int LogicSignal::TriggerMarkerPadding = 2;
 const char* LogicSignal::TriggerMarkerIcons[8] = {
@@ -115,10 +102,14 @@ LogicSignal::LogicSignal(
 {
 	shared_ptr<Trigger> trigger;
 
-	base_->set_color(SignalColors[base->index() % countof(SignalColors)]);
-
-	GlobalSettings gs;
-	signal_height_ = gs.value(GlobalSettings::Key_View_DefaultLogicHeight).toInt();
+	GlobalSettings settings;
+	signal_height_ = settings.value(GlobalSettings::Key_View_DefaultLogicHeight).toInt();
+	show_sampling_points_ =
+		settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
+	fill_high_areas_ =
+		settings.value(GlobalSettings::Key_View_FillSignalHighAreas).toBool();
+	high_fill_color_ = QColor::fromRgba(settings.value(
+		GlobalSettings::Key_View_FillSignalHighAreaColor).value<uint32_t>());
 
 	/* Populate this channel's trigger setting with whatever we
 	 * find in the current session trigger, if anything. */
@@ -140,16 +131,21 @@ shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 	return base_->logic_data();
 }
 
-void LogicSignal::save_settings(QSettings &settings) const
+std::map<QString, QVariant> LogicSignal::save_settings() const
 {
-	settings.setValue("trace_height", signal_height_);
+	std::map<QString, QVariant> result;
+
+	result["trace_height"] = signal_height_;
+
+	return result;
 }
 
-void LogicSignal::restore_settings(QSettings &settings)
+void LogicSignal::restore_settings(std::map<QString, QVariant> settings)
 {
-	if (settings.contains("trace_height")) {
+	auto entry = settings.find("trace_height");
+	if (entry != settings.end()) {
 		const int old_height = signal_height_;
-		signal_height_ = settings.value("trace_height").toInt();
+		signal_height_ = settings["trace_height"].toInt();
 
 		if ((signal_height_ != old_height) && owner_) {
 			// Call order is important, otherwise the lazy event handler won't work
@@ -216,11 +212,7 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 		pp.left() + (edges.back().first / samples_per_pixel - pixels_offset);
 
 	// Check whether we need to paint the sampling points
-	GlobalSettings settings;
-	const bool show_sampling_points =
-		settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() &&
-		(samples_per_pixel < 0.25);
-
+	const bool show_sampling_points = show_sampling_points_ && (samples_per_pixel < 0.25);
 	vector<QRectF> sampling_points;
 	float sampling_point_x = first_sample_x;
 	int64_t sampling_point_sample = start_sample;
@@ -229,9 +221,6 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 	if (show_sampling_points)
 		sampling_points.reserve(end_sample - start_sample + 1);
 
-	// Check whether we need to fill the high areas
-	const bool fill_high_areas =
-		settings.value(GlobalSettings::Key_View_FillSignalHighAreas).toBool();
 	vector<QRectF> high_rects;
 	float rising_edge_x;
 	bool rising_edge_seen = false;
@@ -256,7 +245,7 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 		const float x = pp.left() + ((*i).first / samples_per_pixel - pixels_offset);
 		*line++ = QLineF(x, high_offset, x, low_offset);
 
-		if (fill_high_areas) {
+		if (fill_high_areas_) {
 			// Any edge terminates a high area
 			if (rising_edge_seen) {
 				const int width = x - rising_edge_x;
@@ -294,16 +283,14 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 			sampling_point_x += pixels_per_sample;
 		};
 
-	if (fill_high_areas) {
+	if (fill_high_areas_) {
 		// Add last high rectangle if the signal is still high at the end of the trace
 		if (rising_edge_seen && (edges.cend() - 1)->second)
 			high_rects.emplace_back(rising_edge_x, high_offset,
 				last_sample_x - rising_edge_x, signal_height_);
 
-		const QColor fill_color = QColor::fromRgba(settings.value(
-			GlobalSettings::Key_View_FillSignalHighAreaColor).value<uint32_t>());
-		p.setPen(fill_color);
-		p.setBrush(fill_color);
+		p.setPen(high_fill_color_);
+		p.setBrush(high_fill_color_);
 		p.drawRects((const QRectF*)(high_rects.data()), high_rects.size());
 	}
 
@@ -650,6 +637,20 @@ const QPixmap* LogicSignal::get_pixmap(const char *path)
 	return pixmap_cache_.take(path);
 }
 
+void LogicSignal::on_setting_changed(const QString &key, const QVariant &value)
+{
+	Signal::on_setting_changed(key, value);
+
+	if (key == GlobalSettings::Key_View_ShowSamplingPoints)
+		show_sampling_points_ = value.toBool();
+
+	if (key == GlobalSettings::Key_View_FillSignalHighAreas)
+		fill_high_areas_ = value.toBool();
+
+	if (key == GlobalSettings::Key_View_FillSignalHighAreaColor)
+		high_fill_color_ = QColor::fromRgba(value.value<uint32_t>());
+}
+
 void LogicSignal::on_trigger()
 {
 	QAction *action;