projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
View: Use max time to calculate label length, not offset_
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index 032546dba034eda4cea63cc3f60489127cd28d9d..e6be30e0680b48670a885fb0630d25209b9953b7 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-496,6
+496,11
@@
void View::calculate_tick_spacing()
const double SpacingIncrement = 32.0f;
const double MinValueSpacing = 32.0f;
const double SpacingIncrement = 32.0f;
const double MinValueSpacing = 32.0f;
+ // Figure out the highest numeric value visible on a label
+ const QSize areaSize = viewport_->size();
+ const double max_time = max(fabs(offset_),
+ fabs(offset_ + scale_ * areaSize.width()));
+
double min_width = SpacingIncrement;
double label_width, tick_period_width;
double min_width = SpacingIncrement;
double label_width, tick_period_width;
@@
-523,7
+528,7
@@
void View::calculate_tick_spacing()
tick_period_width = tick_period_ / scale_;
const QString label_text =
tick_period_width = tick_period_ / scale_;
const QString label_text =
- format_time(
offset_
, tick_prefix_, time_unit_, tick_precision_);
+ format_time(
max_time
, tick_prefix_, time_unit_, tick_precision_);
label_width = m.boundingRect(0, 0, INT_MAX, INT_MAX,
Qt::AlignLeft | Qt::AlignTop, label_text).width() +
label_width = m.boundingRect(0, 0, INT_MAX, INT_MAX,
Qt::AlignLeft | Qt::AlignTop, label_text).width() +