diff --git a/DSView/pv/dock/measuredock.cpp b/DSView/pv/dock/measuredock.cpp
index 15dfeb26..3d2d9ea1 100644
--- a/DSView/pv/dock/measuredock.cpp
+++ b/DSView/pv/dock/measuredock.cpp
@@ -323,6 +323,7 @@ void MeasureDock::goto_cursor()
 
 void MeasureDock::add_dist_measure()
 { 
+  //  dsv_info("add_dist_measure:%d", _cursor_disdance_list.size());
     if (_cursor_disdance_list.size() > Max_Measure_Limits)
         return;
 
@@ -384,6 +385,8 @@ void MeasureDock::del_dist_measure()
             break;
         }
     }
+
+   // dsv_info("del_dist_measure:%d", _cursor_disdance_list.size());
 }
 
 void MeasureDock::add_edge_measure()
diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
index 23d3d17e..bce0091a 100644
--- a/DSView/pv/view/viewport.cpp
+++ b/DSView/pv/view/viewport.cpp
@@ -45,6 +45,7 @@
 #include "../log.h" 
 #include "../ui/langresource.h"
 #include "../ui/fn.h"
+#include "lissajoustrace.h"
 
 using namespace std;
 
@@ -299,11 +300,28 @@ void Viewport::paintSignals(QPainter &p, QColor fore, QColor back)
             _pixmap.fill(Qt::transparent);
 
             QPainter dbp(&_pixmap);
+
+            bool isLissa = false;
+
+            if (_view.session().get_device()->get_work_mode() == DSO)
+            {
+                auto lis_trace = _view.session().get_lissajous_trace();
+                if (lis_trace && lis_trace->enabled()){
+                    isLissa = true;
+                }
+            }
            
             for(auto t : traces)
             {
                 if (t->enabled())
+                {   
+                    if (isLissa && t->signal_type() == SR_CHANNEL_DSO)
+                        continue;
+                    if (isLissa && t->signal_type() == SR_CHANNEL_MATH)
+                        continue;
+                    
                     t->paint_mid(dbp, 0, t->get_view_rect().right(), fore, back);
+                }                    
             }
             _need_update = false;
         }