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 9299e9326234b62fdc323009598f312fe14f5975..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,15
+32,15
@@
namespace pv {
namespace view {
const int Signal::LabelHitPadding = 2;
namespace view {
const int Signal::LabelHitPadding = 2;
-const int Signal::LabelHighlightRadius = 6;
const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
-Signal::Signal(
QString nam
e) :
- _
name(nam
e),
- _
v_offset(0
),
- _
selected(false
)
+Signal::Signal(
const sr_probe *const prob
e) :
+ _
probe(prob
e),
+ _
name(probe->name
),
+ _
v_offset(0
)
{
{
+ assert(_probe);
}
QString Signal::get_name() const
}
QString Signal::get_name() const
@@
-70,20
+73,13
@@
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, int y, int right, bool hover)
{
p.setBrush(_colour);
void Signal::paint_label(QPainter &p, int y, int right, bool hover)
{
p.setBrush(_colour);
+ if (!_probe->enabled)
+ return;
+
const QColor colour = get_colour();
compute_text_size(p);
const QColor colour = get_colour();
compute_text_size(p);
@@
-106,10
+102,8
@@
void Signal::paint_label(QPainter &p, int y, int right, bool hover)
QPointF(label_rect.left() + 1, 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));
}
@@
-163,7
+157,7
@@
QRectF Signal::get_label_rect(int y, int right)
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(
right - label_arrow_length - label_size.width() - 0.5,
const float label_arrow_length = label_size.height() / 2;
return QRectF(
right - label_arrow_length - label_size.width() - 0.5,