projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TimeItem: Added new class - a base of TimeMarker, derived from SelectableItem
[pulseview.git]
/
pv
/
view
/
timemarker.cpp
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index d4bd7140e92fba17cdf300495c35331cfa24ac1f..34b2699bd6722fe9b5f3b169266f3341eb3eabad 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-31,7
+31,6
@@
#include <QFontMetrics>
#include <QPainter>
#include <QFontMetrics>
#include <QPainter>
-#include <pv/util.hpp>
#include <pv/widgets/popup.hpp>
using std::max;
#include <pv/widgets/popup.hpp>
using std::max;
@@
-44,7
+43,7
@@
const int TimeMarker::ArrowSize = 4;
const int TimeMarker::Offset = 1;
TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
const int TimeMarker::Offset = 1;
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),
@@
-93,22
+92,26
@@
QRectF TimeMarker::get_label_rect(const QRect &rect) const
const float x = (time_ - view_.offset()) / view_.scale();
QFontMetrics m(QApplication::font());
const float x = (time_ - view_.offset()) / view_.scale();
QFontMetrics m(QApplication::font());
- QSize text_size = m.boundingRect(
- pv::util::format_time(time_, view_.tick_prefix(), 2)).size();
+ const float text_width =
+ max(m.boundingRect(get_text()).size().width(), ArrowSize);
+ const float text_height = m.boundingRect("Tg").size().height();
const QSizeF label_size(
const QSizeF label_size(
- text_
size.width()
+ View::LabelPadding.width() * 2,
- text_
size.height()
+ View::LabelPadding.height() * 2);
+ text_
width
+ View::LabelPadding.width() * 2,
+ text_
height
+ View::LabelPadding.height() * 2);
const float top = rect.height() - label_size.height() -
TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
const float height = label_size.height();
const float top = rect.height() - label_size.height() -
TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
const float height = label_size.height();
- return QRectF(x - label_size.width() / 2
- 0.5f
, top,
+ return QRectF(x - label_size.width() / 2, top,
label_size.width(), height);
}
void TimeMarker::paint_label(QPainter &p, const QRect &rect)
{
label_size.width(), height);
}
void TimeMarker::paint_label(QPainter &p, const QRect &rect)
{
+ if (!enabled())
+ return;
+
const qreal x = (time_ - view_.offset()) / view_.scale();
const QRectF r(get_label_rect(rect));
const qreal x = (time_ - view_.offset()) / view_.scale();
const QRectF r(get_label_rect(rect));
@@
-152,8
+155,7
@@
void TimeMarker::paint_label(QPainter &p, const QRect &rect)
p.drawPolygon(points, countof(points));
p.setPen(select_text_colour(colour_));
p.drawPolygon(points, countof(points));
p.setPen(select_text_colour(colour_));
- p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
- pv::util::format_time(time_, view_.tick_prefix(), 2));
+ p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
}
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
}
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)