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

#2331 Cleaned up whitespace. Made crossectionCollection protected

Browse Source
This commit is contained in:
Jacob Støren
2018-01-16 08:44:15 +01:00
parent 424c6a46f6
commit b1cf7f6674
8 changed files with 59 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/ProjectDataModel/Rim3dView.cpp
View File

@@ -873,9 +873,9 @@ RimGridView::RimGridView()
m_overrideRangeFilterCollection.xmlCapability()->setIOWritable(false);
m_overrideRangeFilterCollection.xmlCapability()->setIOReadable(false);
CAF_PDM_InitFieldNoDefault(&crossSectionCollection, "CrossSections", "Intersections", "", "", "");
crossSectionCollection.uiCapability()->setUiHidden(true);
crossSectionCollection = new RimIntersectionCollection();
CAF_PDM_InitFieldNoDefault(&m_crossSectionCollection, "CrossSections", "Intersections", "", "", "");
m_crossSectionCollection.uiCapability()->setUiHidden(true);
m_crossSectionCollection = new RimIntersectionCollection();
CAF_PDM_InitFieldNoDefault(&m_gridCollection, "GridCollection", "GridCollection", "", "", "");
m_gridCollection.uiCapability()->setUiHidden(true);
@@ -918,7 +918,7 @@ RimGridView::~RimGridView(void)
delete m_rangeFilterCollection;
delete m_overrideRangeFilterCollection;
delete crossSectionCollection;
delete m_crossSectionCollection;
delete m_gridCollection;
}
@@ -958,6 +958,14 @@ cvf::ref<cvf::UByteArray> RimGridView::currentTotalCellVisibility()
return m_currentReservoirCellVisibility;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimIntersectionCollection* RimGridView::crossSectionCollection() const
{
return m_crossSectionCollection();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -1114,7 +1122,7 @@ void RimGridView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
{
if ( changedField == &scaleZ )
{
crossSectionCollection->updateIntersectionBoxGeometry();
m_crossSectionCollection->updateIntersectionBoxGeometry();
}
Rim3dView::fieldChangedByUi(changedField, oldValue, newValue);