From a212e0905241f81bc109497e0db09dc1b8566576 Mon Sep 17 00:00:00 2001
From: yunyaobaihong <896458252@qq.com>
Date: Mon, 14 Nov 2022 14:02:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=1B[200~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DSView/pv/mainwindow.cpp | 20 +++++++++++++++-----
 DSView/pv/mainwindow.h   |  3 +++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 616e864e..28ff9e20 100644
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -118,6 +118,8 @@ namespace pv
         setup_ui();
 
         setContextMenuPolicy(Qt::NoContextMenu);
+
+        _key_vaild = false;
     }
 
     void MainWindow::setup_ui()
@@ -1100,6 +1102,14 @@ namespace pv
         {
             const auto &sigs = _session->get_signals();
             QKeyEvent *ke = (QKeyEvent *)event;
+            int modifier = ke->modifiers();
+            if(modifier & Qt::ControlModifier || 
+               modifier & Qt::ShiftModifier || 
+               modifier & Qt::AltModifier)
+            {
+                return true;
+            }
+            
             switch (ke->key())
             {
             case Qt::Key_S:
@@ -1151,9 +1161,9 @@ namespace pv
                 break;
             case Qt::Key_0:
                 for (auto s : sigs)
-                { 
+                {
                     if (s->signal_type() == DSO_SIGNAL)
-                    {   
+                    {
                         view::DsoSignal *dsoSig = (view::DsoSignal*)s;
                         if (dsoSig->get_index() == 0)
                             dsoSig->set_vDialActive(!dsoSig->get_vDialActive());
@@ -1181,8 +1191,8 @@ namespace pv
                 break;
             case Qt::Key_Up:
                 for (auto s : sigs)
-                { 
-                    if (s->signal_type() == DSO_SIGNAL){   
+                {
+                    if (s->signal_type() == DSO_SIGNAL){
                         view::DsoSignal *dsoSig = (view::DsoSignal*)s;
                         if (dsoSig->get_vDialActive())
                         {
@@ -1195,7 +1205,7 @@ namespace pv
                 break;
             case Qt::Key_Down:
                 for (auto s : sigs)
-                { 
+                {
                     if (s->signal_type() == DSO_SIGNAL){
                         view::DsoSignal *dsoSig = (view::DsoSignal*)s;
                         if (dsoSig->get_vDialActive())
diff --git a/DSView/pv/mainwindow.h b/DSView/pv/mainwindow.h
index 71d10a67..c115ab97 100644
--- a/DSView/pv/mainwindow.h
+++ b/DSView/pv/mainwindow.h
@@ -214,6 +214,9 @@ private:
     SigSession      *_session;
     DeviceAgent     *_device_agent;
     bool            _is_auto_switch_device;
+
+    int _key_value;
+    bool _key_vaild;
 };
 
 } // namespace pv

From 39ceee01cf694e760556a5dcd734176ee92338c0 Mon Sep 17 00:00:00 2001
From: yunyaobaihong <896458252@qq.com>
Date: Mon, 14 Nov 2022 14:11:28 +0800
Subject: [PATCH 2/2] Shortcut key update version

---
 DSView/pv/mainwindow.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 28ff9e20..15b0fdf8 100644
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -1102,6 +1102,7 @@ namespace pv
         {
             const auto &sigs = _session->get_signals();
             QKeyEvent *ke = (QKeyEvent *)event;
+            
             int modifier = ke->modifiers();
             if(modifier & Qt::ControlModifier || 
                modifier & Qt::ShiftModifier ||