diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2018-02-27 14:37:41 +0200 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2018-03-19 09:03:27 +0000 |
| commit | 089ab17e462646dcd9edf785aa6850ad92b3a8e0 (patch) | |
| tree | a58f0c08022bb2ca1a0dae672ff796dd1a7a62ac /src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h | |
| parent | 6741e0b808aef4992c81df1128b8db0f8113f49f (diff) | |
Continue timeline work
Split timeline and tree views, implement layer locking, filter rows, start connection to the app data mode.
Task-number: QT3DS-1262
Change-Id: I54fb659e5c4f1103b8cf792b04bcaf012779cf1a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h index 81e0df0b..9b6a5b84 100644 --- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h +++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h @@ -54,6 +54,7 @@ class CTimelineTranslationManager; class CBaseStateRow; class Qt3DSDMTimelineItemProperty; class CCmdDataModelSetKeyframeTime; +class RowTree; namespace qt3dsdm { class CStudioSystem; @@ -74,7 +75,8 @@ protected: // Typedef typedef std::vector<Qt3DSDMAssetTimelineKeyframe> TAssetKeyframeList; protected: - CBaseStateRow *m_Row; + CBaseStateRow *m_Row; // TODO: remove after finishing the new timeline + RowTree *m_rowTree = nullptr; CTimelineTranslationManager *m_TransMgr; qt3dsdm::Qt3DSDMInstanceHandle m_DataHandle; ITimelineItemBinding *m_Parent; @@ -121,7 +123,9 @@ public: // ITimelineItemBinding ITimelineItem *GetTimelineItem() override; - CBaseStateRow *GetRow() override; + CBaseStateRow *GetRow() override; // Mahmoud_TODO: remove after finishing the new timeline + RowTree *getRowTree() const override; + void setRowTree(RowTree *row) override; void SetSelected(bool inMultiSelect) override; void OnCollapsed() override; void ClearKeySelection() override; @@ -179,8 +183,8 @@ public: long inInstanceCount) override; void RefreshStateRow(bool inRefreshChildren = false); - virtual CPropertyRow* AddPropertyRow(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle, - bool inAppend = false); + virtual void AddPropertyRow(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle, + bool inAppend = false); virtual void RemovePropertyRow(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle); virtual void RefreshPropertyKeyframe(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle, qt3dsdm::Qt3DSDMKeyframeHandle, |