projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TraceTreeItem: Separated from RowItem
[pulseview.git]
/
pv
/
view
/
trace.hpp
diff --git
a/pv/view/trace.hpp
b/pv/view/trace.hpp
index c0b94df26c00f86fbf61b5d673131e95a472165e..8c99191790e6aa7e6c783a0c0b5d9a95f678c19d 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
@@
-73,14
+73,20
@@
public:
*/
void set_colour(QColor colour);
*/
void set_colour(QColor colour);
+ /**
+ * 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;
+
/**
* Paints the signal label.
* @param p the QPainter to paint into.
/**
* Paints the signal label.
* @param p the QPainter to paint into.
- * @param right the x-coordinate of the right edge of the header
- * area.
+ * @param rect the rectangle of the header area.
* @param hover true if the label is being hovered over by the mouse.
*/
* @param hover true if the label is being hovered over by the mouse.
*/
- virtual void paint_label(QPainter &p,
int righ
t, bool hover);
+ virtual void paint_label(QPainter &p,
const QRect &rec
t, bool hover);
virtual QMenu* create_context_menu(QWidget *parent);
virtual QMenu* create_context_menu(QWidget *parent);
@@
-88,29
+94,19
@@
public:
/**
* Computes the outline rectangle of a label.
/**
* Computes the outline rectangle of a label.
- * @param right the x-coordinate of the right edge of the header
- * area.
+ * @param rect the rectangle of the header area.
* @return Returns the rectangle of the signal label.
*/
* @return Returns the rectangle of the signal label.
*/
- QRectF label_rect(
int righ
t) const;
+ QRectF label_rect(
const QRectF &rec
t) const;
protected:
protected:
-
- /**
- * Gets the text colour.
- * @remarks This colour is computed by comparing the lightness
- * of the trace colour against a threshold to determine whether
- * white or black would be more visible.
- */
- QColor get_text_colour() const;
-
/**
* Paints a zero axis across the viewport.
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
* @param y the y-offset of the axis.
*/
/**
* Paints a zero axis across the viewport.
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
* @param y the y-offset of the axis.
*/
- void paint_axis(QPainter &p, const
Ro
wItemPaintParams &pp, int y);
+ void paint_axis(QPainter &p, const
Vie
wItemPaintParams &pp, int y);
void add_colour_option(QWidget *parent, QFormLayout *form);
void add_colour_option(QWidget *parent, QFormLayout *form);
@@
-137,4
+133,4
@@
private:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_TRACE_H
+#endif // PULSEVIEW_PV_VIEW_TRACE_H
PP