projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bar displaying undecoded area
[pulseview.git]
/
pv
/
views
/
trace
/
cursorpair.cpp
diff --git
a/pv/views/trace/cursorpair.cpp
b/pv/views/trace/cursorpair.cpp
index 9a8744054bb0792fafded3281bf8686a7fe26c50..86198c5217a2f1129bc750d6f553f2ee51c6eeea 100644
(file)
--- a/
pv/views/trace/cursorpair.cpp
+++ b/
pv/views/trace/cursorpair.cpp
@@
-37,7
+37,7
@@
namespace views {
namespace trace {
const int CursorPair::DeltaPadding = 8;
namespace trace {
const int CursorPair::DeltaPadding = 8;
-const QColor CursorPair::ViewportFillColo
u
r(220, 231, 243);
+const QColor CursorPair::ViewportFillColor(220, 231, 243);
CursorPair::CursorPair(View &view) :
TimeItem(view),
CursorPair::CursorPair(View &view) :
TimeItem(view),
@@
-73,9
+73,9
@@
float CursorPair::get_x() const
return (first_->get_x() + second_->get_x()) / 2.0f;
}
return (first_->get_x() + second_->get_x()) / 2.0f;
}
-QPoint CursorPair::point(const QRect &rect) const
+QPoint CursorPair::
drag_
point(const QRect &rect) const
{
{
- return first_->point(rect);
+ return first_->
drag_
point(rect);
}
pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
}
pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
@@
-110,10
+110,10
@@
void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
if (!enabled())
return;
if (!enabled())
return;
- const QColor text_colo
u
r =
- ViewItem::select_text_colo
ur(Cursor::FillColou
r);
+ const QColor text_color =
+ ViewItem::select_text_colo
r(Cursor::FillColo
r);
- p.setPen(text_colo
u
r);
+ p.setPen(text_color);
compute_text_size(p);
QRectF delta_rect(label_rect(rect));
compute_text_size(p);
QRectF delta_rect(label_rect(rect));
@@
-129,16
+129,16
@@
void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
p.drawRoundedRect(delta_rect, radius, radius);
}
p.drawRoundedRect(delta_rect, radius, radius);
}
- p.setBrush(hover ? Cursor::FillColo
u
r.lighter() :
- Cursor::FillColo
u
r);
- p.setPen(Cursor::FillColo
u
r.darker());
+ p.setBrush(hover ? Cursor::FillColor.lighter() :
+ Cursor::FillColor);
+ p.setPen(Cursor::FillColor.darker());
p.drawRoundedRect(delta_rect, radius, radius);
delta_rect.adjust(1, 1, -1, -1);
p.drawRoundedRect(delta_rect, radius, radius);
delta_rect.adjust(1, 1, -1, -1);
- p.setPen(Cursor::FillColo
u
r.lighter());
+ p.setPen(Cursor::FillColor.lighter());
p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
- p.setPen(text_colo
u
r);
+ p.setPen(text_color);
p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
format_string());
}
p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
format_string());
}
@@
-150,7
+150,7
@@
void CursorPair::paint_back(QPainter &p, ViewItemPaintParams &pp)
return;
p.setPen(Qt::NoPen);
return;
p.setPen(Qt::NoPen);
- p.setBrush(QBrush(ViewportFillColo
u
r));
+ p.setBrush(QBrush(ViewportFillColor));
const pair<float, float> offsets(get_cursor_offsets());
const int l = (int)max(min(
const pair<float, float> offsets(get_cursor_offsets());
const int l = (int)max(min(