X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=7b9f671f036f603809ec420d172cde2198d7f479;hp=d7723752b62e6952467ef5ec5c615df4f049c364;hb=60d9b99a32e551cffd2b537d3e157d578a761c9b;hpb=dae21ebcf60d6a5d7c194736b1dc792a5cbf06a5 diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp index d772375..7b9f671 100644 --- a/pv/view/cursorpair.cpp +++ b/pv/view/cursorpair.cpp @@ -60,8 +60,8 @@ shared_ptr CursorPair::second() const return second_; } -void CursorPair::set_time(double time) { - const double delta = second_->time() - first_->time(); +void CursorPair::set_time(const pv::util::Timestamp& time) { + const pv::util::Timestamp delta = second_->time() - first_->time(); first_->set_time(time); second_->set_time(time + delta); } @@ -162,7 +162,7 @@ void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) { QString CursorPair::format_string() { const unsigned int prefix = view_.tick_prefix(); - const double delta = second_->time() - first_->time(); + const pv::util::Timestamp delta = second_->time() - first_->time(); return QString("%1 / %2"). arg(util::format_time(delta, prefix, view_.time_unit(), 2)). arg(util::format_si_value(1.0 / fabs(delta), "Hz", -1, 4)); @@ -182,8 +182,8 @@ pair CursorPair::get_cursor_offsets() const assert(second_); return pair( - (first_->time() - view_.offset()) / view_.scale(), - (second_->time() - view_.offset()) / view_.scale()); + ((first_->time() - view_.offset()) / view_.scale()).convert_to(), + ((second_->time() - view_.offset()) / view_.scale()).convert_to()); } } // namespace view