X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=05b9dfcad744bb6fb996ac4d91e178241bbe1702;hb=e0ddc2a408e3b667ca8e15d8482ecdcb03d46d30;hp=e2c80833f2503631814a5ee1888f1088af13da69;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;p=pulseview.git
diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index e2c8083..05b9dfc 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -14,18 +14,17 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#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;
@@ -145,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;
@@ -188,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