diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-03-28 14:51:26 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-04-01 08:28:57 +0300 |
commit | fe3c9ec0a9fb734e83eb70bc725c303a9d36cd6d (patch) | |
tree | 4996d94f8a7e4498fa8431c9dcc65526a99889bb /src/datavisualization/axis/qabstract3daxis.cpp | |
parent | 25f48fc046bbce83abeeef0a6081de9f5efcd6d7 (diff) |
Axis formatter customization example
Also refactored the formatter api somewhat:
- Removed virtual from allowNegatives and allowZero and added a
setter function for those. This will make it cleaner if we need to
add similar properties to the axis formatter in the future, as
no new virtual methods can be added without breaking BC.
- Changed the labelValues array to labelStrings list, as it makes
more sense to directly format the strings in recalculate.
Change-Id: I3ea005afa984bb756845ca356b999762e0807415
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/axis/qabstract3daxis.cpp')
-rw-r--r-- | src/datavisualization/axis/qabstract3daxis.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/axis/qabstract3daxis.cpp b/src/datavisualization/axis/qabstract3daxis.cpp index 3b60ff5d..94ff4283 100644 --- a/src/datavisualization/axis/qabstract3daxis.cpp +++ b/src/datavisualization/axis/qabstract3daxis.cpp @@ -288,7 +288,7 @@ void QAbstract3DAxisPrivate::updateLabels() // Default implementation does nothing } -void QAbstract3DAxisPrivate::setRange(float min, float max) +void QAbstract3DAxisPrivate::setRange(float min, float max, bool suppressWarnings) { bool adjusted = false; if (!allowNegatives()) { @@ -332,7 +332,7 @@ void QAbstract3DAxisPrivate::setRange(float min, float max) } if (minDirty || maxDirty) { - if (adjusted) { + if (adjusted && !suppressWarnings) { qWarning() << "Warning: Tried to set invalid range for axis." " Range automatically adjusted to a valid one:" << min << "-" << max << "-->" << m_min << "-" << m_max; |