X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftriggermarker.cpp;h=843ccd49b35475dc273e8d0ae3fbed9f5bd04d0c;hb=93dbad3ed4954c3e0c140c26e867bda219cd683f;hp=031bc5d9d3cb9a03d86eb5dc4736b78c66ef87e0;hpb=963be49714665b5b12b29937875d432660ff4bc1;p=pulseview.git diff --git a/pv/views/trace/triggermarker.cpp b/pv/views/trace/triggermarker.cpp index 031bc5d9..843ccd49 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), @@ -43,8 +43,9 @@ bool TriggerMarker::enabled() const return true; } -bool TriggerMarker::is_draggable() const +bool TriggerMarker::is_draggable(QPoint pos) const { + (void)pos; return false; } @@ -55,6 +56,11 @@ void TriggerMarker::set_time(const pv::util::Timestamp& time) view_.time_item_appearance_changed(true, true); } +const pv::util::Timestamp TriggerMarker::time() const +{ + return time_; +} + float TriggerMarker::get_x() const { return ((time_ - view_.offset()) / view_.scale()).convert_to(); @@ -73,7 +79,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();