diff --git a/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapCvfSpecialization.cpp b/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapCvfSpecialization.cpp index dea0717560..0faf8a6b9f 100644 --- a/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapCvfSpecialization.cpp +++ b/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapCvfSpecialization.cpp @@ -49,3 +49,18 @@ void TapCvfSpecialization::defineEditorAttribute(const caf::PdmFieldHandle* fiel } } } + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void TapCvfSpecialization::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/) +{ + caf::QIconProvider iconProvider = this->uiIconProvider(); + + cvf::Color3f cvfColor = m_colorField(); + QColor qcolor(cvfColor.rByte(), cvfColor.gByte(), cvfColor.bByte()); + + iconProvider.setBackgroundColor(qcolor); + + this->setUiIcon(iconProvider); +} diff --git a/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapCvfSpecialization.h b/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapCvfSpecialization.h index f28ee8050e..8899b0bf5f 100644 --- a/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapCvfSpecialization.h +++ b/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapCvfSpecialization.h @@ -29,10 +29,8 @@ public: caf::PdmField> m_vecArrayField; -public: - virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue); - protected: - virtual void - defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute); + void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue); + void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute); + void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override; }; diff --git a/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapProject.cpp b/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapProject.cpp index 8a6be11b25..8eedf2629e 100644 --- a/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapProject.cpp +++ b/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapProject.cpp @@ -11,7 +11,8 @@ TapProject::TapProject(void) CAF_PDM_InitFieldNoDefault(&m_objectList, "ObjectList", "Objects list Field", "", "List", "This is a list of PdmObjects"); CAF_PDM_InitFieldNoDefault(&m_testSpecialization, "TapCvfSpecialization", "TapCvfSpecialization Field", "", "", ""); - m_testSpecialization = new TapCvfSpecialization; + m_testSpecialization.push_back(new TapCvfSpecialization); + m_testSpecialization.push_back(new TapCvfSpecialization); } //-------------------------------------------------------------------------------------------------- diff --git a/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapProject.h b/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapProject.h index 468712f8f2..d1d487330b 100644 --- a/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapProject.h +++ b/Fwk/AppFwk/cafTests/cafTestCvfApplication/TapProject.h @@ -16,5 +16,5 @@ public: caf::PdmChildArrayField m_objectList; - caf::PdmChildField m_testSpecialization; -}; \ No newline at end of file + caf::PdmChildArrayField m_testSpecialization; +};