projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added pv::view::MarginWidget as a common base class of Header and Ruler
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index 8fed4273e86d40beeac77329f60e60f0c6f9ecf7..ae180e19a47a228a35f8d1151658b3f1b14973c2 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-20,6
+20,9
@@
#include <extdef.h>
#include <extdef.h>
+#include <assert.h>
+#include <math.h>
+
#include <QApplication>
#include "signal.h"
#include <QApplication>
#include "signal.h"
@@
-29,13
+32,15
@@
namespace pv {
namespace view {
const int Signal::LabelHitPadding = 2;
namespace view {
const int Signal::LabelHitPadding = 2;
-const int Signal::LabelHighlightRadius = 6;
-Signal::Signal(QString name) :
- _name(name),
- _v_offset(0),
- _selected(false)
+const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
+
+Signal::Signal(const sr_probe *const probe) :
+ _probe(probe),
+ _name(probe->name),
+ _v_offset(0)
{
{
+ assert(_probe);
}
QString Signal::get_name() const
}
QString Signal::get_name() const
@@
-68,31
+73,23
@@
void Signal::set_v_offset(int v_offset)
_v_offset = v_offset;
}
_v_offset = v_offset;
}
-bool Signal::selected() const
-{
- return _selected;
-}
-
-void Signal::select(bool select)
-{
- _selected = select;
-}
-
-void Signal::paint_label(QPainter &p, const QRect &rect, bool hover)
+void Signal::paint_label(QPainter &p, int y, int right, bool hover)
{
p.setBrush(_colour);
{
p.setBrush(_colour);
+ if (!_probe->enabled)
+ return;
+
const QColor colour = get_colour();
const QColor colour = get_colour();
- const float nominal_offset = get_nominal_offset(rect);
compute_text_size(p);
compute_text_size(p);
- const QRectF label_rect = get_label_rect(
rec
t);
+ const QRectF label_rect = get_label_rect(
y, righ
t);
// Paint the label
const QPointF points[] = {
label_rect.topLeft(),
label_rect.topRight(),
// Paint the label
const QPointF points[] = {
label_rect.topLeft(),
label_rect.topRight(),
- QPointF(r
ect.right(), nominal_offset
),
+ QPointF(r
ight, y
),
label_rect.bottomRight(),
label_rect.bottomLeft()
};
label_rect.bottomRight(),
label_rect.bottomLeft()
};
@@
-100,15
+97,13
@@
void Signal::paint_label(QPainter &p, const QRect &rect, bool hover)
const QPointF highlight_points[] = {
QPointF(label_rect.left() + 1, label_rect.top() + 1),
QPointF(label_rect.right(), label_rect.top() + 1),
const QPointF highlight_points[] = {
QPointF(label_rect.left() + 1, label_rect.top() + 1),
QPointF(label_rect.right(), label_rect.top() + 1),
- QPointF(r
ect.right() - 1, nominal_offset
),
+ QPointF(r
ight - 1, y
),
QPointF(label_rect.right(), label_rect.bottom() - 1),
QPointF(label_rect.left() + 1, label_rect.bottom() - 1)
};
QPointF(label_rect.right(), label_rect.bottom() - 1),
QPointF(label_rect.left() + 1, label_rect.bottom() - 1)
};
- if(_selected) {
- p.setPen(QPen(QApplication::palette().brush(
- QPalette::Highlight), LabelHighlightRadius,
- Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+ if (selected()) {
+ p.setPen(highlight_pen());
p.setBrush(Qt::transparent);
p.drawPolygon(points, countof(points));
}
p.setBrush(Qt::transparent);
p.drawPolygon(points, countof(points));
}
@@
-130,35
+125,43
@@
void Signal::paint_label(QPainter &p, const QRect &rect, bool hover)
p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
}
p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
}
-bool Signal::pt_in_label_rect(const QRect &rect, const QPoint &point)
+bool Signal::pt_in_label_rect(int y, int left, int right,
+ const QPoint &point)
{
{
- const QRectF label = get_label_rect(rect);
+ (void)left;
+
+ const QRectF label = get_label_rect(y, right);
return QRectF(
QPointF(label.left() - LabelHitPadding,
label.top() - LabelHitPadding),
return QRectF(
QPointF(label.left() - LabelHitPadding,
label.top() - LabelHitPadding),
- QPointF(rect.right(),
- label.bottom() + LabelHitPadding)
- ).contains(point);
+ QPointF(right, label.bottom() + LabelHitPadding)
+ ).contains(point);
+}
+
+void Signal::paint_axis(QPainter &p, int y, int left, int right)
+{
+ p.setPen(SignalAxisPen);
+ p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
}
void Signal::compute_text_size(QPainter &p)
{
}
void Signal::compute_text_size(QPainter &p)
{
- _text_size = p.boundingRect(QRectF(), 0, _name).size();
+ _text_size = QSize(
+ p.boundingRect(QRectF(), 0, _name).width(),
+ p.boundingRect(QRectF(), 0, "Tg").height());
}
}
-QRectF Signal::get_label_rect(
const QRect &rec
t)
+QRectF Signal::get_label_rect(
int y, int righ
t)
{
using pv::view::View;
{
using pv::view::View;
- const float nominal_offset = get_nominal_offset(rect) + 0.5;
const QSizeF label_size(
_text_size.width() + View::LabelPadding.width() * 2,
const QSizeF label_size(
_text_size.width() + View::LabelPadding.width() * 2,
-
_text_size.height() + View::LabelPadding.height(
) * 2);
+
ceilf((_text_size.height() + View::LabelPadding.height() * 2) / 2
) * 2);
const float label_arrow_length = label_size.height() / 2;
return QRectF(
const float label_arrow_length = label_size.height() / 2;
return QRectF(
- rect.right() - label_arrow_length -
- label_size.width() - 0.5,
- nominal_offset - label_size.height() / 2,
+ right - label_arrow_length - label_size.width() - 0.5,
+ y + 0.5f - label_size.height() / 2,
label_size.width(), label_size.height());
}
label_size.width(), label_size.height());
}