summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/data/qcustom3dvolume_p.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-08-25 13:16:04 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-08-25 15:01:10 +0300
commit5a51d06ec8f0210f51e65abfde9f868ab7bfa8ef (patch)
tree2319880f2d66e5610d9d1040d886f52cada82ad8 /src/datavisualization/data/qcustom3dvolume_p.h
parentf9bb71fd11cce59d74e78202a1117c8abb3a2e44 (diff)
Add alpha multiplier to QCustom3DVolume api
Change-Id: I856c4166513f6d6f7b73fd52bc46d52ab1b8fdff Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/data/qcustom3dvolume_p.h')
-rw-r--r--src/datavisualization/data/qcustom3dvolume_p.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/datavisualization/data/qcustom3dvolume_p.h b/src/datavisualization/data/qcustom3dvolume_p.h
index 69dd1eb2..b83e27fb 100644
--- a/src/datavisualization/data/qcustom3dvolume_p.h
+++ b/src/datavisualization/data/qcustom3dvolume_p.h
@@ -40,13 +40,15 @@ struct QCustomVolumeDirtyBitField {
bool colorTableDirty : 1;
bool textureDataDirty : 1;
bool textureFormatDirty : 1;
+ bool alphaDirty : 1;
QCustomVolumeDirtyBitField()
: textureDimensionsDirty(false),
sliceIndicesDirty(false),
colorTableDirty(false),
textureDataDirty(false),
- textureFormatDirty(false)
+ textureFormatDirty(false),
+ alphaDirty(false)
{
}
};
@@ -64,6 +66,7 @@ public:
virtual ~QCustom3DVolumePrivate();
void resetDirtyBits();
+ QImage renderSlice(Qt::Axis axis, int index);
QCustom3DVolume *qptr();
@@ -79,9 +82,14 @@ public:
QVector<QRgb> m_colorTable;
QVector<uchar> *m_textureData;
+ float m_alphaMultiplier;
+ bool m_preserveOpacity;
+
QCustomVolumeDirtyBitField m_dirtyBitsVolume;
private:
+ int multipliedAlphaValue(int alpha);
+
friend class QCustom3DVolume;
};