From e5edba0d34bc7b7bb09276acaebf38ce50a8bf2d Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Thu, 4 Mar 2021 13:56:53 +0100 Subject: [PATCH] #7453 StimPlanModel: Move pressure table check boxes to template. --- .../StimPlanModel/RimPressureTable.cpp | 30 ------------------- .../StimPlanModel/RimPressureTable.h | 6 ---- .../RimStimPlanModelTemplate.cpp | 23 ++++++++++---- .../StimPlanModel/RimStimPlanModelTemplate.h | 2 ++ 4 files changed, 19 insertions(+), 42 deletions(-) diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.cpp index ff893e9d6a..467bd63bfb 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.cpp @@ -34,15 +34,6 @@ RimPressureTable::RimPressureTable() { 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", "", "", "" ); m_pressureTableItems.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); m_pressureTableItems.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); @@ -56,14 +47,6 @@ RimPressureTable::~RimPressureTable() { } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -caf::PdmField* RimPressureTable::useForInitialPressureField() -{ - return &m_useForInitialPressure; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -174,19 +157,6 @@ void RimPressureTable::fieldChangedByUi( const caf::PdmFieldHandle* changedField 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; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.h b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.h index 1388af7323..7bcfd2e64e 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.h +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.h @@ -44,10 +44,6 @@ public: void deleteItem( RimPressureTableItem* itemToDelete ); void deleteAllItems(); - bool usePressureTableForProperty( RiaDefines::CurveProperty curveProperty ) const; - - caf::PdmField* useForInitialPressureField(); - protected: void defineCustomContextMenu( const caf::PdmFieldHandle* fieldNeedingMenu, QMenu* menu, QWidget* fieldEditorWidget ) override; void defineEditorAttribute( const caf::PdmFieldHandle* field, @@ -62,7 +58,5 @@ protected: void initAfterRead() override; private: - caf::PdmField m_useForInitialPressure; - caf::PdmField m_useForPressure; caf::PdmChildArrayField m_pressureTableItems; }; diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp index 1448711570..8e6fb1ae30 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp @@ -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", "", "", "" ); @@ -283,11 +291,9 @@ void RimStimPlanModelTemplate::defineUiOrdering( QString uiConfigName, caf::PdmU uiOrdering.add( &m_dynamicEclipseCase ); uiOrdering.add( &m_timeStep ); uiOrdering.add( &m_initialPressureEclipseCase ); - if ( m_pressureTable ) - { - uiOrdering.add( m_pressureTable->useForInitialPressureField() ); - m_initialPressureEclipseCase.uiCapability()->setUiReadOnly( m_pressureTable->useForInitialPressureField()->value() ); - } + uiOrdering.add( &m_useTableForInitialPressure ); + uiOrdering.add( &m_useTableForPressure ); + m_initialPressureEclipseCase.uiCapability()->setUiReadOnly( m_useTableForInitialPressure() ); uiOrdering.add( &m_staticEclipseCase ); @@ -871,5 +877,10 @@ bool RimStimPlanModelTemplate::usePressureTableForProperty( RiaDefines::CurvePro { 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; } diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h index f1fbee80f4..ae637177e2 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h @@ -146,6 +146,8 @@ private: caf::PdmPtrField m_dynamicEclipseCase; caf::PdmField m_timeStep; caf::PdmPtrField m_initialPressureEclipseCase; + caf::PdmField m_useTableForInitialPressure; + caf::PdmField m_useTableForPressure; caf::PdmPtrField m_staticEclipseCase; caf::PdmField m_defaultPorosity; caf::PdmField m_defaultPermeability;