this, SLOT(hover_point_changed()));
}
+QString Ruler::format_time(double t, unsigned int prefix,
+ unsigned int precision)
+{
+ const double multiplier = pow(10.0,
+ - prefix * 3 - FirstSIPrefixPower);
+
+ QString s;
+ QTextStream ts(&s);
+ ts.setRealNumberPrecision(precision);
+ ts << fixed << forcesign << (t * multiplier) <<
+ SIPrefixes[prefix] << "s";
+ return s;
+}
+
void Ruler::paintEvent(QPaintEvent*)
{
using namespace Qt;
double min_width = SpacingIncrement, typical_width;
double tick_period;
unsigned int prefix;
- double multiplier;
// Find tick spacing, and number formatting that does not cause
// value to collide.
prefix = (order - FirstSIPrefixPower) / 3;
assert(prefix < countof(SIPrefixes));
- multiplier = pow(10.0, - prefix * 3 - FirstSIPrefixPower);
typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
AlignLeft | AlignTop, format_time(_view.offset(),
- multiplier, prefix)).width() + MinValueSpacing;
+ prefix)).width() + MinValueSpacing;
min_width += SpacingIncrement;
const double t0 = first_major_division * tick_period;
int division = (int)round(first_minor_division -
- first_major_division * MinorTickSubdivision);
+ first_major_division * MinorTickSubdivision) - 1;
const int major_tick_y1 = text_height + ValueMargin * 2;
const int tick_y2 = height();
const int minor_tick_y1 = (major_tick_y1 + tick_y2) / 2;
- while (1)
- {
- const double t = t0 + division * minor_tick_period;
- const double x = (t - _view.offset()) / _view.scale();
+ double x;
- if (x >= width())
- break;
+ do {
+ const double t = t0 + division * minor_tick_period;
+ x = (t - _view.offset()) / _view.scale();
if (division % MinorTickSubdivision == 0)
{
// Draw a major tick
p.drawText(x, ValueMargin, 0, text_height,
AlignCenter | AlignTop | TextDontClip,
- format_time(t, multiplier, prefix));
+ format_time(t, prefix));
p.drawLine(QPointF(x, major_tick_y1),
QPointF(x, tick_y2));
}
}
division++;
- }
+
+ } while (x < width());
// Draw the cursors
- draw_cursors(p);
+ draw_cursors(p, prefix);
// Draw the hover mark
draw_hover_mark(p);
_grabbed_marker = NULL;
if (_view.cursors_shown()) {
- std::pair<Cursor, Cursor> &cursors =
- _view.cursors();
- if (cursors.first.get_label_rect(
+ CursorPair &cursors = _view.cursors();
+ if (cursors.first().get_label_rect(
rect()).contains(e->pos()))
- _grabbed_marker = &cursors.first;
- else if (cursors.second.get_label_rect(
+ _grabbed_marker = &cursors.first();
+ else if (cursors.second().get_label_rect(
rect()).contains(e->pos()))
- _grabbed_marker = &cursors.second;
+ _grabbed_marker = &cursors.second();
}
}
}
_grabbed_marker = NULL;
}
-QString Ruler::format_time(double t, double multiplier,
- unsigned int prefix)
-{
- QString s;
- QTextStream ts(&s);
- ts.setRealNumberPrecision(0);
- ts << fixed << forcesign << (t * multiplier) <<
- SIPrefixes[prefix] << "s";
- return s;
-}
-
-void Ruler::draw_cursors(QPainter &p)
+void Ruler::draw_cursors(QPainter &p, unsigned int prefix)
{
if (!_view.cursors_shown())
return;
const QRect r = rect();
- pair<Cursor, Cursor> &cursors = _view.cursors();
- cursors.first.paint_label(p, r);
- cursors.second.paint_label(p, r);
+ CursorPair &cursors = _view.cursors();
+ cursors.first().paint_label(p, r, prefix);
+ cursors.second().paint_label(p, r, prefix);
}
void Ruler::draw_hover_mark(QPainter &p)
return;
p.setPen(QPen(Qt::NoPen));
- p.setBrush(QBrush(QColor(Qt::black)));
+ p.setBrush(QBrush(palette().color(foregroundRole())));
const int b = height() - 1;
const QPointF points[] = {