X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=03df054304f698132120674363f30d0753f5dde9;hb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;hp=1b30518e04024225586f8e7dbfcc073a57891989;hpb=8debe10dd47a5f519cd6e9069231f8e77c9c04e1;p=pulseview.git

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 1b30518..03df054 100644
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "cursor.h"
+#include "cursor.hpp"
 
-#include "ruler.h"
-#include "view.h"
+#include "view.hpp"
+#include "pv/util.hpp"
 
 #include <QBrush>
 #include <QPainter>
@@ -29,11 +29,12 @@
 #include <QRect>
 #include <QRectF>
 
-#include <stdio.h>
+#include <cassert>
+#include <cstdio>
 
 #include <extdef.h>
 
-using namespace boost;
+using std::shared_ptr;
 
 namespace pv {
 namespace view {
@@ -57,16 +58,16 @@ QRectF Cursor::get_label_rect(const QRect &rect) const
 	const shared_ptr<Cursor> other(get_other_cursor());
 	assert(other);
 
-	const float x = (_time - _view.offset()) / _view.scale();
+	const float x = (time_ - view_.offset()) / view_.scale();
 
 	const QSizeF label_size(
-		_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 float top = rect.height() - label_size.height() -
 		Cursor::Offset - Cursor::ArrowSize - 0.5f;
 	const float height = label_size.height();
 
-	if (_time > other->time())
+	if (time_ > other->time())
 		return QRectF(x, top, label_size.width(), height);
 	else
 		return QRectF(x - label_size.width(), top,
@@ -114,9 +115,9 @@ void Cursor::paint_label(QPainter &p, const QRect &rect,
 		QPointF(r.right() - 1, rect.bottom() - 1),
 	};
 
-	const QPointF *const points = (_time > other->time()) ?
+	const QPointF *const points = (time_ > other->time()) ?
 		left_points : right_points;
-	const QPointF *const highlight_points = (_time > other->time()) ?
+	const QPointF *const highlight_points = (time_ > other->time()) ?
 		left_highlight_points : right_highlight_points;
 
 	if (selected()) {
@@ -139,18 +140,18 @@ void Cursor::paint_label(QPainter &p, const QRect &rect,
 
 	p.setPen(TextColour);
 	p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
-		Ruler::format_time(_time, prefix, 2));
+		pv::util::format_time(time_, prefix, 2));
 }
 
 void Cursor::compute_text_size(QPainter &p, unsigned int prefix)
 {
-	_text_size = p.boundingRect(QRectF(), 0,
-		Ruler::format_time(_time, prefix, 2)).size();
+	text_size_ = p.boundingRect(QRectF(), 0,
+		pv::util::format_time(time_, prefix, 2)).size();
 }
 
 shared_ptr<Cursor> Cursor::get_other_cursor() const
 {
-	const CursorPair &cursors = _view.cursors();
+	const CursorPair &cursors = view_.cursors();
 	return (cursors.first().get() == this) ?
 		cursors.second() : cursors.first();
 }