X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fviews%2Ftrace%2Ftrace.hpp;h=741f346957735c92aa1f62f1dc37e5cc3c85aad4;hb=8ff61402dc4ac33630deeb077e8a744a7daba6a4;hp=134f11024f3a8de618dd64354280b5817b9c69fa;hpb=89914a8657612761ff962ee973721a4872cda8d7;p=pulseview.git
diff --git a/pv/views/trace/trace.hpp b/pv/views/trace/trace.hpp
index 134f1102..741f3469 100644
--- a/pv/views/trace/trace.hpp
+++ b/pv/views/trace/trace.hpp
@@ -17,8 +17,8 @@
* along with this program; if not, see .
*/
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRACE_HPP
#include
#include
@@ -30,6 +30,7 @@
#include "tracetreeitem.hpp"
+#include
#include "pv/data/signalbase.hpp"
using std::shared_ptr;
@@ -59,7 +60,7 @@ namespace trace {
* For this reason, Trace is more generic and contains properties and helpers
* that benefit any kind of time series items.
*/
-class Trace : public TraceTreeItem
+class Trace : public TraceTreeItem, public GlobalSettingsInterface
{
Q_OBJECT
@@ -88,11 +89,13 @@ private:
static const QPen AxisPen;
static const int LabelHitPadding;
- static const QColor BrightGrayBGColour;
- static const QColor DarkGrayBGColour;
+ static const QColor BrightGrayBGColor;
+ static const QColor DarkGrayBGColor;
+ static const QColor ErrorBgColor;
protected:
- Trace(shared_ptr channel);
+ Trace(shared_ptr signal);
+ ~Trace();
public:
/**
@@ -101,20 +104,22 @@ public:
shared_ptr base() const;
/**
- * Sets the name of the signal.
+ * Returns true if the item may be selected.
*/
- virtual void set_name(QString name);
+ virtual bool is_selectable(QPoint pos) const;
/**
- * Set the colour of the signal.
+ * Returns true if the item may be dragged/moved.
*/
- virtual void set_colour(QColor colour);
+ virtual bool is_draggable(QPoint pos) const;
/**
* Configures the segment display mode to use.
*/
virtual void set_segment_display_mode(SegmentDisplayMode mode);
+ virtual void on_setting_changed(const QString &key, const QVariant &value);
+
/**
* Paints the signal label.
* @param p the QPainter to paint into.
@@ -123,7 +128,16 @@ public:
*/
virtual void paint_label(QPainter &p, const QRect &rect, bool hover);
- virtual QMenu* create_context_menu(QWidget *parent);
+ /**
+ * Paints the signal's current error message text.
+ * @param p the QPainter to paint into.
+ * @param pp The painting parameters object to paint with.
+ */
+ virtual void paint_error(QPainter &p, const ViewItemPaintParams &pp);
+
+ virtual QMenu* create_header_context_menu(QWidget *parent);
+
+ virtual QMenu* create_view_context_menu(QWidget *parent, QPoint &click_pos);
pv::widgets::Popup* create_popup(QWidget *parent);
@@ -134,10 +148,20 @@ public:
*/
QRectF label_rect(const QRectF &rect) const;
+ /**
+ * Computes the outline rectangle of the viewport hit-box.
+ * @param pp The painting parameters object to paint with.
+ * @return Returns the rectangle of the hit-box.
+ * @remarks The default implementation returns an empty hit-box.
+ */
+ virtual QRectF hit_box_rect(const ViewItemPaintParams &pp) const;
+
void set_current_segment(const int segment);
int get_current_segment() const;
+ virtual void hover_point_changed(const QPoint &hp);
+
protected:
/**
* Paints the background layer of the signal with a QPainter.
@@ -154,7 +178,13 @@ protected:
*/
void paint_axis(QPainter &p, ViewItemPaintParams &pp, int y);
- void add_colour_option(QWidget *parent, QFormLayout *form);
+ /**
+ * Draw a hover marker under the cursor position.
+ * @param p The painter to draw into.
+ */
+ void paint_hover_marker(QPainter &p);
+
+ void add_color_option(QWidget *parent, QFormLayout *form);
void create_popup_form();
@@ -162,21 +192,26 @@ protected:
protected Q_SLOTS:
virtual void on_name_changed(const QString &text);
-
- virtual void on_colour_changed(const QColor &colour);
+ virtual void on_color_changed(const QColor &color);
+ virtual void on_error_message_changed(const QString &msg);
void on_popup_closed();
private Q_SLOTS:
void on_nameedit_changed(const QString &name);
- void on_colouredit_changed(const QColor &colour);
+ void on_coloredit_changed(const QColor &color);
+
+ void on_create_marker_here() const;
protected:
shared_ptr base_;
QPen axis_pen_;
SegmentDisplayMode segment_display_mode_;
+ bool show_hover_marker_;
+
+ uint32_t context_menu_x_pos_;
/// The ID of the currently displayed segment
int current_segment_;
@@ -190,4 +225,4 @@ private:
} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRACE_HPP