X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fruler.cpp;h=1204559c5c943d5838a968a1bd0d636c5617dfc1;hp=0c2b6592cf3eb90f05f18a6ca95aadb2418acfb4;hb=46ebcd3f6f85092a9eb6401f6f56cee8fa08131a;hpb=4a07615736968fc8d635c8d187b8a5d6b8a0e2eb diff --git a/pv/views/trace/ruler.cpp b/pv/views/trace/ruler.cpp index 0c2b6592..1204559c 100644 --- a/pv/views/trace/ruler.cpp +++ b/pv/views/trace/ruler.cpp @@ -21,14 +21,19 @@ #include #include +#include #include +#include + #include "ruler.hpp" #include "view.hpp" using namespace Qt; using std::function; +using std::max; +using std::min; using std::shared_ptr; using std::vector; @@ -45,8 +50,8 @@ Ruler::Ruler(View &parent) : { setMouseTracking(true); - connect(&view_, SIGNAL(hover_point_changed(QPoint)), - this, SLOT(hover_point_changed(QPoint))); + connect(&view_, SIGNAL(hover_point_changed(const QWidget*, QPoint)), + this, SLOT(on_hover_point_changed(const QWidget*, QPoint))); connect(&view_, SIGNAL(offset_changed()), this, SLOT(invalidate_tick_position_cache())); connect(&view_, SIGNAL(scale_changed()), @@ -109,6 +114,40 @@ QString Ruler::format_time_with_distance( return pv::util::format_time_minutes(t, precision, sign); } +pv::util::Timestamp Ruler::get_time_from_x_pos(uint32_t x) const +{ + return view_.ruler_offset() + ((double)x + 0.5) * view_.scale(); +} + +void Ruler::contextMenuEvent(QContextMenuEvent *event) +{ + context_menu_x_pos_ = event->pos().x(); + + QMenu *const menu = new QMenu(this); + + QAction *const create_marker = new QAction(tr("Create marker here"), this); + connect(create_marker, SIGNAL(triggered()), this, SLOT(on_createMarker())); + menu->addAction(create_marker); + + QAction *const toggle_hover_marker = new QAction(this); + connect(toggle_hover_marker, SIGNAL(triggered()), this, SLOT(on_toggleHoverMarker())); + menu->addAction(toggle_hover_marker); + + GlobalSettings settings; + const bool hover_marker_shown = + settings.value(GlobalSettings::Key_View_ShowHoverMarker).toBool(); + toggle_hover_marker->setText(hover_marker_shown ? + tr("Disable mouse hover marker") : tr("Enable mouse hover marker")); + + menu->popup(event->globalPos()); +} + +void Ruler::resizeEvent(QResizeEvent*) +{ + // the tick calculation depends on the width of this widget + invalidate_tick_position_cache(); +} + vector< shared_ptr > Ruler::items() { const vector< shared_ptr > time_items(view_.time_items()); @@ -125,6 +164,11 @@ shared_ptr Ruler::get_mouse_over_item(const QPoint &pt) return nullptr; } +void Ruler::mouseDoubleClickEvent(QMouseEvent *event) +{ + view_.add_flag(get_time_from_x_pos(event->x())); +} + void Ruler::paintEvent(QPaintEvent*) { if (!tick_position_cache_) { @@ -159,10 +203,18 @@ void Ruler::paintEvent(QPaintEvent*) p.setPen(palette().color(foregroundRole())); for (const auto& tick: tick_position_cache_->major) { - p.drawText(tick.first, ValueMargin, 0, text_height, + const int leftedge = 0; + const int rightedge = width(); + const int x_tick = tick.first; + if ((x_tick > leftedge) && (x_tick < rightedge)) { + const int x_left_bound = QFontMetrics(font()).width(tick.second) / 2; + const int x_right_bound = rightedge - x_left_bound; + const int x_legend = min(max(x_tick, x_left_bound), x_right_bound); + p.drawText(x_legend, ValueMargin, 0, text_height, AlignCenter | AlignTop | TextDontClip, tick.second); - p.drawLine(QPointF(tick.first, major_tick_y1), + p.drawLine(QPointF(x_tick, major_tick_y1), QPointF(tick.first, ruler_height)); + } } for (const auto& tick: tick_position_cache_->minor) { @@ -189,7 +241,32 @@ void Ruler::paintEvent(QPaintEvent*) } } -Ruler::TickPositions Ruler::calculate_tick_positions( +void Ruler::draw_hover_mark(QPainter &p, int text_height) +{ + const int x = view_.hover_point().x(); + + if (x == -1) + return; + + p.setPen(QPen(Qt::NoPen)); + p.setBrush(QBrush(palette().color(foregroundRole()))); + + 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)); +} + +int Ruler::calculate_text_height() const +{ + return QFontMetrics(font()).ascent(); +} + +TickPositions Ruler::calculate_tick_positions( const pv::util::Timestamp& major_period, const pv::util::Timestamp& offset, const double scale, @@ -227,38 +304,9 @@ Ruler::TickPositions Ruler::calculate_tick_positions( return tp; } -void Ruler::mouseDoubleClickEvent(QMouseEvent *event) -{ - view_.add_flag(view_.ruler_offset() + ((double)event->x() + 0.5) * view_.scale()); -} - -void Ruler::draw_hover_mark(QPainter &p, int text_height) -{ - const int x = view_.hover_point().x(); - - if (x == -1) - return; - - p.setPen(QPen(Qt::NoPen)); - p.setBrush(QBrush(palette().color(foregroundRole()))); - - 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)); -} - -int Ruler::calculate_text_height() const -{ - return QFontMetrics(font()).ascent(); -} - -void Ruler::hover_point_changed(const QPoint &hp) +void Ruler::on_hover_point_changed(const QWidget* widget, const QPoint &hp) { + (void)widget; (void)hp; update(); @@ -269,10 +317,16 @@ void Ruler::invalidate_tick_position_cache() tick_position_cache_ = boost::none; } -void Ruler::resizeEvent(QResizeEvent*) +void Ruler::on_createMarker() { - // the tick calculation depends on the width of this widget - invalidate_tick_position_cache(); + view_.add_flag(get_time_from_x_pos(mouse_down_point_.x())); +} + +void Ruler::on_toggleHoverMarker() +{ + GlobalSettings settings; + const bool state = settings.value(GlobalSettings::Key_View_ShowHoverMarker).toBool(); + settings.setValue(GlobalSettings::Key_View_ShowHoverMarker, !state); } } // namespace trace