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 );
}
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/Commands/RicImportElementPropertyFeature.h
View File

@@ -20,6 +20,8 @@
#include "cafCmdFeature.h"
class RimGeoMechCase;
//==================================================================================================
///
//==================================================================================================
@@ -27,7 +29,7 @@ class RicImportElementPropertyFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
static void importElementProperties();
static void importElementProperties( RimGeoMechCase* pCase );
protected:
void onActionTriggered( bool isChecked ) override;

10
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp
View File

@@ -1067,7 +1067,7 @@ void RimGeoMechCase::reloadSelectedElementPropertyFiles()
//--------------------------------------------------------------------------------------------------
void RimGeoMechCase::importElementPropertyFile()
{
RicImportElementPropertyFeature::importElementProperties();
RicImportElementPropertyFeature::importElementProperties( this );
}
//--------------------------------------------------------------------------------------------------
@@ -1125,15 +1125,15 @@ void RimGeoMechCase::defineEditorAttribute( const caf::PdmFieldHandle* field, QS
{
if ( field == &m_importElementPropertyFileCommand )
{
dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute )->m_buttonText = "Import Element Property";
dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute )->m_buttonText = "Import New Element Property";
}
if ( field == &m_reloadElementPropertyFileCommand )
{
dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute )->m_buttonText = "Reload Element Property";
dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute )->m_buttonText = "Reload Selected Properties";
}
if ( field == &m_closeElementPropertyFileCommand )
{
dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute )->m_buttonText = "Close Element Property";
dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute )->m_buttonText = "Close Selected Properties";
}
if ( field == &m_biotFixedCoefficient )
@@ -1160,7 +1160,7 @@ QList<caf::PdmOptionItemInfo> RimGeoMechCase::calculateValueOptions( const caf::
{
for ( size_t i = 0; i < m_elementPropertyFileNames.v().size(); i++ )
{
options.push_back( caf::PdmOptionItemInfo( m_elementPropertyFileNames.v().at( i ).path(), (int)i, true ) );
options.push_back( caf::PdmOptionItemInfo( m_elementPropertyFileNames.v().at( i ).path(), (int)i, false ) );
}
}
else if ( fieldNeedingOptions == &m_biotResultAddress || fieldNeedingOptions == &m_initialPermeabilityResultAddress )