OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3558 Grid items in Project Tree : Use function instead of variable

Browse Source
This commit is contained in:
Magne Sjaastad
2018-10-26 15:38:09 +02:00
parent 38f3e7d03d
commit b5dc2c7f94
3 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/RicDeleteTemporaryLgrsFeature.cpp
View File

@@ -35,7 +35,7 @@ CAF_CMD_SOURCE_INIT(RicDeleteTemporaryLgrsFeature, "RicDeleteTemporaryLgrsFeatur
bool RicDeleteTemporaryLgrsFeature::isCommandEnabled() bool RicDeleteTemporaryLgrsFeature::isCommandEnabled()
{ {
std::vector<RimGridInfoCollection*> selGridInfos = caf::selectedObjectsByTypeStrict<RimGridInfoCollection*>(); std::vector<RimGridInfoCollection*> selGridInfos = caf::selectedObjectsByTypeStrict<RimGridInfoCollection*>();
return selGridInfos.size() == 1 && selGridInfos.front()->uiName() == RimGridCollection::TEMPORARY_LGR_UI_NAME; return selGridInfos.size() == 1 && selGridInfos.front()->uiName() == RimGridCollection::temporaryGridUiName();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -44,7 +44,7 @@ bool RicDeleteTemporaryLgrsFeature::isCommandEnabled()
void RicDeleteTemporaryLgrsFeature::onActionTriggered(bool isChecked) void RicDeleteTemporaryLgrsFeature::onActionTriggered(bool isChecked)
{ {
std::vector<RimGridInfoCollection*> selGridInfos = caf::selectedObjectsByTypeStrict<RimGridInfoCollection*>(); std::vector<RimGridInfoCollection*> selGridInfos = caf::selectedObjectsByTypeStrict<RimGridInfoCollection*>();
if (selGridInfos.size() == 1 && selGridInfos.front()->uiName() == RimGridCollection::TEMPORARY_LGR_UI_NAME) if (selGridInfos.size() == 1 && selGridInfos.front()->uiName() == RimGridCollection::temporaryGridUiName())
{ {
RimEclipseCase* eclipseCase; RimEclipseCase* eclipseCase;
selGridInfos.front()->firstAncestorOrThisOfType(eclipseCase); selGridInfos.front()->firstAncestorOrThisOfType(eclipseCase);

71
ApplicationCode/ProjectDataModel/RimGridCollection.cpp
View File

@@ -2,24 +2,24 @@
// //
// Copyright (C) Statoil ASA // Copyright (C) Statoil ASA
// Copyright (C) Ceetron Solutions AS // Copyright (C) Ceetron Solutions AS
// //
// ResInsight is free software: you can redistribute it and/or modify // ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or // WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE. // FITNESS FOR A PARTICULAR PURPOSE.
// //
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> // See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details. // for more details.
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RimGridCollection.h" #include "RimGridCollection.h"
#include "RimGridView.h"
#include "RimEclipseCase.h" #include "RimEclipseCase.h"
#include "RimGridView.h"
#include "RigMainGrid.h" #include "RigMainGrid.h"
@@ -40,7 +40,6 @@ void removeGridInfo(const QString& gridName, std::vector<RimGridInfo*>& collecti
} }
} }
CAF_PDM_SOURCE_INIT(RimGridInfo, "GridInfo"); CAF_PDM_SOURCE_INIT(RimGridInfo, "GridInfo");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -112,16 +111,10 @@ caf::PdmFieldHandle* RimGridInfo::userDescriptionField()
return &m_gridName; return &m_gridName;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimGridInfo::fieldChangedByUi(const caf::PdmFieldHandle* changedField, void RimGridInfo::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) {}
const QVariant& oldValue,
const QVariant& newValue)
{
}
CAF_PDM_SOURCE_INIT(RimGridInfoCollection, "GridInfoCollection"); CAF_PDM_SOURCE_INIT(RimGridInfoCollection, "GridInfoCollection");
@@ -140,7 +133,6 @@ RimGridInfoCollection::RimGridInfoCollection()
m_gridInfos.uiCapability()->setUiTreeHidden(true); m_gridInfos.uiCapability()->setUiTreeHidden(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -161,7 +153,6 @@ void RimGridInfoCollection::clear()
m_gridInfos.deleteAllChildObjects(); m_gridInfos.deleteAllChildObjects();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -204,10 +195,9 @@ std::vector<RimGridInfo*> RimGridInfoCollection::gridInfos() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimGridInfoCollection::objectToggleField() caf::PdmFieldHandle* RimGridInfoCollection::objectToggleField()
{ {
return nullptr;// &m_isActive; return nullptr; // &m_isActive;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -222,12 +212,6 @@ CAF_PDM_SOURCE_INIT(RimGridCollection, "GridCollection");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const QString RimGridCollection::PERSISTENT_LGR_UI_NAME = "Persistent LGRs";
const QString RimGridCollection::TEMPORARY_LGR_UI_NAME = "Temporary LGRs";
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGridCollection::RimGridCollection() RimGridCollection::RimGridCollection()
{ {
CAF_PDM_InitObject("Grids", ":/draw_style_meshlines_24x24.png", "", ""); CAF_PDM_InitObject("Grids", ":/draw_style_meshlines_24x24.png", "", "");
@@ -242,20 +226,33 @@ RimGridCollection::RimGridCollection()
CAF_PDM_InitFieldNoDefault(&m_persistentLgrs, "PersistentLgrs", "Persistent LGRs", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_persistentLgrs, "PersistentLgrs", "Persistent LGRs", "", "", "");
m_persistentLgrs = new RimGridInfoCollection(); m_persistentLgrs = new RimGridInfoCollection();
m_persistentLgrs->setUiName(PERSISTENT_LGR_UI_NAME); m_persistentLgrs->setUiName(persistentGridUiName());
CAF_PDM_InitFieldNoDefault(&m_temporaryLgrs, "TemporaryLgrs", "Temporary LGRs", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_temporaryLgrs, "TemporaryLgrs", "Temporary LGRs", "", "", "");
m_temporaryLgrs.xmlCapability()->disableIO(); m_temporaryLgrs.xmlCapability()->disableIO();
m_temporaryLgrs = new RimGridInfoCollection(); m_temporaryLgrs = new RimGridInfoCollection();
m_temporaryLgrs->setUiName(TEMPORARY_LGR_UI_NAME); m_temporaryLgrs->setUiName(temporaryGridUiName());
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimGridCollection::~RimGridCollection() RimGridCollection::~RimGridCollection() {}
{
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const QString RimGridCollection::persistentGridUiName()
{
return "LGRs";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const QString RimGridCollection::temporaryGridUiName()
{
return "Temporary LGRs";
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -275,7 +272,7 @@ bool RimGridCollection::isActive() const
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimGridCollection::objectToggleField() caf::PdmFieldHandle* RimGridCollection::objectToggleField()
{ {
@@ -293,15 +290,15 @@ void RimGridCollection::syncFromMainGrid()
m_mainGrid->setName("Main Grid"); m_mainGrid->setName("Main Grid");
m_mainGrid->setIndex(0); m_mainGrid->setIndex(0);
auto allTemporaryGrids = m_temporaryLgrs->gridInfos(); auto allTemporaryGrids = m_temporaryLgrs->gridInfos();
auto allPersistentGrids = m_persistentLgrs->gridInfos(); auto allPersistentGrids = m_persistentLgrs->gridInfos();
size_t gridCount = mainGrid->gridCount(); size_t gridCount = mainGrid->gridCount();
for (size_t i = 1; i < gridCount; i++) for (size_t i = 1; i < gridCount; i++)
{ {
auto grid = mainGrid->gridByIndex(i); auto grid = mainGrid->gridByIndex(i);
QString gridName = QString::fromStdString(grid->gridName()); QString gridName = QString::fromStdString(grid->gridName());
size_t gridIndex = grid->gridIndex(); size_t gridIndex = grid->gridIndex();
if (grid->isTempGrid()) if (grid->isTempGrid())
{ {
@@ -344,9 +341,11 @@ void RimGridCollection::syncFromMainGrid()
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimGridCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void RimGridCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue)
{ {
if (changedField == &m_isActive) if (changedField == &m_isActive)
{ {
@@ -361,7 +360,7 @@ void RimGridCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimGridCollection::initAfterRead() void RimGridCollection::initAfterRead()
{ {

6
ApplicationCode/ProjectDataModel/RimGridCollection.h
View File

@@ -92,9 +92,6 @@ class RimGridCollection : public caf::PdmObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
static const QString PERSISTENT_LGR_UI_NAME;
static const QString TEMPORARY_LGR_UI_NAME;
RimGridCollection(); RimGridCollection();
~RimGridCollection() override; ~RimGridCollection() override;
@@ -103,6 +100,9 @@ public:
caf::PdmFieldHandle* objectToggleField() override; caf::PdmFieldHandle* objectToggleField() override;
void syncFromMainGrid(); void syncFromMainGrid();
static const QString persistentGridUiName();
static const QString temporaryGridUiName();
protected: protected:
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void initAfterRead() override; void initAfterRead() override;