Fix for "fill logic signal high areas" feature

At certain zoom levels, the algorithm wrongly fills areas where
the signal is low. This patch fixes this.

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index 5b3241d2d35beb1aa4a552743aff00705d5319ac..2643c643fe9ca919028b5c82a44dbfa70a576d22 100644 (file)
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -614,10 +614,11 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp)
 
                if (fill_high_areas) {
                        // Any edge terminates a high area
-                       const int width = x - rising_edge_x;
-                       if (rising_edge_seen && (width > 0)) {
-                               high_rects.emplace_back(rising_edge_x, high_offset,
-                                       width, signal_height);
+                       if (rising_edge_seen) {
+                               const int width = x - rising_edge_x;
+                               if (width > 0)
+                                       high_rects.emplace_back(rising_edge_x, high_offset,
+                                               width, signal_height);
                                rising_edge_seen = false;
                        }
 

diff --git a/pv/views/trace/logicsignal.cpp b/pv/views/trace/logicsignal.cpp
index f43ac37e7ebf5b4d583ca3862d856ba59763d02e..a5d0a5987774436e178b0e3f250ce46633538d7d 100644 (file)
--- a/pv/views/trace/logicsignal.cpp
+++ b/pv/views/trace/logicsignal.cpp
@@ -258,10 +258,11 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 
                if (fill_high_areas) {
                        // Any edge terminates a high area
-                       const int width = x - rising_edge_x;
-                       if (rising_edge_seen && (width > 0)) {
-                               high_rects.emplace_back(rising_edge_x, high_offset,
-                                       width, signal_height_);
+                       if (rising_edge_seen) {
+                               const int width = x - rising_edge_x;
+                               if (width > 0)
+                                       high_rects.emplace_back(rising_edge_x, high_offset,
+                                               width, signal_height_);
                                rising_edge_seen = false;
                        }