projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
View: Store CursorPair in a shared_ptr
[pulseview.git]
/
pv
/
view
/
cursorpair.cpp
diff --git
a/pv/view/cursorpair.cpp
b/pv/view/cursorpair.cpp
index 8aba0abd1274a7fc778d89a70d8df06fe67347a3..0370793d0407b9a9d8db11dc55e592f50ef53732 100644
(file)
--- a/
pv/view/cursorpair.cpp
+++ b/
pv/view/cursorpair.cpp
@@
-38,12
+38,17
@@
namespace view {
const int CursorPair::DeltaPadding = 8;
CursorPair::CursorPair(View &view) :
const int CursorPair::DeltaPadding = 8;
CursorPair::CursorPair(View &view) :
+ TimeItem(view),
first_(new Cursor(view, 0.0)),
first_(new Cursor(view, 0.0)),
- second_(new Cursor(view, 1.0)),
- view_(view)
+ second_(new Cursor(view, 1.0))
{
}
{
}
+bool CursorPair::enabled() const
+{
+ return view_.cursors_shown();
+}
+
shared_ptr<Cursor> CursorPair::first() const
{
return first_;
shared_ptr<Cursor> CursorPair::first() const
{
return first_;
@@
-54,6
+59,17
@@
shared_ptr<Cursor> CursorPair::second() const
return second_;
}
return second_;
}
+QPoint CursorPair::point() const
+{
+ return first_->point();
+}
+
+pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
+{
+ (void)parent;
+ return nullptr;
+}
+
QRectF CursorPair::get_label_rect(const QRect &rect) const
{
const QSizeF label_size(
QRectF CursorPair::get_label_rect(const QRect &rect) const
{
const QSizeF label_size(
@@
-70,7
+86,7
@@
QRectF CursorPair::get_label_rect(const QRect &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() -
-
Cursor::ArrowSize - Curso
r::Offset - 0.5f,
+
TimeMarker::ArrowSize - TimeMarke
r::Offset - 0.5f,
right - left, height);
}
right - left, height);
}
@@
-92,14
+108,15
@@
void CursorPair::draw_markers(QPainter &p, const QRect &rect)
const int highlight_radius = delta_rect.height() / 2 - 2;
p.setBrush(Cursor::FillColour);
const int highlight_radius = delta_rect.height() / 2 - 2;
p.setBrush(Cursor::FillColour);
- p.setPen(Cursor::
LineColour
);
+ p.setPen(Cursor::
FillColour.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::
HighlightColour
);
+ p.setPen(Cursor::
FillColour.lighter()
);
p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
- p.setPen(Cursor::TextColour);
+ p.setPen(SelectableItem::select_text_colour(
+ Cursor::FillColour));
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));
}