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_p.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_p.h')
| -rw-r--r-- | src/datavis3d/axis/qabstractaxis_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/datavis3d/axis/qabstractaxis_p.h b/src/datavis3d/axis/qabstractaxis_p.h index fa98f924..7d64c957 100644 --- a/src/datavis3d/axis/qabstractaxis_p.h +++ b/src/datavis3d/axis/qabstractaxis_p.h @@ -66,8 +66,8 @@ public: virtual ~QAbstractAxisPrivate(); void setDrawer(Drawer *drawer); - QVector<LabelItem> labelItems() { return m_labelItems; } - LabelItem titleItem() { return m_titleItem; } + QVector<LabelItem> &labelItems() { return m_labelItems; } + LabelItem &titleItem() { return m_titleItem; } void setOrientation(QAbstractAxis::AxisOrientation orientation); public slots: @@ -79,6 +79,8 @@ protected: QAbstractAxis *q_ptr; QString m_title; + // TODO: Does m_titleItem/m_drawer/m_labelItems usage need to be protected with render mutex? + // TODO: Replace Drawer with AbstractRenderer? LabelItem m_titleItem; Drawer *m_drawer; // not owned QVector<QString> m_labels; @@ -89,7 +91,6 @@ protected: friend class QAbstractAxis; friend class QValueAxis; friend class QCategoryAxis; - friend class QDataSetPrivate; }; QT_DATAVIS3D_END_NAMESPACE |