X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=ece80e2a94bfc38c68396e09ca8a65a73c936dea;hp=d3e42df6a2fb24573a7b7a55e819ed4b559ecc91;hb=09d5df110bc035256dcd8287094fe1a3b8e67466;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5 diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index d3e42df6..ece80e2a 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -18,23 +18,32 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "ruler.h" +#include -#include "view.h" -#include "pv/util.h" +#include +#include +#include -#include +#include "ruler.hpp" +#include "view.hpp" + +#include +#include using namespace Qt; +using std::shared_ptr; +using std::vector; + namespace pv { namespace view { -const int Ruler::RulerHeight = 30; +const float Ruler::RulerHeight = 2.5f; // x Text Height const int Ruler::MinorTickSubdivision = 4; -const int Ruler::ScaleUnits[3] = {1, 2, 5}; -const int Ruler::HoverArrowSize = 5; +const float Ruler::HoverArrowSize = 0.5f; // x Text Height + +const int Ruler::Padding = 20; Ruler::Ruler(View &parent) : MarginWidget(parent) @@ -45,9 +54,25 @@ Ruler::Ruler(View &parent) : this, SLOT(hover_point_changed())); } +void Ruler::clear_selection() +{ + const vector< shared_ptr > items(view_.time_items()); + for (auto &i : items) + i->select(false); + update(); +} + QSize Ruler::sizeHint() const { - return QSize(0, RulerHeight); + const int text_height = calculate_text_height(); + return QSize(0, RulerHeight * text_height); +} + +QSize Ruler::extended_size_hint() const +{ + const int text_height = calculate_text_height(); + return QSize(0, RulerHeight * text_height + + (text_height + Padding + ViewItem::HighlightRadius) / 2); } void Ruler::paintEvent(QPaintEvent*) @@ -57,14 +82,8 @@ void Ruler::paintEvent(QPaintEvent*) QPainter p(this); p.setRenderHint(QPainter::Antialiasing); - std::pair spacing = - calculate_tick_spacing(p, view_.scale(), view_.offset()); - - double tick_period = spacing.first; - unsigned int prefix = spacing.second; - - const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX, - AlignLeft | AlignTop, "8").height(); + const double tick_period = view_.tick_period(); + const unsigned int prefix = view_.tick_prefix(); // Draw the tick marks p.setPen(palette().color(foregroundRole())); @@ -79,9 +98,10 @@ void Ruler::paintEvent(QPaintEvent*) int division = (int)round(first_minor_division - 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 tick_y2 = height(); - const int minor_tick_y1 = (major_tick_y1 + tick_y2) / 2; + const int minor_tick_y1 = (major_tick_y1 + ruler_height) / 2; double x; @@ -96,13 +116,13 @@ void Ruler::paintEvent(QPaintEvent*) AlignCenter | AlignTop | TextDontClip, pv::util::format_time(t, prefix)); p.drawLine(QPointF(x, major_tick_y1), - QPointF(x, tick_y2)); + QPointF(x, ruler_height)); } else { // Draw a minor tick p.drawLine(QPointF(x, minor_tick_y1), - QPointF(x, tick_y2)); + QPointF(x, ruler_height)); } division++; @@ -110,67 +130,144 @@ void Ruler::paintEvent(QPaintEvent*) } while (x < width()); // Draw the hover mark - draw_hover_mark(p); + 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::draw_hover_mark(QPainter &p) +void Ruler::mouseMoveEvent(QMouseEvent *e) { - const int x = view_.hover_point().x(); + mouse_point_ = e->pos(); - if (x == -1) + if (!(e->buttons() & Qt::LeftButton)) return; - p.setPen(QPen(Qt::NoPen)); - p.setBrush(QBrush(palette().color(foregroundRole()))); + if ((e->pos() - mouse_down_point_).manhattanLength() < + QApplication::startDragDistance()) + return; - const int b = height() - 1; - const QPointF points[] = { - QPointF(x, b), - QPointF(x - HoverArrowSize, b - HoverArrowSize), - QPointF(x + HoverArrowSize, b - HoverArrowSize) - }; - p.drawPolygon(points, countof(points)); + // Do the drag + dragging_ = true; + + const int delta = e->pos().x() - mouse_down_point_.x(); + const vector< shared_ptr > items(view_.time_items()); + for (auto &i : items) + if (i->dragging()) + i->set_time(view_.offset() + + (i->drag_point().x() + delta - 0.5) * + view_.scale()); } -void Ruler::hover_point_changed() +void Ruler::mousePressEvent(QMouseEvent *e) { - update(); + if (e->buttons() & Qt::LeftButton) { + mouse_down_point_ = e->pos(); + + mouse_down_item_.reset(); + + clear_selection(); + + const vector< shared_ptr > items(view_.time_items()); + for (auto i = items.rbegin(); i != items.rend(); i++) + if ((*i)->label_rect(rect()).contains(e->pos())) { + mouse_down_item_ = (*i); + break; + } + + if (mouse_down_item_) { + mouse_down_item_->select(); + mouse_down_item_->drag(); + } + + selection_changed(); + } } -std::pair Ruler::calculate_tick_spacing( - QPainter& p, double scale, double offset) +void Ruler::mouseReleaseEvent(QMouseEvent *) { - const double SpacingIncrement = 32.0f; - const double MinValueSpacing = 32.0f; + using pv::widgets::Popup; + + if (!dragging_ && mouse_down_item_) { + Popup *const p = mouse_down_item_->create_popup(&view_); + if (p) { + const QPoint arrpos(mouse_down_item_->get_x(), + height() - ViewItem::HighlightRadius); + p->set_position(mapToGlobal(arrpos), Popup::Bottom); + p->show(); + } + } - double min_width = SpacingIncrement, typical_width; + dragging_ = false; + mouse_down_item_.reset(); - double tick_period; - unsigned int prefix; + const vector< shared_ptr > items(view_.time_items()); + for (auto &i : items) + i->drag_release(); +} - do { - const double min_period = scale * min_width; +void Ruler::leaveEvent(QEvent*) +{ + mouse_point_ = QPoint(-1, -1); + update(); +} - const int order = (int)floorf(log10f(min_period)); - const double order_decimal = pow(10.0, order); +void Ruler::mouseDoubleClickEvent(QMouseEvent *e) +{ + view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale()); +} - unsigned int unit = 0; +void Ruler::keyPressEvent(QKeyEvent *e) +{ + assert(e); + + if (e->key() == Qt::Key_Delete) + { + const vector< shared_ptr > items(view_.time_items()); + for (auto &i : items) + if (i->selected()) + i->delete_pressed(); + } +} - do { - tick_period = order_decimal * ScaleUnits[unit++]; - } while (tick_period < min_period && unit < countof(ScaleUnits)); +void Ruler::draw_hover_mark(QPainter &p, int text_height) +{ + const int x = view_.hover_point().x(); - prefix = (order - pv::util::FirstSIPrefixPower) / 3; + if (x == -1) + return; - typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX, - AlignLeft | AlignTop, pv::util::format_time(offset, - prefix)).width() + MinValueSpacing; + p.setPen(QPen(Qt::NoPen)); + p.setBrush(QBrush(palette().color(foregroundRole()))); - min_width += SpacingIncrement; + const int b = RulerHeight * text_height; + const float hover_arrow_size = HoverArrowSize * text_height; + const QPointF points[] = { + QPointF(x, b), + QPointF(x - hover_arrow_size, b - hover_arrow_size), + QPointF(x + hover_arrow_size, b - hover_arrow_size) + }; + p.drawPolygon(points, countof(points)); +} - } while(typical_width > tick_period / scale); +int Ruler::calculate_text_height() const +{ + return QFontMetrics(font()).ascent(); +} - return std::make_pair(tick_period, prefix); +void Ruler::hover_point_changed() +{ + update(); } } // namespace view