diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-07-01 13:15:29 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-07-01 14:21:24 +0300 |
commit | 8ddb504c75949203c9982a3f6945b697b85c876d (patch) | |
tree | 60211955c2a6538270a74153e3ac069f70c261e1 /src/datavis3d/axis/qabstractaxis.h | |
parent | 84ebb9cf116548d4304e6a9609b76f3c78698691 (diff) |
Decouple data and axes.
Note: Accessing same axes from renderer thread and main application
thread without mutexes is not cool. Axis handling needs further
thinking.
Change-Id: I5cfd9a095583012a9dccff0a1769916e3da19c22
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavis3d/axis/qabstractaxis.h')
-rw-r--r-- | src/datavis3d/axis/qabstractaxis.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/datavis3d/axis/qabstractaxis.h b/src/datavis3d/axis/qabstractaxis.h index cecd110d..398643b1 100644 --- a/src/datavis3d/axis/qabstractaxis.h +++ b/src/datavis3d/axis/qabstractaxis.h @@ -81,7 +81,7 @@ public: virtual ~QAbstractAxis(); QString title() const; - QVector<QString> labels() const; + QVector<QString> &labels() const; AxisOrientation orientation() const; AxisType type() const; @@ -98,8 +98,9 @@ protected: private: Q_DISABLE_COPY(QAbstractAxis) - friend class QAbstractDataSetPrivate; - friend class QDataSetPrivate; + friend class Abstract3DController; + friend class Bars3dController; + friend class Bars3dRenderer; }; QT_DATAVIS3D_END_NAMESPACE |