X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.cpp;h=ef6581fc1dd90ba46edfa27a2a886d3da914f471;hp=a78d65541ba6544713793d884bff0c8309002e1c;hb=90ee1ed9a90bc0651f86ee4af07e0958572f86da;hpb=78bf7ce5aaa1e02717973dc559c24973a313b541

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index a78d6554..ef6581fc 100644
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -113,12 +113,12 @@ AnalogSignal::AnalogSignal(
 	connect(analog_data, SIGNAL(min_max_changed(float, float)),
 		this, SLOT(on_min_max_changed(float, float)));
 
-	GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowConversionThresholds,
-		bind(&AnalogSignal::on_settingViewShowConversionThresholds_changed, this, _1));
+	GlobalSettings::register_change_handler(GlobalSettings::Key_View_ConversionThresholdDispMode,
+		bind(&AnalogSignal::on_settingViewConversionThresholdDispMode_changed, this, _1));
 
 	GlobalSettings gs;
-	show_conversion_thresholds_ =
-		gs.value(GlobalSettings::Key_View_ShowConversionThresholds).toBool();
+	conversion_threshold_disp_mode_ =
+		gs.value(GlobalSettings::Key_View_ConversionThresholdDispMode).toInt();
 
 	div_height_ = gs.value(GlobalSettings::Key_View_DefaultDivHeight).toInt();
 
@@ -206,10 +206,13 @@ void AnalogSignal::paint_back(QPainter &p, ViewItemPaintParams &pp)
 	if (!base_->enabled())
 		return;
 
+	bool paint_thr_bg =
+		conversion_threshold_disp_mode_ == GlobalSettings::ConvThrDispMode_Background;
+
 	const vector<double> thresholds = base_->get_conversion_thresholds();
 
 	// Only display thresholds if we have some and we show analog samples
-	if ((thresholds.size() > 0) && show_conversion_thresholds_ &&
+	if ((thresholds.size() > 0) && paint_thr_bg &&
 		((display_type_ == DisplayAnalog) || (display_type_ == DisplayBoth))) {
 
 		const int visual_y = get_visual_y();
@@ -1073,9 +1076,9 @@ void AnalogSignal::on_display_type_changed(int index)
 		owner_->row_item_appearance_changed(false, true);
 }
 
-void AnalogSignal::on_settingViewShowConversionThresholds_changed(const QVariant new_value)
+void AnalogSignal::on_settingViewConversionThresholdDispMode_changed(const QVariant new_value)
 {
-	show_conversion_thresholds_ = new_value.toBool();
+	conversion_threshold_disp_mode_ = new_value.toInt();
 
 	if (owner_)
 		owner_->row_item_appearance_changed(false, true);