X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftriggermarker.hpp;h=222d3fb9f78c76450d75f9dde25b32f6dc1240c0;hb=0a952555b9d153f42912e47f35fac5dd4643fca9;hp=f2cee265c5514579fa05f17a329f0210c658720e;hpb=1373fec59223e7511078abe3dbf4a6b61b4af234;p=pulseview.git diff --git a/pv/views/trace/triggermarker.hpp b/pv/views/trace/triggermarker.hpp index f2cee265..222d3fb9 100644 --- a/pv/views/trace/triggermarker.hpp +++ b/pv/views/trace/triggermarker.hpp @@ -22,6 +22,8 @@ #include "timeitem.hpp" +#include + namespace pv { namespace views { namespace trace { @@ -35,7 +37,7 @@ class TriggerMarker : public TimeItem Q_OBJECT public: - static const QColor Colour; + static const QColor Color; public: /** @@ -58,13 +60,15 @@ public: /** Returns true if the item may be dragged/moved. */ - bool is_draggable() const override; + bool is_draggable(QPoint pos) const override; /** * Sets the time of the marker. */ void set_time(const pv::util::Timestamp& time) override; + virtual const pv::util::Timestamp time() const override; + float get_x() const override; /**