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

Add surface collection to RimTools

Browse Source
This commit is contained in:
Magne Sjaastad
2023-08-30 10:52:31 +02:00
parent 0a807618b9
commit 1ed7dcbd4a
10 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationLibCode/Commands/RicCreateSurfaceIntersectionBandFeature.cpp
View File

@@ -23,11 +23,10 @@
#include "RimAnnotationLineAppearance.h"
#include "RimEnsembleSurface.h"
#include "RimExtrudedCurveIntersection.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimSurface.h"
#include "RimSurfaceCollection.h"
#include "RimSurfaceIntersectionBand.h"
#include "RimTools.h"
#include "Riu3DMainWindowTools.h"
@@ -37,21 +36,12 @@
CAF_CMD_SOURCE_INIT( RicCreateSurfaceIntersectionBandFeature, "RicCreateSurfaceIntersectionBandFeature" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSurfaceCollection* RicCreateSurfaceIntersectionBandFeature::surfaceCollection()
{
RimProject* proj = RimProject::current();
return proj->activeOilField()->surfaceCollection();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicCreateSurfaceIntersectionBandFeature::isCommandEnabled() const
{
auto* surfColl = RicCreateSurfaceIntersectionBandFeature::surfaceCollection();
auto* surfColl = RimTools::surfaceCollection();
auto surfaces = surfColl->ensembleSurfaces();
return !surfaces.empty();
@@ -67,7 +57,7 @@ void RicCreateSurfaceIntersectionBandFeature::onActionTriggered( bool isChecked
{
RimEnsembleSurface* firstEnsembleSurface = nullptr;
{
auto surfColl = RicCreateSurfaceIntersectionBandFeature::surfaceCollection();
auto surfColl = RimTools::surfaceCollection();
auto surfaces = surfColl->ensembleSurfaces();
if ( !surfaces.empty() ) firstEnsembleSurface = surfaces.front();
}

5
ApplicationLibCode/Commands/RicCreateSurfaceIntersectionBandFeature.h
View File

@@ -20,8 +20,6 @@
#include "cafCmdFeature.h"
class RimSurfaceCollection;
//==================================================================================================
///
//==================================================================================================
@@ -29,9 +27,6 @@ class RicCreateSurfaceIntersectionBandFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
public:
static RimSurfaceCollection* surfaceCollection();
protected:
bool isCommandEnabled() const override;
void onActionTriggered( bool isChecked ) override;

10
ApplicationLibCode/Commands/RicImportEnsembleSurfaceFeature.cpp
View File

@@ -29,9 +29,8 @@
#include "RimEnsembleSurface.h"
#include "RimFileSurface.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimSurfaceCollection.h"
#include "RimTools.h"
#include "Riu3DMainWindowTools.h"
@@ -91,6 +90,8 @@ void RicImportEnsembleSurfaceFeature::importSingleEnsembleSurfaceFromFiles( cons
fileNamesForEachLayer[layerName].push_back( fileName );
}
RimSurfaceCollection* surfColl = RimTools::surfaceCollection();
RimEnsembleSurface* ensembleToSelect = nullptr;
for ( const auto& fileNamesForLayer : fileNamesForEachLayer )
{
@@ -153,12 +154,13 @@ void RicImportEnsembleSurfaceFeature::importSingleEnsembleSurfaceFromFiles( cons
ensemble->addFileSurface( surface );
ensemble->loadDataAndUpdate();
RimProject::current()->activeOilField()->surfaceCollection->addEnsembleSurface( ensemble );
surfColl->addEnsembleSurface( ensemble );
ensembleToSelect = ensemble;
}
RimProject::current()->activeOilField()->surfaceCollection->updateConnectedEditors();
surfColl->updateConnectedEditors();
Riu3DMainWindowTools::selectAsCurrentItem( ensembleToSelect );
}

6
ApplicationLibCode/Commands/SurfaceCommands/RicImportSurfacesFeature.cpp
View File

@@ -20,10 +20,9 @@
#include "RiaApplication.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimSurface.h"
#include "RimSurfaceCollection.h"
#include "RimTools.h"
#include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
@@ -65,8 +64,7 @@ void RicImportSurfacesFeature::onActionTriggered( bool isChecked )
if ( !surfColl )
{
auto proj = RimProject::current();
surfColl = proj->activeOilField()->surfaceCollection();
surfColl = RimTools::surfaceCollection();
}
if ( !surfColl ) return;