* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-CursorPair::CursorPair(const View &view) :
- _first(view, 0.0, _second),
- _second(view, 1.0, _first),
- _view(view)
+CursorPair::CursorPair(View &view) :
+ first_(new Cursor(view, 0.0)),
+ second_(new Cursor(view, 1.0)),
+ view_(view)
- _text_size.width() + View::LabelPadding.width() * 2,
- _text_size.height() + View::LabelPadding.height() * 2);
+ text_size_.width() + View::LabelPadding.width() * 2,
+ text_size_.height() + View::LabelPadding.height() * 2);
const pair<float, float> offsets(get_cursor_offsets());
const pair<float, float> normal_offsets(
(offsets.first < offsets.second) ? offsets :
const pair<float, float> offsets(get_cursor_offsets());
const pair<float, float> normal_offsets(
(offsets.first < offsets.second) ? offsets :
-void CursorPair::draw_markers(QPainter &p,
- const QRect &rect, unsigned int prefix)
+void CursorPair::draw_markers(QPainter &p, const QRect &rect)
compute_text_size(p, prefix);
QRectF delta_rect(get_label_rect(rect));
const int radius = delta_rect.height() / 2;
const QRectF text_rect(delta_rect.intersected(
rect).adjusted(radius, 0, -radius, 0));
compute_text_size(p, prefix);
QRectF delta_rect(get_label_rect(rect));
const int radius = delta_rect.height() / 2;
const QRectF text_rect(delta_rect.intersected(
rect).adjusted(radius, 0, -radius, 0));
p.setPen(Cursor::TextColour);
p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
p.setPen(Cursor::TextColour);
p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
- _first.paint_label(p, rect, prefix);
- _second.paint_label(p, rect, prefix);
+ first_->paint_label(p, rect);
+ second_->paint_label(p, rect);
- _text_size = p.boundingRect(QRectF(), 0, Ruler::format_time(
- _second.time() - _first.time(), prefix, 2)).size();
+ assert(first_);
+ assert(second_);
+
+ text_size_ = p.boundingRect(QRectF(), 0, pv::util::format_time(
+ second_->time() - first_->time(), prefix, 2)).size();
- (_first.time() - _view.offset()) / _view.scale(),
- (_second.time() - _view.offset()) / _view.scale());
+ (first_->time() - view_.offset()) / view_.scale(),
+ (second_->time() - view_.offset()) / view_.scale());