OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-14 09:33:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update Well IA and Fault RA processing workflows to work with updated tree UI hidden/visible logic changes.

Browse Source
This commit is contained in:
Jon Jenssen 2021-10-25 18:06:38 +02:00 committed by jonjenssen
parent d61129e639
commit be59eedd18
6 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationLibCode/Commands/GeoMechCommands/RicNewWellIntegrityAnalysisFeature.cpp
View File

@ -105,5 +105,6 @@ void RicNewWellIntegrityAnalysisFeature::setupActionLook( QAction* actionToSetup
//--------------------------------------------------------------------------------------------------
bool RicNewWellIntegrityAnalysisFeature::isCommandEnabled()
{
return true;
RimGeoMechView* view = dynamic_cast<RimGeoMechView*>( RiaApplication::instance()->activeGridView() );
return ( view != nullptr );
}

8
ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp
View File

@ -99,6 +99,7 @@ RimFaultInViewCollection::RimFaultInViewCollection()
CAF_PDM_InitFieldNoDefault( &m_faultRASettings, "FaultRASettings", "Reactivation Assessment Settings", "", "", "" );
m_faultRASettings = new RimFaultRASettings();
m_faultRASettings.uiCapability()->setUiHidden( true );
m_faultRASettings.uiCapability()->setUiTreeHidden( true );
}
@ -325,6 +326,13 @@ void RimFaultInViewCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiT
auto uiTree = eclipseView->faultResultSettings()->uiTreeOrdering();
uiTreeOrdering.appendChild( uiTree );
}
for ( const auto& fault : faults )
{
uiTreeOrdering.add( fault );
}
uiTreeOrdering.skipRemainingChildren( true );
}
//--------------------------------------------------------------------------------------------------

11
ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp
View File

@ -40,6 +40,7 @@
#include "cafPdmUiComboBoxEditor.h"
#include "cafPdmUiFilePathEditor.h"
#include "cafPdmUiTableViewEditor.h"
#include "cafPdmUiTreeOrdering.h"
#include <QFileInfo>
@ -169,6 +170,16 @@ void RimFaultRASettings::defineUiOrdering( QString uiConfigName, caf::PdmUiOrder
uiOrdering.skipRemainingFields( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFaultRASettings::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName )
{
uiTreeOrdering.add( &m_basicParameters );
uiTreeOrdering.add( &m_advancedParameters );
uiTreeOrdering.skipRemainingChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.h
View File

@ -89,7 +89,9 @@ public:
RimGenericParameter* getInputParameter( QString name ) const;
protected:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;

2
ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettingsCollection.cpp
View File

@ -25,6 +25,7 @@
#include "RimProject.h"
#include "RimWellIASettings.h"
#include "RimWellPath.h"
#include "cafPdmFieldScriptingCapability.h"
#include "cafPdmObjectScriptingCapability.h"
@ -40,6 +41,7 @@ RimWellIASettingsCollection::RimWellIASettingsCollection()
CAF_PDM_InitObject( "Integrity Analysis Models", ":/WellIntAnalysis.png", "", "" );
CAF_PDM_InitFieldNoDefault( &m_wellIASettings, "WellIASettings", "Settings", "", "", "" );
m_wellIASettings.uiCapability()->setUiHidden( true );
m_wellIASettings.uiCapability()->setUiTreeHidden( true );
setDeletable( true );

1
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp
View File

@ -141,7 +141,6 @@ RimWellPath::RimWellPath()
CAF_PDM_InitFieldNoDefault( &m_wellIASettingsCollection, "WellIASettings", "Integrity Analysis Settings", "", "", "" );
m_wellIASettingsCollection = new RimWellIASettingsCollection();
m_wellIASettingsCollection->uiCapability()->setUiTreeHidden( true );
this->setDeletable( true );
}