const int TimeMarker::ArrowSize = 4;
TimeMarker::TimeMarker(
- View &view, const QColor &colour, const pv::util::Timestamp& time) :
+ View &view, const QColor &color, const pv::util::Timestamp& time) :
TimeItem(view),
- colour_(colour),
+ color_(color),
time_(time),
value_action_(nullptr),
value_widget_(nullptr),
if (value_widget_) {
updating_value_widget_ = true;
- value_widget_->setValue(time);
+ value_widget_->setValue(view_.absolute_to_ruler_time(time));
updating_value_widget_ = false;
}
QPoint TimeMarker::drag_point(const QRect &rect) const
{
- return QPoint(get_x(), rect.bottom());
+ (void)rect;
+
+ return QPoint(get_x(), view_.mapFromGlobal(QCursor::pos()).y());
}
QRectF TimeMarker::label_rect(const QRectF &rect) const
}
p.setPen(Qt::transparent);
- p.setBrush(hover ? colour_.lighter() : colour_);
+ p.setBrush(hover ? color_.lighter() : color_);
p.drawPolygon(points, countof(points));
- p.setPen(colour_.lighter());
+ p.setPen(color_.lighter());
p.setBrush(Qt::transparent);
p.drawPolygon(highlight_points, countof(highlight_points));
- p.setPen(colour_.darker());
+ p.setPen(color_.darker());
p.setBrush(Qt::transparent);
p.drawPolygon(points, countof(points));
- p.setPen(select_text_colour(colour_));
+ p.setPen(select_text_color(color_));
p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
}
return;
const float x = get_x();
- p.setPen(colour_.darker());
+ p.setPen(color_.darker());
p.drawLine(QPointF(x, pp.top()), QPointF(x, pp.bottom()));
}
popup->setLayout(form);
value_widget_ = new pv::widgets::TimestampSpinBox(parent);
- value_widget_->setValue(time_);
+ value_widget_->setValue(view_.absolute_to_ruler_time(time_));
connect(value_widget_, SIGNAL(valueChanged(const pv::util::Timestamp&)),
this, SLOT(on_value_changed(const pv::util::Timestamp&)));
void TimeMarker::on_value_changed(const pv::util::Timestamp& value)
{
if (!updating_value_widget_)
- set_time(value);
+ set_time(view_.ruler_to_absolute_time(value));
}
} // namespace trace