projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manpage: Document the new 'b' keyboard shortcut.
[pulseview.git]
/
pv
/
view
/
trace.hpp
diff --git
a/pv/view/trace.hpp
b/pv/view/trace.hpp
index e6e053dac26c114828843b508a13c4bdb4819067..95efb60718df78f02b457f759028759cf39a7507 100644
(file)
--- a/
pv/view/trace.hpp
+++ b/
pv/view/trace.hpp
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_VIEW_TRACE_H
-#define PULSEVIEW_PV_VIEW_TRACE_H
+#ifndef PULSEVIEW_PV_VIEW_TRACE_H
PP
+#define PULSEVIEW_PV_VIEW_TRACE_H
PP
#include <QColor>
#include <QPainter>
#include <QColor>
#include <QPainter>
@@
-29,7
+29,7
@@
#include <stdint.h>
#include <stdint.h>
-#include "
row
item.hpp"
+#include "
tracetree
item.hpp"
class QFormLayout;
class QFormLayout;
@@
-41,7
+41,7
@@
class Popup;
namespace view {
namespace view {
-class Trace : public
Row
Item
+class Trace : public
TraceTree
Item
{
Q_OBJECT
{
Q_OBJECT
@@
-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,17
@@
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);
+
/**
* 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
+108,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
+138,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_;
@@
-133,4
+149,4
@@
private:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_TRACE_H
+#endif // PULSEVIEW_PV_VIEW_TRACE_H
PP