#include "timemarker.hpp"
#include "pv/widgets/timestampspinbox.hpp"
+#include "ruler.hpp"
#include "view.hpp"
#include <QApplication>
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),
- updating_value_widget_(false)
+ value_widget_(nullptr)
{
}
-const pv::util::Timestamp& TimeMarker::time() const
+const pv::util::Timestamp TimeMarker::time() const
{
return time_;
}
time_ = time;
if (value_widget_) {
- updating_value_widget_ = true;
- value_widget_->setValue(time);
- updating_value_widget_ = false;
+ QSignalBlocker blocker(value_widget_);
+ value_widget_->setValue(view_.ruler()->get_ruler_time_from_absolute_time(time));
}
view_.time_item_appearance_changed(true, true);
return roundf(((time_ - view_.offset()) / view_.scale()).convert_to<float>()) + 0.5f;
}
-QPoint TimeMarker::point(const QRect &rect) const
+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
{
QFontMetrics m(QApplication::font());
const QSizeF text_size(
- max(m.boundingRect(get_text()).size().width(), ArrowSize),
+ max(m.boundingRect(get_display_text()).size().width(), ArrowSize),
m.height());
const QSizeF label_size(text_size + LabelPadding * 2);
const float top = rect.height() - label_size.height() -
return QRectF(x - h / 2.0f, pp.top(), h, pp.height());
}
+QString TimeMarker::get_display_text() const
+{
+ return get_text();
+}
+
+void TimeMarker::set_text(const QString &text)
+{
+ (void)text;
+}
+
void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
{
if (!enabled())
}
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.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
+ p.setPen(select_text_color(color_));
+ p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_display_text());
}
void TimeMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp)
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 *const popup = new Popup(parent);
popup->set_position(parent->mapToGlobal(
- point(parent->rect())), Popup::Bottom);
+ drag_point(parent->rect())), Popup::Bottom);
QFormLayout *const form = new QFormLayout(popup);
popup->setLayout(form);
value_widget_ = new pv::widgets::TimestampSpinBox(parent);
- value_widget_->setValue(time_);
+ value_widget_->setValue(view_.ruler()->get_ruler_time_from_absolute_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()->get_absolute_time_from_ruler_time(value));
}
} // namespace trace