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

#7453 StimPlanModel: Move pressure table check boxes to template.

Browse Source
This commit is contained in:
Kristian Bendiksen 2021-03-04 13:56:53 +01:00 committed by Magne Sjaastad
parent 0377da8097
commit e5edba0d34
4 changed files with 19 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.cpp
View File

@ -34,15 +34,6 @@ RimPressureTable::RimPressureTable()
{ {
CAF_PDM_InitObject( "Pressure Table", "", "", "" ); CAF_PDM_InitObject( "Pressure Table", "", "", "" );
CAF_PDM_InitField( &m_useForInitialPressure,
"UseForInitialPressure",
false,
"Use Pressure Table For Initial Pressure",
"",
"",
"" );
CAF_PDM_InitField( &m_useForPressure, "UseForPressure", false, "Use Pressure Table For Pressure", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_pressureTableItems, "Items", "Pressure Table Items", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_pressureTableItems, "Items", "Pressure Table Items", "", "", "" );
m_pressureTableItems.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); m_pressureTableItems.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() );
m_pressureTableItems.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_pressureTableItems.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
@ -56,14 +47,6 @@ RimPressureTable::~RimPressureTable()
{ {
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmField<bool>* RimPressureTable::useForInitialPressureField()
{
return &m_useForInitialPressure;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -174,19 +157,6 @@ void RimPressureTable::fieldChangedByUi( const caf::PdmFieldHandle* changedField
onTableChanged(); onTableChanged();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimPressureTable::usePressureTableForProperty( RiaDefines::CurveProperty curveProperty ) const
{
if ( curveProperty == RiaDefines::CurveProperty::INITIAL_PRESSURE )
return m_useForInitialPressure();
else if ( curveProperty == RiaDefines::CurveProperty::PRESSURE )
return m_useForPressure();
else
return false;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

6
ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.h
View File

@ -44,10 +44,6 @@ public:
void deleteItem( RimPressureTableItem* itemToDelete ); void deleteItem( RimPressureTableItem* itemToDelete );
void deleteAllItems(); void deleteAllItems();
bool usePressureTableForProperty( RiaDefines::CurveProperty curveProperty ) const;
caf::PdmField<bool>* useForInitialPressureField();
protected: protected:
void defineCustomContextMenu( const caf::PdmFieldHandle* fieldNeedingMenu, QMenu* menu, QWidget* fieldEditorWidget ) override; void defineCustomContextMenu( const caf::PdmFieldHandle* fieldNeedingMenu, QMenu* menu, QWidget* fieldEditorWidget ) override;
void defineEditorAttribute( const caf::PdmFieldHandle* field, void defineEditorAttribute( const caf::PdmFieldHandle* field,
@ -62,7 +58,5 @@ protected:
void initAfterRead() override; void initAfterRead() override;
private: private:
caf::PdmField<bool> m_useForInitialPressure;
caf::PdmField<bool> m_useForPressure;
caf::PdmChildArrayField<RimPressureTableItem*> m_pressureTableItems; caf::PdmChildArrayField<RimPressureTableItem*> m_pressureTableItems;
}; };

23
ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp
View File

@ -79,6 +79,14 @@ RimStimPlanModelTemplate::RimStimPlanModelTemplate()
"", "",
"", "",
"" ); "" );
CAF_PDM_InitField( &m_useTableForInitialPressure,
"UseForInitialPressure",
false,
"Use Pressure Table For Initial Pressure",
"",
"",
"" );
CAF_PDM_InitField( &m_useTableForPressure, "UseForPressure", false, "Use Pressure Table For Pressure", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_staticEclipseCase, "StaticEclipseCase", "Static Case", "", "", "" ); CAF_PDM_InitScriptableFieldNoDefault( &m_staticEclipseCase, "StaticEclipseCase", "Static Case", "", "", "" );
@ -283,11 +291,9 @@ void RimStimPlanModelTemplate::defineUiOrdering( QString uiConfigName, caf::PdmU
uiOrdering.add( &m_dynamicEclipseCase ); uiOrdering.add( &m_dynamicEclipseCase );
uiOrdering.add( &m_timeStep ); uiOrdering.add( &m_timeStep );
uiOrdering.add( &m_initialPressureEclipseCase ); uiOrdering.add( &m_initialPressureEclipseCase );
if ( m_pressureTable ) uiOrdering.add( &m_useTableForInitialPressure );
{ uiOrdering.add( &m_useTableForPressure );
uiOrdering.add( m_pressureTable->useForInitialPressureField() ); m_initialPressureEclipseCase.uiCapability()->setUiReadOnly( m_useTableForInitialPressure() );
m_initialPressureEclipseCase.uiCapability()->setUiReadOnly( m_pressureTable->useForInitialPressureField()->value() );
}
uiOrdering.add( &m_staticEclipseCase ); uiOrdering.add( &m_staticEclipseCase );
@ -871,5 +877,10 @@ bool RimStimPlanModelTemplate::usePressureTableForProperty( RiaDefines::CurvePro
{ {
if ( !m_pressureTable ) return false; if ( !m_pressureTable ) return false;
return m_pressureTable->usePressureTableForProperty( curveProperty ); if ( curveProperty == RiaDefines::CurveProperty::INITIAL_PRESSURE )
return m_useTableForInitialPressure();
else if ( curveProperty == RiaDefines::CurveProperty::PRESSURE )
return m_useTableForPressure();
else
return false;
} }

2
ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h
View File

@ -146,6 +146,8 @@ private:
caf::PdmPtrField<RimEclipseCase*> m_dynamicEclipseCase; caf::PdmPtrField<RimEclipseCase*> m_dynamicEclipseCase;
caf::PdmField<int> m_timeStep; caf::PdmField<int> m_timeStep;
caf::PdmPtrField<RimEclipseCase*> m_initialPressureEclipseCase; caf::PdmPtrField<RimEclipseCase*> m_initialPressureEclipseCase;
caf::PdmField<bool> m_useTableForInitialPressure;
caf::PdmField<bool> m_useTableForPressure;
caf::PdmPtrField<RimEclipseCase*> m_staticEclipseCase; caf::PdmPtrField<RimEclipseCase*> m_staticEclipseCase;
caf::PdmField<double> m_defaultPorosity; caf::PdmField<double> m_defaultPorosity;
caf::PdmField<double> m_defaultPermeability; caf::PdmField<double> m_defaultPermeability;