projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ruler: Removed Padding
[pulseview.git]
/
pv
/
view
/
ruler.cpp
diff --git
a/pv/view/ruler.cpp
b/pv/view/ruler.cpp
index 7018c212db52f8b72f1449400b9160594a746dde..f671c95e0c9bd529d67111237ea8fc45c73da0c5 100644
(file)
--- a/
pv/view/ruler.cpp
+++ b/
pv/view/ruler.cpp
@@
-38,17
+38,13
@@
using std::vector;
namespace pv {
namespace view {
namespace pv {
namespace view {
-const
int Ruler::RulerHeight = 30;
+const
float Ruler::RulerHeight = 2.5f; // x Text Height
const int Ruler::MinorTickSubdivision = 4;
const int Ruler::MinorTickSubdivision = 4;
-const int Ruler::HoverArrowSize = 5;
-
-const int Ruler::Padding = 20;
-const int Ruler::BaselineOffset = 5;
+const float Ruler::HoverArrowSize = 0.5f; // x Text Height
Ruler::Ruler(View &parent) :
Ruler::Ruler(View &parent) :
- MarginWidget(parent),
- text_height_(calculate_text_height())
+ MarginWidget(parent)
{
setMouseTracking(true);
{
setMouseTracking(true);
@@
-66,13
+62,18
@@
void Ruler::clear_selection()
QSize Ruler::sizeHint() const
{
QSize Ruler::sizeHint() const
{
- return QSize(0, RulerHeight);
+ const int text_height = calculate_text_height();
+ return QSize(0, RulerHeight * text_height);
}
QSize Ruler::extended_size_hint() const
{
}
QSize Ruler::extended_size_hint() const
{
- return QSize(0, RulerHeight +
- (text_height_ + Padding + BaselineOffset) / 2);
+ QRectF max_rect;
+ std::vector< std::shared_ptr<TimeItem> > items(view_.time_items());
+ for (auto &i : items)
+ max_rect = max_rect.united(i->label_rect(QRect()));
+ return QSize(0, sizeHint().height() - max_rect.top() / 2 +
+ ViewItem::HighlightRadius);
}
void Ruler::paintEvent(QPaintEvent*)
}
void Ruler::paintEvent(QPaintEvent*)
@@
-98,9
+99,10
@@
void Ruler::paintEvent(QPaintEvent*)
int division = (int)round(first_minor_division -
first_major_division * MinorTickSubdivision) - 1;
int division = (int)round(first_minor_division -
first_major_division * MinorTickSubdivision) - 1;
- const int major_tick_y1 = text_height_ + ValueMargin * 2;
- const int tick_y2 = RulerHeight;
- const int minor_tick_y1 = (major_tick_y1 + tick_y2) / 2;
+ const int text_height = calculate_text_height();
+ const int ruler_height = RulerHeight * text_height;
+ const int major_tick_y1 = text_height + ValueMargin * 2;
+ const int minor_tick_y1 = (major_tick_y1 + ruler_height) / 2;
double x;
double x;
@@
-111,17
+113,17
@@
void Ruler::paintEvent(QPaintEvent*)
if (division % MinorTickSubdivision == 0)
{
// Draw a major tick
if (division % MinorTickSubdivision == 0)
{
// Draw a major tick
- p.drawText(x, ValueMargin, 0, text_height
_
,
+ p.drawText(x, ValueMargin, 0, text_height,
AlignCenter | AlignTop | TextDontClip,
pv::util::format_time(t, prefix));
p.drawLine(QPointF(x, major_tick_y1),
AlignCenter | AlignTop | TextDontClip,
pv::util::format_time(t, prefix));
p.drawLine(QPointF(x, major_tick_y1),
- QPointF(x,
tick_y2
));
+ QPointF(x,
ruler_height
));
}
else
{
// Draw a minor tick
p.drawLine(QPointF(x, minor_tick_y1),
}
else
{
// Draw a minor tick
p.drawLine(QPointF(x, minor_tick_y1),
- QPointF(x,
tick_y2
));
+ QPointF(x,
ruler_height
));
}
division++;
}
division++;
@@
-129,17
+131,20
@@
void Ruler::paintEvent(QPaintEvent*)
} while (x < width());
// Draw the hover mark
} while (x < width());
// Draw the hover mark
- draw_hover_mark(p);
+ draw_hover_mark(p
, text_height
);
// The cursor labels are not drawn with the arrows exactly on the
// bottom line of the widget, because then the selection shadow
// would be clipped away.
// The cursor labels are not drawn with the arrows exactly on the
// bottom line of the widget, because then the selection shadow
// would be clipped away.
- const QRect r = rect().adjusted(0, 0, 0, -
BaselineOffset
);
+ const QRect r = rect().adjusted(0, 0, 0, -
ViewItem::HighlightRadius
);
// Draw the items
const vector< shared_ptr<TimeItem> > items(view_.time_items());
// Draw the items
const vector< shared_ptr<TimeItem> > items(view_.time_items());
- for (auto &i : items)
- i->paint_label(p, r);
+ for (auto &i : items) {
+ const bool highlight = !dragging_ &&
+ i->label_rect(r).contains(mouse_point_);
+ i->paint_label(p, r, highlight);
+ }
}
void Ruler::mouseMoveEvent(QMouseEvent *e)
}
void Ruler::mouseMoveEvent(QMouseEvent *e)
@@
-198,7
+203,7
@@
void Ruler::mouseReleaseEvent(QMouseEvent *)
Popup *const p = mouse_down_item_->create_popup(&view_);
if (p) {
const QPoint arrpos(mouse_down_item_->get_x(),
Popup *const p = mouse_down_item_->create_popup(&view_);
if (p) {
const QPoint arrpos(mouse_down_item_->get_x(),
- height() -
BaselineOffset
);
+ height() -
ViewItem::HighlightRadius
);
p->set_position(mapToGlobal(arrpos), Popup::Bottom);
p->show();
}
p->set_position(mapToGlobal(arrpos), Popup::Bottom);
p->show();
}
@@
-236,7
+241,7
@@
void Ruler::keyPressEvent(QKeyEvent *e)
}
}
}
}
-void Ruler::draw_hover_mark(QPainter &p)
+void Ruler::draw_hover_mark(QPainter &p
, int text_height
)
{
const int x = view_.hover_point().x();
{
const int x = view_.hover_point().x();
@@
-246,20
+251,19
@@
void Ruler::draw_hover_mark(QPainter &p)
p.setPen(QPen(Qt::NoPen));
p.setBrush(QBrush(palette().color(foregroundRole())));
p.setPen(QPen(Qt::NoPen));
p.setBrush(QBrush(palette().color(foregroundRole())));
- const int b = RulerHeight;
+ const int b = RulerHeight * text_height;
+ const float hover_arrow_size = HoverArrowSize * text_height;
const QPointF points[] = {
QPointF(x, b),
const QPointF points[] = {
QPointF(x, b),
- QPointF(x -
HoverArrowSize, b - HoverArrowS
ize),
- QPointF(x +
HoverArrowSize, b - HoverArrowS
ize)
+ QPointF(x -
hover_arrow_size, b - hover_arrow_s
ize),
+ QPointF(x +
hover_arrow_size, b - hover_arrow_s
ize)
};
p.drawPolygon(points, countof(points));
}
};
p.drawPolygon(points, countof(points));
}
-int Ruler::calculate_text_height()
+int Ruler::calculate_text_height()
const
{
{
- QFontMetrics fm(font());
- return fm.boundingRect(0, 0, INT_MAX, INT_MAX,
- Qt::AlignLeft | Qt::AlignTop, "8").height();
+ return QFontMetrics(font()).ascent();
}
void Ruler::hover_point_changed()
}
void Ruler::hover_point_changed()