X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=8432a24b47cfba4fb8ce692ff075925161d7912f;hp=70c7bac9235b41d203b74054036c36dbcd8f8fa9;hb=26e3af6b15f083239981729b2c3c109ed1d87ba8;hpb=58864c5c5dffac4254f199356aaeb5eabd608630

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 70c7bac9..8432a24b 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -18,43 +18,74 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "cursorpair.h"
+#include "cursorpair.hpp"
 
-#include "ruler.h"
-#include "view.h"
+#include "view.hpp"
+#include "pv/util.hpp"
 
+#include <cassert>
 #include <algorithm>
 
-using namespace boost;
-using namespace std;
+using std::max;
+using std::make_pair;
+using std::min;
+using std::shared_ptr;
+using std::pair;
 
 namespace pv {
 namespace view {
 
 const int CursorPair::DeltaPadding = 8;
 
-CursorPair::CursorPair(const View &view) :
-	_first(new Cursor(view, 0.0)),
-	_second(new Cursor(view, 1.0)),
-	_view(view)
+CursorPair::CursorPair(View &view) :
+	TimeItem(view),
+	first_(new Cursor(view, 0.0)),
+	second_(new Cursor(view, 1.0))
 {
 }
 
+bool CursorPair::enabled() const
+{
+	return view_.cursors_shown();
+}
+
 shared_ptr<Cursor> CursorPair::first() const
 {
-	return _first;
+	return first_;
 }
 
 shared_ptr<Cursor> CursorPair::second() const
 {
-	return _second;
+	return second_;
+}
+
+void CursorPair::set_time(double time) {
+	const double delta = second_->time() - first_->time();
+	first_->set_time(time);
+	second_->set_time(time + delta);
+}
+
+float CursorPair::get_x() const
+{
+	return (first_->get_x() + second_->get_x()) / 2.0f;
+}
+
+QPoint CursorPair::point() const
+{
+	return first_->point();
+}
+
+pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
+{
+	(void)parent;
+	return nullptr;
 }
 
-QRectF CursorPair::get_label_rect(const QRect &rect) const
+QRectF CursorPair::label_rect(const QRectF &rect) const
 {
 	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 pair<float, float> offsets(get_cursor_offsets());
 	const pair<float, float> normal_offsets(
 		(offsets.first < offsets.second) ? offsets :
@@ -66,42 +97,49 @@ QRectF CursorPair::get_label_rect(const QRect &rect) const
 		(float)rect.width() + height);
 
 	return QRectF(left, rect.height() - label_size.height() -
-		Cursor::ArrowSize - Cursor::Offset - 0.5f,
+		TimeMarker::ArrowSize - TimeMarker::Offset - 0.5f,
 		right - left, height);
 }
 
-void CursorPair::draw_markers(QPainter &p,
-	const QRect &rect, unsigned int prefix)
+void CursorPair::paint_label(QPainter &p, const QRect &rect)
 {
-	assert(_first);
-	assert(_second);
+	assert(first_);
+	assert(second_);
+
+	if (!enabled())
+		return;
+
+	const unsigned int prefix = view_.tick_prefix();
 
 	compute_text_size(p, prefix);
-	QRectF delta_rect(get_label_rect(rect));
+	QRectF delta_rect(label_rect(rect));
 
 	const int radius = delta_rect.height() / 2;
 	const QRectF text_rect(delta_rect.intersected(
 		rect).adjusted(radius, 0, -radius, 0));
-	if(text_rect.width() >= _text_size.width())
+	if(text_rect.width() >= text_size_.width())
 	{
 		const int highlight_radius = delta_rect.height() / 2 - 2;
 
+		if (selected()) {
+			p.setBrush(Qt::transparent);
+			p.setPen(highlight_pen());
+			p.drawRoundedRect(delta_rect, radius, radius);
+		}
+
 		p.setBrush(Cursor::FillColour);
-		p.setPen(Cursor::LineColour);
+		p.setPen(Cursor::FillColour.darker());
 		p.drawRoundedRect(delta_rect, radius, radius);
 
 		delta_rect.adjust(1, 1, -1, -1);
-		p.setPen(Cursor::HighlightColour);
+		p.setPen(Cursor::FillColour.lighter());
 		p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
 
-		p.setPen(Cursor::TextColour);
+		p.setPen(ViewItem::select_text_colour(
+			Cursor::FillColour));
 		p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
-			Ruler::format_time(_second->time() - _first->time(), prefix, 2));
+			pv::util::format_time(second_->time() - first_->time(), prefix, 2));
 	}
-
-	// Paint the cursor markers
-	_first->paint_label(p, rect, prefix);
-	_second->paint_label(p, rect, prefix);
 }
 
 void CursorPair::draw_viewport_background(QPainter &p,
@@ -122,30 +160,30 @@ void CursorPair::draw_viewport_background(QPainter &p,
 void CursorPair::draw_viewport_foreground(QPainter &p,
 	const QRect &rect)
 {
-	assert(_first);
-	assert(_second);
+	assert(first_);
+	assert(second_);
 
-	_first->paint(p, rect);
-	_second->paint(p, rect);
+	first_->paint(p, rect);
+	second_->paint(p, rect);
 }
 
 void CursorPair::compute_text_size(QPainter &p, unsigned int prefix)
 {
-	assert(_first);
-	assert(_second);
+	assert(first_);
+	assert(second_);
 
-	_text_size = p.boundingRect(QRectF(), 0, Ruler::format_time(
-		_second->time() - _first->time(), prefix, 2)).size();
+	text_size_ = p.boundingRect(QRectF(), 0, pv::util::format_time(
+		second_->time() - first_->time(), prefix, 2)).size();
 }
 
 pair<float, float> CursorPair::get_cursor_offsets() const
 {
-	assert(_first);
-	assert(_second);
+	assert(first_);
+	assert(second_);
 
 	return pair<float, float>(
-		(_first->time() - _view.offset()) / _view.scale(),
-		(_second->time() - _view.offset()) / _view.scale());
+		(first_->time() - view_.offset()) / view_.scale(),
+		(second_->time() - view_.offset()) / view_.scale());
 }
 
 } // namespace view