X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.cpp;h=323a2434ec79083f00db203a9c23ae37031ac790;hp=f3046c0aaee2db8215b9399dda100a0c4700bf7b;hb=561ba3ae052a93fe150a2161fcdc361144e68e4f;hpb=c6b017fb7a8d3b01a64ca770a8274a8ac610ef03

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index f3046c0a..323a2434 100644
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -70,11 +70,14 @@ const QColor AnalogSignal::SignalColours[4] = {
 	QColor(0x4E, 0x9A, 0x06)	// Green
 };
 
+const QPen AnalogSignal::AxisPen(QColor(0, 0, 0, 30 * 256 / 100), 2);
 const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40 * 256 / 100);
 const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20 * 256 / 100);
 
 const QColor AnalogSignal::SamplingPointColour(0x77, 0x77, 0x77);
 
+const QColor AnalogSignal::ThresholdColor = QColor(0, 0, 0, 30 * 256 / 100);
+
 const int64_t AnalogSignal::TracePaintBlockSize = 1024 * 1024;  // 4 MiB (due to float)
 const float AnalogSignal::EnvelopeThreshold = 64.0f;
 
@@ -97,6 +100,8 @@ AnalogSignal::AnalogSignal(
 	display_type_(DisplayBoth),
 	autoranging_(true)
 {
+	axis_pen_ = AxisPen;
+
 	pv::data::Analog* analog_data =
 		dynamic_cast<pv::data::Analog*>(data().get());
 
@@ -242,11 +247,15 @@ void AnalogSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 				pixels_offset, samples_per_pixel);
 	}
 
-	if ((display_type_ == DisplayConverted) || (display_type_ == DisplayBoth)) {
-		const SignalBase::ConversionType conv_type = base_->get_conversion_type();
+	const SignalBase::ConversionType conv_type = base_->get_conversion_type();
+
+	if (((conv_type == SignalBase::A2LConversionByThreshold) ||
+		(conv_type == SignalBase::A2LConversionBySchmittTrigger))) {
 
-		if (((conv_type == SignalBase::A2LConversionByTreshold) ||
-			(conv_type == SignalBase::A2LConversionBySchmittTrigger)))
+		if ((display_type_ == DisplayAnalog) || (display_type_ == DisplayBoth))
+			paint_conversion_thresholds(p, pp);
+
+		if ((display_type_ == DisplayConverted) || (display_type_ == DisplayBoth))
 			paint_logic_mid(p, pp);
 	}
 }
@@ -434,6 +443,44 @@ void AnalogSignal::paint_envelope(QPainter &p,
 	delete[] e.samples;
 }
 
+void AnalogSignal::paint_conversion_thresholds(QPainter &p,
+	ViewItemPaintParams &pp)
+{
+	if (!base_->enabled() || !base_->logic_data())
+		return;
+
+	// TODO Register a change handler instead of querying this with every repaint
+	GlobalSettings settings;
+	const bool show_conversion_thresholds =
+		settings.value(GlobalSettings::Key_View_ShowConversionThresholds).toBool();
+
+	if (!show_conversion_thresholds)
+		return;
+
+	const vector<double> thresholds = base_->get_conversion_thresholds();
+	const int y = get_visual_y();
+
+	p.setRenderHint(QPainter::Antialiasing, false);
+
+	p.setPen(ThresholdColor);
+
+	if (thresholds.size() == 2) {
+		// Draw as hatched block because two thresholds denote lower/upper level
+		const double thr_y0 = y - thresholds[0] * scale_;
+		const double thr_y1 = y - thresholds[1] * scale_;
+		p.fillRect(QRect(pp.left(), thr_y0, pp.right(), thr_y1 - thr_y0),
+			QBrush(ThresholdColor, Qt::BDiagPattern));
+	} else {
+		// Draw as individual lines
+		for (const double thr : thresholds) {
+			const double thr_y = y - thr * scale_;
+			p.drawLine(QPointF(pp.left(), thr_y), QPointF(pp.right(), thr_y));
+		}
+	}
+
+	p.setRenderHint(QPainter::Antialiasing, true);
+}
+
 void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp)
 {
 	QLineF *line;
@@ -616,9 +663,9 @@ void AnalogSignal::update_conversion_widgets()
 
 	map < QString, QVariant > options = base_->get_conversion_options();
 
-	if (conv_type == SignalBase::A2LConversionByTreshold) {
+	if (conv_type == SignalBase::A2LConversionByThreshold) {
 		const vector<double> thresholds = base_->get_conversion_thresholds(
-				SignalBase::A2LConversionByTreshold, true);
+				SignalBase::A2LConversionByThreshold, true);
 		conv_threshold_cb_->addItem(
 				QString("%1V").arg(QString::number(thresholds[0], 'f', 1)), -1);
 	}
@@ -775,7 +822,7 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	conversion_cb_->addItem(tr("none"),
 		SignalBase::NoConversion);
 	conversion_cb_->addItem(tr("to logic via threshold"),
-		SignalBase::A2LConversionByTreshold);
+		SignalBase::A2LConversionByThreshold);
 	conversion_cb_->addItem(tr("to logic via schmitt-trigger"),
 		SignalBase::A2LConversionBySchmittTrigger);
 
@@ -953,7 +1000,7 @@ void AnalogSignal::on_conv_threshold_changed(int index)
 
 	const bool use_custom_thr = (index == -1) || (user_data == -1);
 
-	if (conv_type == SignalBase::A2LConversionByTreshold && use_custom_thr) {
+	if (conv_type == SignalBase::A2LConversionByThreshold && use_custom_thr) {
 		// Not one of the preset values, try to parse the combo box text
 		// Note: Regex loosely based on
 		// https://txt2re.com/index-c++.php3?s=0.1V&1&-13