projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Make traces only selectable in the header area"
[pulseview.git]
/
pv
/
view
/
trace.hpp
diff --git
a/pv/view/trace.hpp
b/pv/view/trace.hpp
index 8c99191790e6aa7e6c783a0c0b5d9a95f678c19d..acaa341adbadd55f477e32d1f3e01d9cd4c662f6 100644
(file)
--- a/
pv/view/trace.hpp
+++ b/
pv/view/trace.hpp
@@
-49,6
+49,9
@@
private:
static const QPen AxisPen;
static const int LabelHitPadding;
static const QPen AxisPen;
static const int LabelHitPadding;
+ static const QColor BrightBGColour;
+ static const QColor DarkBGColour;
+
protected:
Trace(QString name);
protected:
Trace(QString name);
@@
-73,12
+76,22
@@
public:
*/
void set_colour(QColor colour);
*/
void set_colour(QColor colour);
+ /**
+ * Enables or disables the coloured background for this trace.
+ */
+ void set_coloured_bg(bool state);
+
+ /**
+ * Returns true if the item may be dragged/moved.
+ */
+ bool is_draggable() const;
+
/**
* Computes the outline rectangle of the viewport hit-box.
* @param rect the rectangle of the viewport area.
* @return Returns the rectangle of the hit-box.
*/
/**
* Computes the outline rectangle of the viewport hit-box.
* @param rect the rectangle of the viewport area.
* @return Returns the rectangle of the hit-box.
*/
- QRectF hit_box_rect(const
QRectF &rect
) const;
+ QRectF hit_box_rect(const
ViewItemPaintParams &pp
) const;
/**
* Paints the signal label.
/**
* Paints the signal label.
@@
-100,6
+113,13
@@
public:
QRectF label_rect(const QRectF &rect) const;
protected:
QRectF label_rect(const QRectF &rect) const;
protected:
+ /**
+ * Paints the background layer of the signal with a QPainter.
+ * @param p The QPainter to paint into.
+ * @param pp The painting parameters object to paint with.
+ */
+ virtual void paint_back(QPainter &p, const ViewItemPaintParams &pp);
+
/**
* Paints a zero axis across the viewport.
* @param p the QPainter to paint into.
/**
* Paints a zero axis across the viewport.
* @param p the QPainter to paint into.
@@
-123,7
+143,8
@@
private Q_SLOTS:
protected:
QString name_;
protected:
QString name_;
- QColor colour_;
+ QColor colour_, bgcolour_;
+ bool coloured_bg_, coloured_bg_state_;
private:
pv::widgets::Popup *popup_;
private:
pv::widgets::Popup *popup_;