projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CursorPair: Moved in ViewportFillColour
[pulseview.git]
/
pv
/
view
/
cursorpair.cpp
diff --git
a/pv/view/cursorpair.cpp
b/pv/view/cursorpair.cpp
index 2ff32c53ef9fbbe4d46b2d1d8fb22425ee03626f..0395d03446d03abb72d6b5e8a92917e8b1f73bcd 100644
(file)
--- a/
pv/view/cursorpair.cpp
+++ b/
pv/view/cursorpair.cpp
@@
-36,6
+36,7
@@
namespace pv {
namespace view {
const int CursorPair::DeltaPadding = 8;
namespace view {
const int CursorPair::DeltaPadding = 8;
+const QColor CursorPair::ViewportFillColour(220, 231, 243);
CursorPair::CursorPair(View &view) :
TimeItem(view),
CursorPair::CursorPair(View &view) :
TimeItem(view),
@@
-97,17
+98,23
@@
QRectF CursorPair::label_rect(const QRectF &rect) const
(float)rect.width() + height);
return QRectF(left, rect.height() - label_size.height() -
(float)rect.width() + height);
return QRectF(left, rect.height() - label_size.height() -
- TimeMarker::ArrowSize -
TimeMarker::Offset -
0.5f,
+ TimeMarker::ArrowSize - 0.5f,
right - left, height);
}
right - left, height);
}
-void CursorPair::paint_label(QPainter &p, const QRect &rect)
+void CursorPair::paint_label(QPainter &p, const QRect &rect
, bool hover
)
{
assert(first_);
assert(second_);
{
assert(first_);
assert(second_);
+ if (!enabled())
+ return;
+
const unsigned int prefix = view_.tick_prefix();
const unsigned int prefix = view_.tick_prefix();
+ const QColor text_colour =
+ ViewItem::select_text_colour(Cursor::FillColour);
+ p.setPen(text_colour);
compute_text_size(p, prefix);
QRectF delta_rect(label_rect(rect));
compute_text_size(p, prefix);
QRectF delta_rect(label_rect(rect));
@@
-124,7
+131,8
@@
void CursorPair::paint_label(QPainter &p, const QRect &rect)
p.drawRoundedRect(delta_rect, radius, radius);
}
p.drawRoundedRect(delta_rect, radius, radius);
}
- p.setBrush(Cursor::FillColour);
+ p.setBrush(hover ? Cursor::FillColour.lighter() :
+ Cursor::FillColour);
p.setPen(Cursor::FillColour.darker());
p.drawRoundedRect(delta_rect, radius, radius);
p.setPen(Cursor::FillColour.darker());
p.drawRoundedRect(delta_rect, radius, radius);
@@
-132,40
+140,26
@@
void CursorPair::paint_label(QPainter &p, const QRect &rect)
p.setPen(Cursor::FillColour.lighter());
p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
p.setPen(Cursor::FillColour.lighter());
p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
- p.setPen(SelectableItem::select_text_colour(
- Cursor::FillColour));
+ p.setPen(text_colour);
p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
pv::util::format_time(second_->time() - first_->time(), prefix, 2));
}
p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
pv::util::format_time(second_->time() - first_->time(), prefix, 2));
}
-
- // Paint the cursor markers
- first_->paint_label(p, rect);
- second_->paint_label(p, rect);
}
}
-void CursorPair::draw_viewport_background(QPainter &p,
- const QRect &rect)
-{
+void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
+ if (!enabled())
+ return;
+
p.setPen(Qt::NoPen);
p.setPen(Qt::NoPen);
- p.setBrush(QBrush(View
::CursorArea
Colour));
+ p.setBrush(QBrush(View
portFill
Colour));
const pair<float, float> offsets(get_cursor_offsets());
const int l = (int)max(min(
offsets.first, offsets.second), 0.0f);
const int r = (int)min(max(
const pair<float, float> offsets(get_cursor_offsets());
const int l = (int)max(min(
offsets.first, offsets.second), 0.0f);
const int r = (int)min(max(
- offsets.first, offsets.second), (float)rect.width());
-
- p.drawRect(l, 0, r - l, rect.height());
-}
-
-void CursorPair::draw_viewport_foreground(QPainter &p,
- const QRect &rect)
-{
- assert(first_);
- assert(second_);
+ offsets.first, offsets.second), (float)pp.width());
- first_->paint(p, rect);
- second_->paint(p, rect);
+ p.drawRect(l, pp.top(), r - l, pp.height());
}
void CursorPair::compute_text_size(QPainter &p, unsigned int prefix)
}
void CursorPair::compute_text_size(QPainter &p, unsigned int prefix)