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

Improved UI for surface band and curves (#8026)

Browse Source 
* Add surface intersection bands and curves
* #8024 Ensemble Surface : Fix mix of files for a ensemble layer surface
This commit is contained in:
Magne Sjaastad
2021-09-23 09:59:29 +02:00
committed by GitHub
parent 3d0fa2e7c7
commit 515168600f
30 changed files with 1367 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionCollection.cpp Normal file
View File

@@ -0,0 +1,109 @@
////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2021- Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimSurfaceIntersectionCollection.h"
#include "RimSurfaceIntersectionBand.h"
#include "RimSurfaceIntersectionCurve.h"
CAF_PDM_SOURCE_INIT( RimSurfaceIntersectionCollection, "RimSurfaceIntersectionCollection" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSurfaceIntersectionCollection::RimSurfaceIntersectionCollection()
: objectChanged( this )
{
CAF_PDM_InitObject( "SurfaceIntersectionCollection_msj", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_intersectionBands, "IntersectionBands", "Intersection Bands", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_intersectionCurves, "IntersectionCurves", "Intersection Curves", "", "", "" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSurfaceIntersectionCurve* RimSurfaceIntersectionCollection::addIntersectionCurve()
{
auto curve = new RimSurfaceIntersectionCurve;
curve->objectChanged.connect( this, &RimSurfaceIntersectionCollection::onObjectChanged );
m_intersectionCurves.push_back( curve );
return curve;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSurfaceIntersectionBand* RimSurfaceIntersectionCollection::addIntersectionBand()
{
auto band = new RimSurfaceIntersectionBand;
band->objectChanged.connect( this, &RimSurfaceIntersectionCollection::onObjectChanged );
m_intersectionBands.push_back( band );
return band;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSurfaceIntersectionCurve*> RimSurfaceIntersectionCollection::surfaceIntersectionCurves() const
{
return m_intersectionCurves.childObjects();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSurfaceIntersectionBand*> RimSurfaceIntersectionCollection::surfaceIntersectionBands() const
{
return m_intersectionBands.childObjects();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSurfaceIntersectionCollection::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray,
std::vector<caf::PdmObjectHandle*>& referringObjects )
{
onObjectChanged( this );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSurfaceIntersectionCollection::onObjectChanged( const caf::SignalEmitter* emitter )
{
objectChanged.send();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSurfaceIntersectionCollection::initAfterRead()
{
for ( const auto& band : m_intersectionBands )
{
band->objectChanged.connect( this, &RimSurfaceIntersectionCollection::onObjectChanged );
}
for ( const auto& curve : m_intersectionCurves )
{
curve->objectChanged.connect( this, &RimSurfaceIntersectionCollection::onObjectChanged );
}
}