diff options
| author | Janne Kangas <janne.kangas@qt.io> | 2017-12-15 11:53:56 +0200 |
|---|---|---|
| committer | Janne Kangas <janne.kangas@qt.io> | 2018-01-12 08:33:15 +0000 |
| commit | 0707c13c34653066c89d5b25abe60a779650ee27 (patch) | |
| tree | 83d6556f01eda5c7977b505bbe1b0d74a2eb62ee /src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp | |
| parent | 4607f5ff35da9642e656476b78b1318bca7a1fa6 (diff) | |
[DataInput] Implement linking of Text element textstring to DataInput
Adds Text-element specific functionality that allows linking of text
element(s) "textstring" property to DataInput. This link forwards any
changes in DataInput valuestr property to linked element property.
DataInput path is hardwired to "this.DataInput" in proto implementation.
Future patches will integrate DataInput selection dialog that allows
choosing controlling datainput from the ones currently in scene.
User-visible DataInput functionality is still disabled from editor.
Task-ID: QT3DS-338
Change-Id: I064c616f6cf651fc12f1e810c7b807ed5cc04555
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp')
| -rw-r--r-- | src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp b/src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp index 42ad114b..6f42516b 100644 --- a/src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp +++ b/src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp @@ -1059,6 +1059,7 @@ Q_SIGNALS: void instanceDeleted(Qt3DSDMInstanceHandle); void animationCreated(Qt3DSDMAnimationHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle); void animationDeleted(Qt3DSDMAnimationHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle); + void controlledToggled(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle); void keyframeInserted(Qt3DSDMAnimationHandle, Qt3DSDMKeyframeHandle); void keyframeErased(Qt3DSDMAnimationHandle, Qt3DSDMKeyframeHandle); void keyframeUpdated(Qt3DSDMKeyframeHandle); @@ -1165,7 +1166,6 @@ public: { return CONNECT_SIGNAL_QT(&CStudioFullSystemSignaller::instanceDeleted); } - virtual TSignalConnectionPtr ConnectAnimationCreated(const std::function<void(Qt3DSDMAnimationHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> &inCallback) override @@ -1307,6 +1307,12 @@ public: { return CONNECT_SIGNAL_QT(&CStudioFullSystemSignaller::customReferencesModified); } + TSignalConnectionPtr ConnectControlledToggled( + const std::function<void( + Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> &inCallback) override + { + return CONNECT_SIGNAL_QT(&CStudioFullSystemSignaller::controlledToggled); + } virtual void SendChangeSetBegin() { @@ -1539,6 +1545,13 @@ public: CHECK_SIGNALS_ENABLED(); Q_EMIT customReferencesModified(inOwner, inString); } + + void SendControlledToggled(Qt3DSDMInstanceHandle inInstance, + Qt3DSDMPropertyHandle inProperty) override + { + CHECK_SIGNALS_ENABLED(); + Q_EMIT controlledToggled(inInstance, inProperty); + } }; TSignalItemPtr |