TabularDecView: Allow return/enter press and don't change scale

[pulseview.git] / pv / views / trace / triggermarker.hpp

diff --git a/pv/views/trace/triggermarker.hpp b/pv/views/trace/triggermarker.hpp
index dc9c0e9381c997aa99fcce9971529f856e0a4628..40c096c0292fa32778c078f0a26bb5fbb1059789 100644 (file)
--- a/pv/views/trace/triggermarker.hpp
+++ b/pv/views/trace/triggermarker.hpp
@@ -17,21 +17,27 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRIGGER_MARKER_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRIGGER_MARKER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRIGGERMARKER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRIGGERMARKER_HPP
 
 #include "timeitem.hpp"
 
+#include <QPoint>
+
 namespace pv {
 namespace views {
 namespace trace {
 
+/**
+ * The TriggerMarker class is used to show to the user at what point in time
+ * a trigger occured. It is not editable by the user.
+ */
 class TriggerMarker : public TimeItem
 {
        Q_OBJECT
 
 public:
-       static const QColor Colour;
+       static const QColor Color;
 
 public:
        /**
@@ -54,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;
 
        /**
@@ -84,4 +92,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRIGGER_MARKER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRIGGERMARKER_HPP