X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=f4bffd4cf6820449f4818dba3d78e4505fbfe57e;hp=c043aacf2b160d926a557915e2bafe95c397329a;hb=bb4a0e8e0b337988264e43a368b6ce5950d2d6cd;hpb=333d5bbc0a326e6fa82db44f3e6ba8dd79cafdd8 diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index c043aacf..f4bffd4c 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -18,187 +18,208 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "ruler.h" +#include -#include "cursor.h" -#include "view.h" -#include "viewport.h" +#include +#include +#include -#include +#include "ruler.hpp" +#include "view.hpp" -#include -#include +#include -#include -#include -#include +using namespace Qt; -using namespace std; +using std::shared_ptr; +using std::vector; namespace pv { namespace view { +const float Ruler::RulerHeight = 2.5f; // x Text Height const int Ruler::MinorTickSubdivision = 4; -const int Ruler::ScaleUnits[3] = {1, 2, 5}; - -const QString Ruler::SIPrefixes[9] = - {"f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G"}; -const int Ruler::FirstSIPrefixPower = -15; -const int Ruler::HoverArrowSize = 5; +const float Ruler::HoverArrowSize = 0.5f; // x Text Height Ruler::Ruler(View &parent) : - QWidget(&parent), - _view(parent), - _grabbed_marker(NULL) + MarginWidget(parent) { setMouseTracking(true); - connect(&_view, SIGNAL(hover_point_changed()), + connect(&view_, SIGNAL(hover_point_changed()), this, SLOT(hover_point_changed())); } -void Ruler::paintEvent(QPaintEvent *event) +QSize Ruler::sizeHint() const { - QPainter p(this); - p.setRenderHint(QPainter::Antialiasing); - - const double MinSpacing = 80; - - const double min_period = _view.scale() * MinSpacing; + const int text_height = calculate_text_height(); + return QSize(0, RulerHeight * text_height); +} - const int order = (int)floorf(log10f(min_period)); - const double order_decimal = pow(10, order); +QSize Ruler::extended_size_hint() const +{ + QRectF max_rect; + std::vector< std::shared_ptr > items(view_.time_items()); + for (auto &i : items) + max_rect = max_rect.united(i->label_rect(QRect())); + return QSize(0, sizeHint().height() - max_rect.top() / 2 + + ViewItem::HighlightRadius); +} - unsigned int unit = 0; - double tick_period = 0.0f; +vector< shared_ptr > Ruler::items() +{ + const vector< shared_ptr > time_items(view_.time_items()); + return vector< shared_ptr >( + time_items.begin(), time_items.end()); +} - do - { - tick_period = order_decimal * ScaleUnits[unit++]; - } while (tick_period < min_period && unit < countof(ScaleUnits)); +shared_ptr Ruler::get_mouse_over_item(const QPoint &pt) +{ + const vector< shared_ptr > items(view_.time_items()); + for (auto i = items.rbegin(); i != items.rend(); i++) + if ((*i)->enabled() && (*i)->label_rect(rect()).contains(pt)) + return *i; + return nullptr; +} - const unsigned int prefix = (order - FirstSIPrefixPower) / 3; - assert(prefix >= 0); - assert(prefix < countof(SIPrefixes)); +void Ruler::paintEvent(QPaintEvent*) +{ + const int ValueMargin = 3; - const double multiplier = pow(10.0, - prefix * 3 - FirstSIPrefixPower); + QPainter p(this); + p.setRenderHint(QPainter::Antialiasing); - const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX, - Qt::AlignLeft | Qt::AlignTop, "8").height(); + const double tick_period = view_.tick_period(); + const unsigned int prefix = view_.tick_prefix(); // Draw the tick marks - p.setPen(Qt::black); + p.setPen(palette().color(foregroundRole())); const double minor_tick_period = tick_period / MinorTickSubdivision; const double first_major_division = - floor(_view.offset() / tick_period); + floor(view_.offset() / tick_period); const double first_minor_division = - ceil(_view.offset() / minor_tick_period); + ceil(view_.offset() / minor_tick_period); const double t0 = first_major_division * tick_period; int division = (int)round(first_minor_division - - first_major_division * MinorTickSubdivision); - while (1) - { - const double t = t0 + division * minor_tick_period; - const double x = (t - _view.offset()) / _view.scale(); + first_major_division * MinorTickSubdivision) - 1; + + const int text_height = calculate_text_height(); + const int ruler_height = RulerHeight * text_height; + const int major_tick_y1 = text_height + ValueMargin * 2; + const int minor_tick_y1 = (major_tick_y1 + ruler_height) / 2; - if (x >= width()) - break; + double x; + + do { + const double t = t0 + division * minor_tick_period; + x = (t - view_.offset()) / view_.scale(); if (division % MinorTickSubdivision == 0) { // Draw a major tick - QString s; - QTextStream ts(&s); - ts << (t * multiplier) << SIPrefixes[prefix] << "s"; - p.drawText(x, 0, 0, text_height, Qt::AlignCenter | - Qt::AlignTop | Qt::TextDontClip, s); - p.drawLine(QPointF(x, text_height), - QPointF(x, height())); + p.drawText(x, ValueMargin, 0, text_height, + AlignCenter | AlignTop | TextDontClip, + pv::util::format_time(t, prefix)); + p.drawLine(QPointF(x, major_tick_y1), + QPointF(x, ruler_height)); } else { // Draw a minor tick - p.drawLine(QPointF(x, (text_height + height()) / 2), - QPointF(x, height())); + p.drawLine(QPointF(x, minor_tick_y1), + QPointF(x, ruler_height)); } division++; - } - // Draw the cursors - draw_cursors(p); + } while (x < width()); // Draw the hover mark - draw_hover_mark(p); - - p.end(); + draw_hover_mark(p, text_height); + + // The cursor labels are not drawn with the arrows exactly on the + // bottom line of the widget, because then the selection shadow + // would be clipped away. + const QRect r = rect().adjusted(0, 0, 0, -ViewItem::HighlightRadius); + + // Draw the items + const vector< shared_ptr > items(view_.time_items()); + for (auto &i : items) { + const bool highlight = !dragging_ && + i->label_rect(r).contains(mouse_point_); + i->paint_label(p, r, highlight); + } } void Ruler::mouseMoveEvent(QMouseEvent *e) { - if (!_grabbed_marker) + mouse_point_ = e->pos(); + + if (!(e->buttons() & Qt::LeftButton)) return; - _grabbed_marker->set_time(_view.offset() + - ((double)e->x() + 0.5) * _view.scale()); -} + if ((e->pos() - mouse_down_point_).manhattanLength() < + QApplication::startDragDistance()) + return; -void Ruler::mousePressEvent(QMouseEvent *e) -{ - if (e->buttons() & Qt::LeftButton) { - _grabbed_marker = NULL; - - if (_view.cursors_shown()) { - std::pair &cursors = - _view.cursors(); - if (cursors.first.get_label_rect( - rect()).contains(e->pos())) - _grabbed_marker = &cursors.first; - else if (cursors.second.get_label_rect( - rect()).contains(e->pos())) - _grabbed_marker = &cursors.second; - } - } + // Do the drag + dragging_ = true; + + const QPoint delta = e->pos() - mouse_down_point_; + const vector< shared_ptr > items(view_.time_items()); + for (auto &i : items) + if (i->dragging()) + i->drag_by(delta); } void Ruler::mouseReleaseEvent(QMouseEvent *) { - _grabbed_marker = NULL; + using pv::widgets::Popup; + + if (!dragging_ && mouse_down_item_) + show_popup(mouse_down_item_); + + dragging_ = false; + mouse_down_item_.reset(); + + const vector< shared_ptr > items(view_.time_items()); + for (auto &i : items) + i->drag_release(); } -void Ruler::draw_cursors(QPainter &p) +void Ruler::mouseDoubleClickEvent(QMouseEvent *e) { - if (!_view.cursors_shown()) - return; - - const QRect r = rect(); - pair &cursors = _view.cursors(); - cursors.first.paint_label(p, r); - cursors.second.paint_label(p, r); + view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale()); } -void Ruler::draw_hover_mark(QPainter &p) +void Ruler::draw_hover_mark(QPainter &p, int text_height) { - const int x = _view.hover_point().x(); + const int x = view_.hover_point().x(); - if (x == -1 || _grabbed_marker) + if (x == -1) return; p.setPen(QPen(Qt::NoPen)); - p.setBrush(QBrush(QColor(Qt::black))); + p.setBrush(QBrush(palette().color(foregroundRole()))); - const int b = height() - 1; + const int b = RulerHeight * text_height; + const float hover_arrow_size = HoverArrowSize * text_height; const QPointF points[] = { QPointF(x, b), - QPointF(x - HoverArrowSize, b - HoverArrowSize), - QPointF(x + HoverArrowSize, b - HoverArrowSize) + QPointF(x - hover_arrow_size, b - hover_arrow_size), + QPointF(x + hover_arrow_size, b - hover_arrow_size) }; p.drawPolygon(points, countof(points)); } +int Ruler::calculate_text_height() const +{ + return QFontMetrics(font()).ascent(); +} + void Ruler::hover_point_changed() { update();