projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TimeMarker: Simplified label_rect
[pulseview.git]
/
pv
/
view
/
timemarker.cpp
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index 7e23806896d5ed010d090412b03cd9fc877daac8..614275cf98e04d1d559d211cae6bf9740f595b15 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-40,10
+40,9
@@
namespace pv {
namespace view {
const int TimeMarker::ArrowSize = 4;
namespace view {
const int TimeMarker::ArrowSize = 4;
-const int TimeMarker::Offset = 1;
TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
-
view_
(view),
+
TimeItem
(view),
colour_(colour),
time_(time),
value_action_(NULL),
colour_(colour),
time_(time),
value_action_(NULL),
@@
-57,16
+56,6
@@
double TimeMarker::time() const
return time_;
}
return time_;
}
-float TimeMarker::get_x() const
-{
- return (time_ - view_.offset()) / view_.scale();
-}
-
-QPoint TimeMarker::point() const
-{
- return QPoint(get_x(), 0);
-}
-
void TimeMarker::set_time(double time)
{
time_ = time;
void TimeMarker::set_time(double time)
{
time_ = time;
@@
-77,38
+66,40
@@
void TimeMarker::set_time(double time)
updating_value_widget_ = false;
}
updating_value_widget_ = false;
}
-
time_changed(
);
+
view_.time_item_appearance_changed(true, true
);
}
}
-void TimeMarker::paint(QPainter &p, const QRect &rect)
+float TimeMarker::get_x() const
{
{
- const float x = get_x();
- p.setPen(colour_.darker());
- p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
+ return (time_ - view_.offset()) / view_.scale();
}
}
-Q
RectF TimeMarker::get_label_rect(const QRect &rect
) const
+Q
Point TimeMarker::point(
) const
{
{
- const float x = (time_ - view_.offset()) / view_.scale();
+ return QPoint(get_x(), 0);
+}
+QRectF TimeMarker::label_rect(const QRectF &rect) const
+{
QFontMetrics m(QApplication::font());
QFontMetrics m(QApplication::font());
- QSize text_size = m.boundingRect(get_text()).size();
-
- const QSizeF label_size(
- text_size.width() + View::LabelPadding.width() * 2,
- text_size.height() + View::LabelPadding.height() * 2);
+ const QSizeF text_size(
+ max(m.boundingRect(get_text()).size().width(), ArrowSize),
+ m.height());
+ const QSizeF label_size(text_size + LabelPadding * 2);
const float top = rect.height() - label_size.height() -
const float top = rect.height() - label_size.height() -
- TimeMarker::
Offset - TimeMarker::
ArrowSize - 0.5f;
- const float
height = label_size.height
();
+ TimeMarker::ArrowSize - 0.5f;
+ const float
x = (time_ - view_.offset()) / view_.scale
();
- return QRectF(x - label_size.width() / 2 - 0.5f, top,
- label_size.width(), height);
+ return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
}
}
-void TimeMarker::paint_label(QPainter &p, const QRect &rect)
+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();
- const QRectF r(
get_
label_rect(rect));
+ const QRectF r(label_rect(rect));
const QPointF points[] = {
r.topLeft(),
const QPointF points[] = {
r.topLeft(),
@@
-138,7
+129,7
@@
void TimeMarker::paint_label(QPainter &p, const QRect &rect)
}
p.setPen(Qt::transparent);
}
p.setPen(Qt::transparent);
- p.setBrush(colour_);
+ p.setBrush(
hover ? colour_.lighter() :
colour_);
p.drawPolygon(points, countof(points));
p.setPen(colour_.lighter());
p.drawPolygon(points, countof(points));
p.setPen(colour_.lighter());
@@
-153,6
+144,16
@@
void TimeMarker::paint_label(QPainter &p, const QRect &rect)
p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
}
p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
}
+void TimeMarker::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+{
+ if (!enabled())
+ return;
+
+ const float x = get_x();
+ p.setPen(colour_.darker());
+ p.drawLine(QPointF(x, pp.top()), QPointF(x, pp.bottom()));
+}
+
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
{
using pv::widgets::Popup;
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
{
using pv::widgets::Popup;
@@
-178,10
+179,8
@@
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
void TimeMarker::on_value_changed(double value)
{
void TimeMarker::on_value_changed(double value)
{
- if (!updating_value_widget_) {
- time_ = value;
- time_changed();
- }
+ if (!updating_value_widget_)
+ set_time(value);
}
} // namespace view
}
} // namespace view