projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Annotation: Use special type for the class, not plain int
[pulseview.git]
/
pv
/
views
/
trace
/
triggermarker.cpp
diff --git
a/pv/views/trace/triggermarker.cpp
b/pv/views/trace/triggermarker.cpp
index 31afba1c538e3214af64c32039276cc82746221d..7ef5454a8a5ccb9aa3d64c500f0ca01f598e3368 100644
(file)
--- a/
pv/views/trace/triggermarker.cpp
+++ b/
pv/views/trace/triggermarker.cpp
@@
-24,7
+24,7
@@
namespace pv {
namespace views {
namespace trace {
namespace views {
namespace trace {
-const QColor TriggerMarker::Colo
u
r(0x00, 0x00, 0xB0);
+const QColor TriggerMarker::Color(0x00, 0x00, 0xB0);
TriggerMarker::TriggerMarker(View &view, const pv::util::Timestamp& time) :
TimeItem(view),
TriggerMarker::TriggerMarker(View &view, const pv::util::Timestamp& time) :
TimeItem(view),
@@
-60,9
+60,12
@@
float TriggerMarker::get_x() const
return ((time_ - view_.offset()) / view_.scale()).convert_to<float>();
}
return ((time_ - view_.offset()) / view_.scale()).convert_to<float>();
}
-QPoint TriggerMarker::point(const QRect &rect) const
+QPoint TriggerMarker::
drag_
point(const QRect &rect) const
{
{
- return QPoint(get_x(), rect.bottom());
+ (void)rect;
+
+ // The trigger marker cannot be moved, so there is no drag point
+ return QPoint(INT_MIN, INT_MIN);
}
void TriggerMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp)
}
void TriggerMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp)
@@
-70,7
+73,7
@@
void TriggerMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp)
if (!enabled())
return;
if (!enabled())
return;
- QPen pen(Colo
u
r);
+ QPen pen(Color);
pen.setStyle(Qt::DashLine);
const float x = get_x();
pen.setStyle(Qt::DashLine);
const float x = get_x();