projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #597 by disabling device-related toolbar buttons as necessary
[pulseview.git]
/
pv
/
view
/
ruler.cpp
diff --git
a/pv/view/ruler.cpp
b/pv/view/ruler.cpp
index a8cf63540a0cb239645b1cb3e4e5131743caac1e..dfe7d1c555161d6d1d9ca589bfca099695cfc5ab 100644
(file)
--- a/
pv/view/ruler.cpp
+++ b/
pv/view/ruler.cpp
@@
-83,19
+83,6
@@
shared_ptr<ViewItem> Ruler::get_mouse_over_item(const QPoint &pt)
return nullptr;
}
return nullptr;
}
-bool Ruler::accept_drag() const
-{
- return true;
-}
-
-void Ruler::drag_items(const QPoint &delta)
-{
- const vector< shared_ptr<TimeItem> > items(view_.time_items());
- for (auto &i : items)
- if (i->dragging())
- i->drag_by(delta);
-}
-
void Ruler::paintEvent(QPaintEvent*)
{
const int ValueMargin = 3;
void Ruler::paintEvent(QPaintEvent*)
{
const int ValueMargin = 3;
@@
-104,7
+91,6
@@
void Ruler::paintEvent(QPaintEvent*)
p.setRenderHint(QPainter::Antialiasing);
const double tick_period = view_.tick_period();
p.setRenderHint(QPainter::Antialiasing);
const double tick_period = view_.tick_period();
- const unsigned int prefix = view_.tick_prefix();
// Draw the tick marks
p.setPen(palette().color(foregroundRole()));
// Draw the tick marks
p.setPen(palette().color(foregroundRole()));
@@
-135,7
+121,8
@@
void Ruler::paintEvent(QPaintEvent*)
// Draw a major tick
p.drawText(x, ValueMargin, 0, text_height,
AlignCenter | AlignTop | TextDontClip,
// Draw a major tick
p.drawText(x, ValueMargin, 0, text_height,
AlignCenter | AlignTop | TextDontClip,
- pv::util::format_time(t, prefix));
+ util::format_time(t, view_.tick_prefix(), view_.time_unit(),
+ view_.tick_precision()));
p.drawLine(QPointF(x, major_tick_y1),
QPointF(x, ruler_height));
}
p.drawLine(QPointF(x, major_tick_y1),
QPointF(x, ruler_height));
}
@@
-161,7
+148,7
@@
void Ruler::paintEvent(QPaintEvent*)
// Draw the items
const vector< shared_ptr<TimeItem> > items(view_.time_items());
for (auto &i : items) {
// Draw the items
const vector< shared_ptr<TimeItem> > items(view_.time_items());
for (auto &i : items) {
- const bool highlight = !dragging_ &&
+ const bool highlight = !
item_
dragging_ &&
i->label_rect(r).contains(mouse_point_);
i->paint_label(p, r, highlight);
}
i->label_rect(r).contains(mouse_point_);
i->paint_label(p, r, highlight);
}