X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftriggermarker.cpp;h=7ef5454a8a5ccb9aa3d64c500f0ca01f598e3368;hp=31afba1c538e3214af64c32039276cc82746221d;hb=641574bcc118be0b6dc3a65039ab3497f9d7241a;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff diff --git a/pv/views/trace/triggermarker.cpp b/pv/views/trace/triggermarker.cpp index 31afba1c..7ef5454a 100644 --- a/pv/views/trace/triggermarker.cpp +++ b/pv/views/trace/triggermarker.cpp @@ -24,7 +24,7 @@ namespace pv { namespace views { namespace trace { -const QColor TriggerMarker::Colour(0x00, 0x00, 0xB0); +const QColor TriggerMarker::Color(0x00, 0x00, 0xB0); 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(); } -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) @@ -70,7 +73,7 @@ void TriggerMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp) if (!enabled()) return; - QPen pen(Colour); + QPen pen(Color); pen.setStyle(Qt::DashLine); const float x = get_x();