X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=05b9dfcad744bb6fb996ac4d91e178241bbe1702;hp=e0e3de65f3c9adc427f0ae877e79f0fcb4b0de1e;hb=5ed05b699e5367bae21828f533e3d169b9bab348;hpb=efdec55aec1a137460fa362a381ed1904182bfed diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp index e0e3de65..05b9dfca 100644 --- a/pv/view/cursorpair.cpp +++ b/pv/view/cursorpair.cpp @@ -19,12 +19,12 @@ #include "cursorpair.hpp" +#include "pv/util.hpp" #include "ruler.hpp" #include "view.hpp" -#include "pv/util.hpp" -#include #include +#include using std::max; using std::make_pair; @@ -144,7 +144,7 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover) } } -void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) +void CursorPair::paint_back(QPainter &p, ViewItemPaintParams &pp) { if (!enabled()) return; @@ -187,9 +187,7 @@ pair CursorPair::get_cursor_offsets() const assert(first_); assert(second_); - return pair( - ((first_->time() - view_.offset()) / view_.scale()).convert_to(), - ((second_->time() - view_.offset()) / view_.scale()).convert_to()); + return pair(first_->get_x(), second_->get_x()); } } // namespace TraceView