projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change QApplication::translate to tr, removing deprecated UTF8 parameter
[pulseview.git]
/
pv
/
view
/
trace.cpp
diff --git
a/pv/view/trace.cpp
b/pv/view/trace.cpp
index 4fe9628c587e19228dbf013841045c0a3c67f891..d10448f3eac071b535df4c25148a42700eb70486 100644
(file)
--- a/
pv/view/trace.cpp
+++ b/
pv/view/trace.cpp
@@
-40,8
+40,7
@@
namespace view {
const QPen Trace::AxisPen(QColor(128, 128, 128, 64));
const int Trace::LabelHitPadding = 2;
const QPen Trace::AxisPen(QColor(128, 128, 128, 64));
const int Trace::LabelHitPadding = 2;
-Trace::Trace(pv::SigSession &session, QString name) :
- _session(session),
+Trace::Trace(QString name) :
_name(name),
_v_offset(0),
_popup(NULL),
_name(name),
_v_offset(0),
_popup(NULL),
@@
-166,7
+165,7
@@
bool Trace::pt_in_label_rect(int left, int right, const QPoint &point)
(void)left;
const QRectF label = get_label_rect(right);
(void)left;
const QRectF label = get_label_rect(right);
- return QRectF(
+ return
enabled() &&
QRectF(
QPointF(label.left() - LabelHitPadding,
label.top() - LabelHitPadding),
QPointF(right, label.bottom() + LabelHitPadding)
QPointF(label.left() - LabelHitPadding,
label.top() - LabelHitPadding),
QPointF(right, label.bottom() + LabelHitPadding)