X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=e2c80833f2503631814a5ee1888f1088af13da69;hp=0b5363f18134b96b622e6e9e269289f0cde67218;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5 diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp index 0b5363f1..e2c80833 100644 --- a/pv/view/cursorpair.cpp +++ b/pv/view/cursorpair.cpp @@ -18,10 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "cursorpair.h" +#include "cursorpair.hpp" -#include "view.h" -#include "pv/util.h" +#include "ruler.hpp" +#include "view.hpp" +#include "pv/util.hpp" #include #include @@ -33,17 +34,24 @@ using std::shared_ptr; using std::pair; namespace pv { -namespace view { +namespace views { +namespace TraceView { const int CursorPair::DeltaPadding = 8; +const QColor CursorPair::ViewportFillColour(220, 231, 243); CursorPair::CursorPair(View &view) : + TimeItem(view), first_(new Cursor(view, 0.0)), - second_(new Cursor(view, 1.0)), - view_(view) + second_(new Cursor(view, 1.0)) { } +bool CursorPair::enabled() const +{ + return view_.cursors_shown(); +} + shared_ptr CursorPair::first() const { return first_; @@ -54,11 +62,32 @@ shared_ptr CursorPair::second() const return second_; } -QRectF CursorPair::get_label_rect(const QRect &rect) const +void CursorPair::set_time(const pv::util::Timestamp& time) +{ + const pv::util::Timestamp 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 QRect &rect) const +{ + return first_->point(rect); +} + +pv::widgets::Popup* CursorPair::create_popup(QWidget *parent) { - const QSizeF label_size( - text_size_.width() + View::LabelPadding.width() * 2, - text_size_.height() + View::LabelPadding.height() * 2); + (void)parent; + return nullptr; +} + +QRectF CursorPair::label_rect(const QRectF &rect) const +{ + const QSizeF label_size(text_size_ + LabelPadding * 2); const pair offsets(get_cursor_offsets()); const pair normal_offsets( (offsets.first < offsets.second) ? offsets : @@ -70,76 +99,88 @@ 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 - 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, bool hover) { assert(first_); assert(second_); - compute_text_size(p, prefix); - QRectF delta_rect(get_label_rect(rect)); + if (!enabled()) + return; + + const QColor text_colour = + ViewItem::select_text_colour(Cursor::FillColour); + + p.setPen(text_colour); + compute_text_size(p); + 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; - p.setBrush(Cursor::FillColour); - p.setPen(Cursor::LineColour); + if (selected()) { + p.setBrush(Qt::transparent); + p.setPen(highlight_pen()); + p.drawRoundedRect(delta_rect, radius, radius); + } + + p.setBrush(hover ? Cursor::FillColour.lighter() : + Cursor::FillColour); + 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(text_colour); p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter, - pv::util::format_time(second_->time() - first_->time(), prefix, 2)); + format_string()); } - - // Paint the cursor markers - first_->paint_label(p, rect, prefix); - second_->paint_label(p, rect, prefix); } -void CursorPair::draw_viewport_background(QPainter &p, - const QRect &rect) +void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) { + if (!enabled()) + return; + p.setPen(Qt::NoPen); - p.setBrush(QBrush(View::CursorAreaColour)); + p.setBrush(QBrush(ViewportFillColour)); const pair offsets(get_cursor_offsets()); const int l = (int)max(min( offsets.first, offsets.second), 0.0f); const int r = (int)min(max( - offsets.first, offsets.second), (float)rect.width()); + offsets.first, offsets.second), (float)pp.width()); - p.drawRect(l, 0, r - l, rect.height()); + p.drawRect(l, pp.top(), r - l, pp.height()); } -void CursorPair::draw_viewport_foreground(QPainter &p, - const QRect &rect) +QString CursorPair::format_string() { - assert(first_); - assert(second_); + const pv::util::SIPrefix prefix = view_.tick_prefix(); + const pv::util::Timestamp diff = abs(second_->time() - first_->time()); + + const QString s1 = Ruler::format_time_with_distance( + diff, diff, prefix, view_.time_unit(), view_.tick_precision(), false); + const QString s2 = util::format_time_si( + 1 / diff, pv::util::SIPrefix::unspecified, 4, "Hz", false); - first_->paint(p, rect); - second_->paint(p, rect); + return QString("%1 / %2").arg(s1).arg(s2); } -void CursorPair::compute_text_size(QPainter &p, unsigned int prefix) +void CursorPair::compute_text_size(QPainter &p) { assert(first_); assert(second_); - text_size_ = p.boundingRect(QRectF(), 0, pv::util::format_time( - second_->time() - first_->time(), prefix, 2)).size(); + text_size_ = p.boundingRect(QRectF(), 0, format_string()).size(); } pair CursorPair::get_cursor_offsets() const @@ -148,9 +189,10 @@ pair CursorPair::get_cursor_offsets() const assert(second_); return pair( - (first_->time() - view_.offset()) / view_.scale(), - (second_->time() - view_.offset()) / view_.scale()); + ((first_->time() - view_.offset()) / view_.scale()).convert_to(), + ((second_->time() - view_.offset()) / view_.scale()).convert_to()); } -} // namespace view +} // namespace TraceView +} // namespace views } // namespace pv