projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
InputFile: Use new reset() function to allow re-reading file
[pulseview.git]
/
pv
/
view
/
trace.hpp
diff --git
a/pv/view/trace.hpp
b/pv/view/trace.hpp
index 74daf4a53cd69d8303709b0ae3a57da92830cab2..4e95f5654724945e25093d8e7d407ca5e74a2ca4 100644
(file)
--- a/
pv/view/trace.hpp
+++ b/
pv/view/trace.hpp
@@
-49,6
+49,10
@@
private:
static const QPen AxisPen;
static const int LabelHitPadding;
static const QPen AxisPen;
static const int LabelHitPadding;
+ static const int ColourBGAlpha;
+ static const QColor BrightGrayBGColour;
+ static const QColor DarkGrayBGColour;
+
protected:
Trace(QString name);
protected:
Trace(QString name);
@@
-78,13
+82,6
@@
public:
*/
void set_coloured_bg(bool state);
*/
void set_coloured_bg(bool state);
- /**
- * 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 ViewItemPaintParams &pp) const;
-
/**
* Paints the signal label.
* @param p the QPainter to paint into.
/**
* Paints the signal label.
* @param p the QPainter to paint into.
@@
-106,9
+103,9
@@
public:
protected:
/**
protected:
/**
- * Paints the background layer of the signal with a QPainter
- * @param p
t
he QPainter to paint into.
- * @param pp
the painting parameters object to paint with.
.
+ * Paints the background layer of the signal with a QPainter
.
+ * @param p
T
he QPainter to paint into.
+ * @param pp
The painting parameters object to paint with
.
*/
virtual void paint_back(QPainter &p, const ViewItemPaintParams &pp);
*/
virtual void paint_back(QPainter &p, const ViewItemPaintParams &pp);
@@
-136,7
+133,7
@@
private Q_SLOTS:
protected:
QString name_;
QColor colour_, bgcolour_;
protected:
QString name_;
QColor colour_, bgcolour_;
- bool coloured_bg_;
+ bool coloured_bg_
, coloured_bg_state_
;
private:
pv::widgets::Popup *popup_;
private:
pv::widgets::Popup *popup_;