projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix objectName warnings.
[pulseview.git]
/
pv
/
view
/
trace.cpp
diff --git
a/pv/view/trace.cpp
b/pv/view/trace.cpp
index ae8ee901a27316738434c6f8e64a29376a77496f..f23de2ff50b33cb2771468584b8b4c5051bf3fab 100644
(file)
--- a/
pv/view/trace.cpp
+++ b/
pv/view/trace.cpp
@@
-25,6
+25,7
@@
#include <QApplication>
#include <QFormLayout>
#include <QApplication>
#include <QFormLayout>
+#include <QKeyEvent>
#include <QLineEdit>
#include "trace.h"
#include <QLineEdit>
#include "trace.h"
@@
-32,6
+33,7
@@
#include "view.h"
#include <pv/widgets/colourbutton.h>
#include "view.h"
#include <pv/widgets/colourbutton.h>
+#include <pv/widgets/popup.h>
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-39,8
+41,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),
@@
-165,7
+166,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)