summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Client/Code/Core/Doc/Doc.h
diff options
context:
space:
mode:
authorJanne Kangas <janne.kangas@qt.io>2018-08-22 10:31:47 +0300
committerJanne Kangas <janne.kangas@qt.io>2018-08-31 09:48:12 +0000
commitb369f0e12959129e8b92569879d40004113ea90b (patch)
tree9c22a9c12e6057519fc70465d797cba25530ef03 /src/Authoring/Client/Code/Core/Doc/Doc.h
parentdb7502ca4e8d5a6d153b557cc81f3c24192e3ec8 (diff)
Check allowable datainput types when changing existing datainput type
Property datatypes are now stored when datainput is bound as a controller to a property, and allowable datatypes are checked when entering the datainput edit dialog. User is given a clarification on why certain datatypes are grayed out. Change-Id: I1cfec1d3c1b2d656e51596e557b400789399b121 Task-Id: QT3DS-1916 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Client/Code/Core/Doc/Doc.h')
-rw-r--r--src/Authoring/Client/Code/Core/Doc/Doc.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/Authoring/Client/Code/Core/Doc/Doc.h b/src/Authoring/Client/Code/Core/Doc/Doc.h
index 9909f921..5b11acd7 100644
--- a/src/Authoring/Client/Code/Core/Doc/Doc.h
+++ b/src/Authoring/Client/Code/Core/Doc/Doc.h
@@ -161,6 +161,13 @@ public:
QString name;
int type;
QVector<qt3dsdm::Qt3DSDMInstanceHandle> controlledElems;
+ // The type of property/properties that this datainput controls
+ // for the purposes of limiting allowed datainput type changes.
+ // Note that there can be more than one type being controlled
+ // f.ex with Variant type. Boolean signifies "strict" type requirement
+ // i.e. only the exact equivalent mapping from datainput type to
+ // property type is allowed (float to float, string to string etc.)
+ QVector<QPair<qt3dsdm::DataModelDataType::Value, bool>> boundTypes;
};
//==============================================================================