From 3cf7deea3aa11790f8566d1ac5af05c08d39159e Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 20 Mar 2018 13:22:48 +0100 Subject: [PATCH] Hide next fracture ID from UI --- .../Completions/RimFractureTemplateCollection.cpp | 8 ++++---- .../Completions/RimFractureTemplateCollection.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp index 02ea9fc31d..b79b7cb6c0 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp @@ -48,7 +48,7 @@ CAF_PDM_SOURCE_INIT(RimFractureTemplateCollection, "FractureDefinitionCollection //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureTemplateCollection::RimFractureTemplateCollection(void) +RimFractureTemplateCollection::RimFractureTemplateCollection() { CAF_PDM_InitObject("Fracture Templates", ":/FractureTemplates16x16.png", "", ""); @@ -60,8 +60,7 @@ RimFractureTemplateCollection::RimFractureTemplateCollection(void) m_fractureDefinitions.uiCapability()->setUiHidden(true); CAF_PDM_InitField(&m_nextValidFractureTemplateId, "NextValidFractureTemplateId", 0, "", "", "", ""); - m_fractureDefinitions.uiCapability()->setUiHidden(true); - + m_nextValidFractureTemplateId.uiCapability()->setUiHidden(true); } //-------------------------------------------------------------------------------------------------- @@ -77,7 +76,7 @@ RimFractureTemplateCollection::~RimFractureTemplateCollection() //-------------------------------------------------------------------------------------------------- RimFractureTemplate* RimFractureTemplateCollection::fractureTemplate(int id) const { - for (auto templ : m_fractureDefinitions) + for (const auto& templ : m_fractureDefinitions) { if (templ->id() == id) return templ; } @@ -391,5 +390,6 @@ int RimFractureTemplateCollection::nextFractureTemplateId() { int newId = m_nextValidFractureTemplateId; m_nextValidFractureTemplateId = m_nextValidFractureTemplateId + 1; + return newId; } diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h index f00d598106..2f677287d6 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h @@ -35,8 +35,8 @@ class RimFractureTemplateCollection : public caf::PdmObject CAF_PDM_HEADER_INIT; public: - RimFractureTemplateCollection(void); - virtual ~RimFractureTemplateCollection(void); + RimFractureTemplateCollection(); + virtual ~RimFractureTemplateCollection(); RimFractureTemplate* fractureTemplate(int id) const; std::vector fractureTemplates() const;