#include "view.hpp"
#include <pv/util.hpp>
-#include <pv/widgets/popup.hpp>
using namespace Qt;
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::HoverArrowSize = 5;
-
-const int Ruler::Padding = 20;
-const int Ruler::BaselineOffset = 5;
+const float Ruler::HoverArrowSize = 0.5f; // x Text Height
Ruler::Ruler(View &parent) :
- MarginWidget(parent),
- text_height_(calculate_text_height())
+ MarginWidget(parent)
{
setMouseTracking(true);
this, SLOT(hover_point_changed()));
}
-void Ruler::clear_selection()
+QSize Ruler::sizeHint() const
{
- const vector< shared_ptr<TimeItem> > items(view_.time_items());
+ const int text_height = calculate_text_height();
+ return QSize(0, RulerHeight * text_height);
+}
+
+QSize Ruler::extended_size_hint() const
+{
+ QRectF max_rect;
+ std::vector< std::shared_ptr<TimeItem> > items(view_.time_items());
for (auto &i : items)
- i->select(false);
- update();
+ max_rect = max_rect.united(i->label_rect(QRect()));
+ return QSize(0, sizeHint().height() - max_rect.top() / 2 +
+ ViewItem::HighlightRadius);
}
-QSize Ruler::sizeHint() const
+vector< shared_ptr<ViewItem> > Ruler::items()
{
- return QSize(0, RulerHeight);
+ const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
+ return vector< shared_ptr<ViewItem> >(
+ time_items.begin(), time_items.end());
}
-QSize Ruler::extended_size_hint() const
+shared_ptr<ViewItem> Ruler::get_mouse_over_item(const QPoint &pt)
{
- return QSize(0, RulerHeight +
- (text_height_ + Padding + BaselineOffset) / 2);
+ const vector< shared_ptr<TimeItem> > 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;
}
void Ruler::paintEvent(QPaintEvent*)
int division = (int)round(first_minor_division -
first_major_division * MinorTickSubdivision) - 1;
- const int major_tick_y1 = text_height_ + ValueMargin * 2;
- const int tick_y2 = RulerHeight;
- const int minor_tick_y1 = (major_tick_y1 + tick_y2) / 2;
+ 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;
double x;
if (division % MinorTickSubdivision == 0)
{
// Draw a major tick
- p.drawText(x, ValueMargin, 0, text_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, 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++;
} 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, -BaselineOffset);
+ const QRect r = rect().adjusted(0, 0, 0, -ViewItem::HighlightRadius);
// Draw the items
const vector< shared_ptr<TimeItem> > items(view_.time_items());
- for (auto &i : items)
- i->paint_label(p, r);
+ 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)
// Do the drag
dragging_ = true;
- const int delta = e->pos().x() - mouse_down_point_.x();
+ const QPoint delta = e->pos() - mouse_down_point_;
const vector< shared_ptr<TimeItem> > 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());
+ i->drag_by(delta);
}
void Ruler::mousePressEvent(QMouseEvent *e)
{
if (e->buttons() & Qt::LeftButton) {
mouse_down_point_ = e->pos();
-
- mouse_down_item_.reset();
+ mouse_down_item_ = get_mouse_over_item(e->pos());
clear_selection();
- const vector< shared_ptr<TimeItem> > 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();
{
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() - BaselineOffset);
- p->set_position(mapToGlobal(arrpos), Popup::Bottom);
- p->show();
- }
- }
+ if (!dragging_ && mouse_down_item_)
+ show_popup(mouse_down_item_);
dragging_ = false;
mouse_down_item_.reset();
i->drag_release();
}
-void Ruler::leaveEvent(QEvent*)
-{
- mouse_point_ = QPoint(-1, -1);
- update();
-}
-
void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
{
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();
p.setPen(QPen(Qt::NoPen));
p.setBrush(QBrush(palette().color(foregroundRole())));
- const int b = RulerHeight;
+ 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()
+int Ruler::calculate_text_height() const
{
- QFontMetrics fm(font());
- return fm.boundingRect(0, 0, INT_MAX, INT_MAX,
- Qt::AlignLeft | Qt::AlignTop, "8").height();
+ return QFontMetrics(font()).ascent();
}
void Ruler::hover_point_changed()
projects / pulseview.git / blobdiff