Embedded/DSView
1
0
Fork 0
mirror of https://github.com/DreamSourceLab/DSView.git synced 2025-01-13 13:32:53 +08:00
Code Issues Projects Releases Wiki Activity

Disable the math trace when lissajous trace is enabled

Browse Source
This commit is contained in:
dreamsourcelabTAI 2023-06-17 18:40:08 +08:00
parent 4bdc0809d6
commit 832f3a033c
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DSView/pv/dock/measuredock.cpp
View File

@ -323,6 +323,7 @@ void MeasureDock::goto_cursor()
void MeasureDock::add_dist_measure() void MeasureDock::add_dist_measure()
{ {
// dsv_info("add_dist_measure:%d", _cursor_disdance_list.size());
if (_cursor_disdance_list.size() > Max_Measure_Limits) if (_cursor_disdance_list.size() > Max_Measure_Limits)
return; return;
@ -384,6 +385,8 @@ void MeasureDock::del_dist_measure()
break; break;
} }
} }
// dsv_info("del_dist_measure:%d", _cursor_disdance_list.size());
} }
void MeasureDock::add_edge_measure() void MeasureDock::add_edge_measure()

18
DSView/pv/view/viewport.cpp
View File

@ -45,6 +45,7 @@
#include "../log.h" #include "../log.h"
#include "../ui/langresource.h" #include "../ui/langresource.h"
#include "../ui/fn.h" #include "../ui/fn.h"
#include "lissajoustrace.h"
using namespace std; using namespace std;
@ -299,11 +300,28 @@ void Viewport::paintSignals(QPainter &p, QColor fore, QColor back)
_pixmap.fill(Qt::transparent); _pixmap.fill(Qt::transparent);
QPainter dbp(&_pixmap); 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) for(auto t : traces)
{ {
if (t->enabled()) 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); t->paint_mid(dbp, 0, t->get_view_rect().right(), fore, back);
}
} }
_need_update = false; _need_update = false;
} }