From f118e71ebb7d0cf64f0b019bc10224fe0876b713 Mon Sep 17 00:00:00 2001
From: DreamSourceLab <support@dreamsourcelab.com>
Date: Thu, 7 May 2015 20:17:26 +0800
Subject: [PATCH] fix trigger value out of range issue

---
 DSView/pv/view/dsosignal.cpp | 7 ++++---
 DSView/pv/view/dsosignal.h   | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/DSView/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp
index 1a404916..62a22168 100644
--- a/DSView/pv/view/dsosignal.cpp
+++ b/DSView/pv/view/dsosignal.cpp
@@ -103,6 +103,7 @@ const QColor DsoSignal::SignalColours[4] = {
 };
 
 const float DsoSignal::EnvelopeThreshold = 256.0f;
+const double DsoSignal::TrigMargin = 0.02;
 
 const int DsoSignal::UpMargin = 30;
 const int DsoSignal::DownMargin = 30;
@@ -466,13 +467,13 @@ void DsoSignal::set_trig_vpos(int pos)
         double delta = min((double)max(pos - UpMargin, 0), get_view_rect().height()) * 1.0 / get_view_rect().height();
         bool isDSCope = (strcmp(_dev_inst->dev_inst()->driver->name, "DSCope") == 0);
         if (isDSCope) {
-            _trig_vpos = delta;
+            _trig_vpos = min(max(delta, 0+TrigMargin), 1-TrigMargin);
             trig_value = delta * 255;
         } else {
             delta = delta - _zeroPos;
             delta = min(delta, 0.5);
             delta = max(delta, -0.5);
-            _trig_vpos = _zeroPos + delta;
+            _trig_vpos = min(max(_zeroPos + delta, 0+TrigMargin), 1-TrigMargin);
             trig_value = (delta * 255.0f + 0x80);
         }
         _dev_inst->set_config(_probe, NULL, SR_CONF_TRIGGER_VALUE,
@@ -491,7 +492,7 @@ void DsoSignal::set_zeroPos(int pos)
         double delta = _trig_vpos - _zeroPos;
         set_trig_vpos(get_trig_vpos() + pos - get_zeroPos());
         _zeroPos = min((double)max(pos - UpMargin, 0), get_view_rect().height()) * 1.0 / get_view_rect().height();
-        _trig_vpos = min(max(_zeroPos + delta, 0.0), 1.0);
+        _trig_vpos = min(max(_zeroPos + delta, 0+TrigMargin), 1-TrigMargin);
 
         update_zeroPos();
     }
diff --git a/DSView/pv/view/dsosignal.h b/DSView/pv/view/dsosignal.h
index 58a671ba..af474c91 100644
--- a/DSView/pv/view/dsosignal.h
+++ b/DSView/pv/view/dsosignal.h
@@ -43,6 +43,7 @@ class DsoSignal : public Signal
 private:
 	static const QColor SignalColours[4];
 	static const float EnvelopeThreshold;
+    static const double TrigMargin;
 
     static const int HitCursorMargin = 3;
     static const uint64_t vDialValueCount = 8;