X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.cpp;h=2c5c82a9d1d18c5609d9d7965d2a10f35a6e2149;hb=d37ff80d1d8ef4d63094c07f8009742a356922bb;hp=5e7081d61145e0555dc8a048cc65c850c5f49de0;hpb=2601ce965fc455d23f5a964b84ddd74eb93705c4;p=pulseview.git

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index 5e7081d..2c5c82a 100644
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -77,10 +77,13 @@ 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::SamplingPointColourLo = QColor(200, 0, 0, 80 * 256 / 100);
+const QColor AnalogSignal::SamplingPointColourNe = QColor(0,   0, 0, 80 * 256 / 100);
+const QColor AnalogSignal::SamplingPointColourHi = QColor(0, 200, 0, 80 * 256 / 100);
 
 const QColor AnalogSignal::ThresholdColor = QColor(0, 0, 0, 30 * 256 / 100);
 const QColor AnalogSignal::ThresholdColorLo = QColor(255, 0, 0, 8 * 256 / 100);
-const QColor AnalogSignal::ThresholdColorNe = QColor(0,   0, 0, 6 * 256 / 100);
+const QColor AnalogSignal::ThresholdColorNe = QColor(0,   0, 0, 10 * 256 / 100);
 const QColor AnalogSignal::ThresholdColorHi = QColor(0, 255, 0, 8 * 256 / 100);
 
 const int64_t AnalogSignal::TracePaintBlockSize = 1024 * 1024;  // 4 MiB (due to float)
@@ -113,12 +116,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 +209,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();
@@ -376,11 +382,19 @@ void AnalogSignal::paint_trace(QPainter &p,
 	if (end <= start)
 		return;
 
+	bool paint_thr_dots =
+		(base_->get_conversion_type() != data::SignalBase::NoConversion) &&
+		(conversion_threshold_disp_mode_ == GlobalSettings::ConvThrDispMode_Dots);
+
+	vector<double> thresholds;
+	if (paint_thr_dots)
+		thresholds = base_->get_conversion_thresholds();
+
 	// Calculate and paint the sampling points if enabled and useful
 	GlobalSettings settings;
 	const bool show_sampling_points =
-		settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() &&
-		(samples_per_pixel < 0.25);
+		(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() ||
+		paint_thr_dots) && (samples_per_pixel < 0.25);
 
 	p.setPen(base_->colour());
 
@@ -389,10 +403,7 @@ void AnalogSignal::paint_trace(QPainter &p,
 	QPointF *points = new QPointF[points_count];
 	QPointF *point = points;
 
-	QRectF *sampling_points = nullptr;
-	if (show_sampling_points)
-		 sampling_points = new QRectF[points_count];
-	QRectF *sampling_point = sampling_points;
+	vector<QRectF> sampling_points[3];
 
 	int64_t sample_count = min(points_count, TracePaintBlockSize);
 	int64_t block_sample = 0;
@@ -413,18 +424,40 @@ void AnalogSignal::paint_trace(QPainter &p,
 
 		*point++ = QPointF(x, y - sample_block[block_sample] * scale_);
 
-		if (show_sampling_points)
-			*sampling_point++ =
-				QRectF(x - (w / 2), y - sample_block[block_sample] * scale_ - (w / 2), w, w);
+		if (show_sampling_points) {
+			int idx = 0;  // Neutral
+
+			if (paint_thr_dots) {
+				if (thresholds.size() == 1)
+					idx = (sample_block[block_sample] >= thresholds[0]) ? 2 : 1;
+				else if (thresholds.size() == 2) {
+					if (sample_block[block_sample] > thresholds[1])
+						idx = 2;  // High
+					else if (sample_block[block_sample] < thresholds[0])
+						idx = 1;  // Low
+				}
+			}
+
+			sampling_points[idx].push_back(
+				QRectF(x - (w / 2), y - sample_block[block_sample] * scale_ - (w / 2), w, w));
+		}
 	}
 	delete[] sample_block;
 
 	p.drawPolyline(points, points_count);
 
 	if (show_sampling_points) {
-		p.setPen(SamplingPointColour);
-		p.drawRects(sampling_points, points_count);
-		delete[] sampling_points;
+		if (paint_thr_dots) {
+			p.setPen(SamplingPointColourNe);
+			p.drawRects(sampling_points[0].data(), sampling_points[0].size());
+			p.setPen(SamplingPointColourLo);
+			p.drawRects(sampling_points[1].data(), sampling_points[1].size());
+			p.setPen(SamplingPointColourHi);
+			p.drawRects(sampling_points[2].data(), sampling_points[2].size());
+		} else {
+			p.setPen(SamplingPointColour);
+			p.drawRects(sampling_points[0].data(), sampling_points[0].size());
+		}
 	}
 
 	delete[] points;
@@ -1073,9 +1106,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);