X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=03df054304f698132120674363f30d0753f5dde9;hp=809a0501b20da1a4be759451fb0d51b717a4dff6;hb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;hpb=199441e4fe68f1ee45f3d4b7617a7166a87c7926 diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp index 809a0501..03df0543 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 #include @@ -29,10 +29,13 @@ #include #include -#include +#include +#include #include +using std::shared_ptr; + namespace pv { namespace view { @@ -45,24 +48,26 @@ const int Cursor::Offset = 1; const int Cursor::ArrowSize = 4; -Cursor::Cursor(const View &view, double time, Cursor &other) : - TimeMarker(view, LineColour, time), - _other(other) +Cursor::Cursor(View &view, double time) : + TimeMarker(view, LineColour, time) { } QRectF Cursor::get_label_rect(const QRect &rect) const { - const float x = (_time - _view.offset()) / _view.scale(); + const shared_ptr other(get_other_cursor()); + assert(other); + + 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() + 1; + 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, @@ -72,79 +77,83 @@ QRectF Cursor::get_label_rect(const QRect &rect) const void Cursor::paint_label(QPainter &p, const QRect &rect, unsigned int prefix) { + const shared_ptr other(get_other_cursor()); + assert(other); + compute_text_size(p, prefix); const QRectF r(get_label_rect(rect)); - if (_time > _other.time()) - { - const QPointF points[] = { - r.topLeft(), - r.topRight(), - r.bottomRight(), - QPointF(r.left() + ArrowSize, r.bottom()), - QPointF(r.left(), rect.bottom()), - }; - - const QPointF highlight_points[] = { - QPointF(r.left() + 1, r.top() + 1), - QPointF(r.right() - 1, r.top() + 1), - QPointF(r.right() - 1, r.bottom() - 1), - QPointF(r.left() + ArrowSize - 1, r.bottom() - 1), - QPointF(r.left() + 1, rect.bottom() - 1), - }; - - p.setPen(Qt::transparent); - p.setBrush(FillColour); - p.drawPolygon(points, countof(points)); - - p.setPen(HighlightColour); + const QPointF left_points[] = { + r.topLeft(), + r.topRight(), + r.bottomRight(), + QPointF(r.left() + ArrowSize, r.bottom()), + QPointF(r.left(), rect.bottom()), + }; + + const QPointF right_points[] = { + r.topRight(), + r.topLeft(), + r.bottomLeft(), + QPointF(r.right() - ArrowSize, r.bottom()), + QPointF(r.right(), rect.bottom()), + }; + + const QPointF left_highlight_points[] = { + QPointF(r.left() + 1, r.top() + 1), + QPointF(r.right() - 1, r.top() + 1), + QPointF(r.right() - 1, r.bottom() - 1), + QPointF(r.left() + ArrowSize - 1, r.bottom() - 1), + QPointF(r.left() + 1, rect.bottom() - 1), + }; + + const QPointF right_highlight_points[] = { + QPointF(r.right() - 1, r.top() + 1), + QPointF(r.left() + 1, r.top() + 1), + QPointF(r.left() + 1, r.bottom() - 1), + QPointF(r.right() - ArrowSize + 1, r.bottom() - 1), + QPointF(r.right() - 1, rect.bottom() - 1), + }; + + const QPointF *const points = (time_ > other->time()) ? + left_points : right_points; + const QPointF *const highlight_points = (time_ > other->time()) ? + left_highlight_points : right_highlight_points; + + if (selected()) { + p.setPen(highlight_pen()); p.setBrush(Qt::transparent); - p.drawPolygon(highlight_points, countof(highlight_points)); - - p.setPen(LineColour); - p.setBrush(Qt::transparent); - p.drawPolygon(points, countof(points)); + p.drawPolygon(points, countof(left_points)); } - else - { - const QPointF points[] = { - r.topRight(), - r.topLeft(), - r.bottomLeft(), - QPointF(r.right() - ArrowSize, r.bottom()), - QPointF(r.right(), rect.bottom()), - }; - - const QPointF highlight_points[] = { - QPointF(r.right() - 1, r.top() + 1), - QPointF(r.left() + 1, r.top() + 1), - QPointF(r.left() + 1, r.bottom() - 1), - QPointF(r.right() - ArrowSize + 1, r.bottom() - 1), - QPointF(r.right() - 1, rect.bottom() - 1), - }; - - p.setPen(Qt::transparent); - p.setBrush(FillColour); - p.drawPolygon(points, countof(points)); - - p.setPen(HighlightColour); - p.setBrush(Qt::transparent); - p.drawPolygon(highlight_points, countof(highlight_points)); - p.setPen(LineColour); - p.setBrush(Qt::transparent); - p.drawPolygon(points, countof(points)); - } + p.setPen(Qt::transparent); + p.setBrush(FillColour); + p.drawPolygon(points, countof(left_points)); + + p.setPen(HighlightColour); + p.setBrush(Qt::transparent); + p.drawPolygon(highlight_points, countof(left_highlight_points)); + + p.setPen(LineColour); + p.setBrush(Qt::transparent); + p.drawPolygon(points, countof(left_points)); 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::get_other_cursor() const +{ + const CursorPair &cursors = view_.cursors(); + return (cursors.first().get() == this) ? + cursors.second() : cursors.first(); } } // namespace view