From 50f6420c1569953f025d8a83cc9f046dbcfbff21 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 4 Sep 2014 09:55:55 +0200 Subject: [PATCH] NNC : Show item count in folder No Common Area Nncs --- .../ProjectDataModel/RimFaultCollection.cpp | 6 ++++-- .../RimNoCommonAreaNncCollection.cpp | 19 +++++++++++++++++++ .../RimNoCommonAreaNncCollection.h | 7 ++++++- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp index 263d94cc6e..4ccb2265a4 100644 --- a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp @@ -71,11 +71,11 @@ RimFaultCollection::RimFaultCollection() CAF_PDM_InitField(&showNNCs, "ShowNNCs", false, "Show NNCs", "", "", ""); - CAF_PDM_InitFieldNoDefault(&faults, "Faults", "Faults", "", "", ""); - CAF_PDM_InitFieldNoDefault(&noCommonAreaNnncCollection, "NoCommonAreaNnncCollection", "NNCs With No Common Area", "", "", ""); noCommonAreaNnncCollection = new RimNoCommonAreaNncCollection; + CAF_PDM_InitFieldNoDefault(&faults, "Faults", "Faults", "", "", ""); + m_reservoirView = NULL; } @@ -260,6 +260,8 @@ void RimFaultCollection::syncronizeFaults() noCommonAreaNnc->name = txt; this->noCommonAreaNnncCollection()->noCommonAreaNncs().push_back(noCommonAreaNnc); } + + this->noCommonAreaNnncCollection()->updateName(); } } diff --git a/ApplicationCode/ProjectDataModel/RimNoCommonAreaNncCollection.cpp b/ApplicationCode/ProjectDataModel/RimNoCommonAreaNncCollection.cpp index 70799990f6..08a674e836 100644 --- a/ApplicationCode/ProjectDataModel/RimNoCommonAreaNncCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimNoCommonAreaNncCollection.cpp @@ -27,6 +27,9 @@ RimNoCommonAreaNncCollection::RimNoCommonAreaNncCollection() { CAF_PDM_InitObject("RimNoCommonAreaNncCollection", "", "", ""); + CAF_PDM_InitField(&name, "UserDescription", QString("No Common Area Nncs"), "Name", "", "", ""); + name.setUiHidden(true); + CAF_PDM_InitFieldNoDefault(&noCommonAreaNncs, "NoCommonAreaNncs", "NoCommonAreaNncs", "", "", ""); } @@ -38,3 +41,19 @@ RimNoCommonAreaNncCollection::~RimNoCommonAreaNncCollection() noCommonAreaNncs.deleteAllChildObjects(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +caf::PdmFieldHandle* RimNoCommonAreaNncCollection::userDescriptionField() +{ + return &name; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimNoCommonAreaNncCollection::updateName() +{ + name = QString("NNCs With No Common Area (%1)").arg(noCommonAreaNncs().size()); +} + diff --git a/ApplicationCode/ProjectDataModel/RimNoCommonAreaNncCollection.h b/ApplicationCode/ProjectDataModel/RimNoCommonAreaNncCollection.h index f7bcd24737..dae7220a07 100644 --- a/ApplicationCode/ProjectDataModel/RimNoCommonAreaNncCollection.h +++ b/ApplicationCode/ProjectDataModel/RimNoCommonAreaNncCollection.h @@ -35,5 +35,10 @@ public: RimNoCommonAreaNncCollection(); virtual ~RimNoCommonAreaNncCollection(); - caf::PdmPointersField noCommonAreaNncs; + void updateName(); + + virtual caf::PdmFieldHandle* userDescriptionField(); + + caf::PdmField name; + caf::PdmPointersField noCommonAreaNncs; };