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

Make sure imported element properties goes to the selected case.

Browse Source 
Improve reload/close element property UI
This commit is contained in:
Jon Jenssen
2023-12-20 16:10:17 +01:00
committed by jonjenssen
parent cf453ac4a5
commit a4db175bea
3 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ApplicationLibCode/Commands/RicImportElementPropertyFeature.cpp
View File

@@ -28,6 +28,8 @@
#include "RiuFileDialogTools.h"
#include "cafSelectionManagerTools.h"
#include <QAction>
#include <QFileInfo>
@@ -38,14 +40,37 @@ CAF_CMD_SOURCE_INIT( RicImportElementPropertyFeature, "RicImportElementPropertyF
//--------------------------------------------------------------------------------------------------
void RicImportElementPropertyFeature::onActionTriggered( bool isChecked )
{
importElementProperties();
std::vector<caf::PdmUiItem*> uiItems;
caf::SelectionManager::instance()->selectedItems( uiItems );
RimGeoMechCase* geomCase = nullptr;
if ( !uiItems.empty() )
{
geomCase = dynamic_cast<RimGeoMechCase*>( uiItems[0] );
}
if ( geomCase == nullptr )
{
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if ( !activeView ) return;
RimGeoMechView* activeGmv = dynamic_cast<RimGeoMechView*>( activeView );
if ( !activeGmv ) return;
geomCase = activeGmv->geoMechCase();
}
importElementProperties( geomCase );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicImportElementPropertyFeature::importElementProperties()
void RicImportElementPropertyFeature::importElementProperties( RimGeoMechCase* pCase )
{
if ( pCase == nullptr ) return;
RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory( "ELM_PROPS" );
@@ -65,16 +90,7 @@ void RicImportElementPropertyFeature::importElementProperties()
app->setLastUsedDialogDirectory( "ELM_PROPS", defaultDir );
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if ( !activeView ) return;
RimGeoMechView* activeGmv = dynamic_cast<RimGeoMechView*>( activeView );
if ( !activeGmv ) return;
if ( activeGmv->geoMechCase() )
{
activeGmv->geoMechCase()->addElementPropertyFiles( filePaths );
}
pCase->addElementPropertyFiles( filePaths );
}
//--------------------------------------------------------------------------------------------------