projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecodeTrace: Replace magic number by proper calculation
[pulseview.git]
/
pv
/
view
/
trace.hpp
diff --git
a/pv/view/trace.hpp
b/pv/view/trace.hpp
index 294946155cc2f20f2737c2452428e293a44e5b17..cb5ac15c6ec2173f14cc3d7dbde1ac298a7a333e 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,6
+76,11
@@
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);
+
/**
* Paints the signal label.
* @param p the QPainter to paint into.
/**
* Paints the signal label.
* @param p the QPainter to paint into.
@@
-93,6
+101,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.
@@
-116,7
+131,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_;
@@
-126,4
+142,4
@@
private:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_TRACE_H
+#endif // PULSEVIEW_PV_VIEW_TRACE_H
PP