projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
format_time(): Use the timestamp type in the calculation
[pulseview.git]
/
pv
/
view
/
timemarker.cpp
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index 614275cf98e04d1d559d211cae6bf9740f595b15..f1424627d9aa27dae374175a5d11b4bf000e5f23 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-41,28
+41,29
@@
namespace view {
const int TimeMarker::ArrowSize = 4;
const int TimeMarker::ArrowSize = 4;
-TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
+TimeMarker::TimeMarker(
+ View &view, const QColor &colour, const pv::util::Timestamp& time) :
TimeItem(view),
colour_(colour),
time_(time),
TimeItem(view),
colour_(colour),
time_(time),
- value_action_(
NULL
),
- value_widget_(
NULL
),
+ value_action_(
nullptr
),
+ value_widget_(
nullptr
),
updating_value_widget_(false)
{
}
updating_value_widget_(false)
{
}
-
double
TimeMarker::time() const
+
const pv::util::Timestamp&
TimeMarker::time() const
{
return time_;
}
{
return time_;
}
-void TimeMarker::set_time(
double
time)
+void TimeMarker::set_time(
const pv::util::Timestamp&
time)
{
time_ = time;
if (value_widget_) {
updating_value_widget_ = true;
{
time_ = time;
if (value_widget_) {
updating_value_widget_ = true;
- value_widget_->setValue(time);
+ value_widget_->setValue(time
.convert_to<double>()
);
updating_value_widget_ = false;
}
updating_value_widget_ = false;
}
@@
-71,12
+72,12
@@
void TimeMarker::set_time(double time)
float TimeMarker::get_x() const
{
float TimeMarker::get_x() const
{
- return (
time_ - view_.offset()) / view_.scale
();
+ return (
(time_ - view_.offset()) / view_.scale()).convert_to<float>
();
}
}
-QPoint TimeMarker::point() const
+QPoint TimeMarker::point(
const QRect &rect
) const
{
{
- return QPoint(get_x(),
0
);
+ return QPoint(get_x(),
rect.bottom()
);
}
QRectF TimeMarker::label_rect(const QRectF &rect) const
}
QRectF TimeMarker::label_rect(const QRectF &rect) const
@@
-88,17
+89,24
@@
QRectF TimeMarker::label_rect(const QRectF &rect) const
const QSizeF label_size(text_size + LabelPadding * 2);
const float top = rect.height() - label_size.height() -
TimeMarker::ArrowSize - 0.5f;
const QSizeF label_size(text_size + LabelPadding * 2);
const float top = rect.height() - label_size.height() -
TimeMarker::ArrowSize - 0.5f;
- const float x =
(time_ - view_.offset()) / view_.scale
();
+ const float x =
get_x
();
return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
}
return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
}
+QRectF TimeMarker::hit_box_rect(const QRectF &rect) const
+{
+ const float x = get_x();
+ const float h = QFontMetrics(QApplication::font()).height();
+ return QRectF(x - h / 2.0f, rect.top(), h, rect.height());
+}
+
void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
{
if (!enabled())
return;
void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
{
if (!enabled())
return;
- const qreal x = (
time_ - view_.offset()) / view_.scale
();
+ const qreal x = (
(time_ - view_.offset()) / view_.scale()).convert_to<qreal>
();
const QRectF r(label_rect(rect));
const QPointF points[] = {
const QRectF r(label_rect(rect));
const QPointF points[] = {
@@
-159,6
+167,9
@@
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
using pv::widgets::Popup;
Popup *const popup = new Popup(parent);
using pv::widgets::Popup;
Popup *const popup = new Popup(parent);
+ popup->set_position(parent->mapToGlobal(
+ point(parent->rect())), Popup::Bottom);
+
QFormLayout *const form = new QFormLayout(popup);
popup->setLayout(form);
QFormLayout *const form = new QFormLayout(popup);
popup->setLayout(form);
@@
-167,7
+178,7
@@
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
value_widget_->setSuffix("s");
value_widget_->setSingleStep(1e-6);
value_widget_->setRange(-1.0e9, 1.0e9);
value_widget_->setSuffix("s");
value_widget_->setSingleStep(1e-6);
value_widget_->setRange(-1.0e9, 1.0e9);
- value_widget_->setValue(time_);
+ value_widget_->setValue(time_
.convert_to<double>()
);
connect(value_widget_, SIGNAL(valueChanged(double)),
this, SLOT(on_value_changed(double)));
connect(value_widget_, SIGNAL(valueChanged(double)),
this, SLOT(on_value_changed(double)));