From ca52dbf5b4cab2b0ffbc3f22c3503094c3f90e11 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 1 Apr 2016 06:22:19 +0200 Subject: [PATCH] Scope GUI: do not apply trigger settings on trace length changed or sample rate changed --- sdrbase/gui/glscopegui.cpp | 2 -- sdrbase/gui/glscopegui.ui | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sdrbase/gui/glscopegui.cpp b/sdrbase/gui/glscopegui.cpp index fa4662e93..f98a28ee6 100644 --- a/sdrbase/gui/glscopegui.cpp +++ b/sdrbase/gui/glscopegui.cpp @@ -479,7 +479,6 @@ void GLScopeGUI::on_scope_traceSizeChanged(int) setTrigPreDisplay(); setTrigDelayDisplay(); applySettings(); - applyTriggerSettings(); } void GLScopeGUI::on_scope_sampleRateChanged(int) @@ -492,7 +491,6 @@ void GLScopeGUI::on_scope_sampleRateChanged(int) setTrigPreDisplay(); setTrigDelayDisplay(); applySettings(); - applyTriggerSettings(); } void GLScopeGUI::setTimeScaleDisplay() diff --git a/sdrbase/gui/glscopegui.ui b/sdrbase/gui/glscopegui.ui index d3cb7ba75..687bb1f44 100644 --- a/sdrbase/gui/glscopegui.ui +++ b/sdrbase/gui/glscopegui.ui @@ -6,8 +6,8 @@ 0 0 - 656 - 214 + 634 + 115