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

Use template function

Browse Source
This commit is contained in:
Magne Sjaastad
2024-04-01 17:07:23 +02:00
parent 55831a9e24
commit 4a70bf04c9
9 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationLibCode/Commands/EclipseCommands/RicEclipseShowOnlyFaultFeature.cpp
View File

@@ -28,6 +28,7 @@
#include "RigFault.h"
#include "RigMainGrid.h"
#include "cafPdmSetFieldValue.h"
#include "cafPdmUiObjectHandle.h"
#include <QAction>
@@ -75,13 +76,13 @@ void RicEclipseShowOnlyFaultFeature::onActionTriggered( bool isChecked )
{
caf::PdmField<bool>* field = dynamic_cast<caf::PdmField<bool>*>( childUiObject->objectToggleField() );
if ( field ) field->setValueWithFieldChanged( false );
if ( field ) caf::setValueWithFieldChanged( field, false );
}
}
if ( rimFault )
{
rimFault->showFault.setValueWithFieldChanged( true );
caf::setValueWithFieldChanged( &rimFault->showFault, true );
}
}

3
ApplicationLibCode/Commands/RicVec3dPickEventHandler.cpp
View File

@@ -22,6 +22,7 @@
#include "RiuViewer.h"
#include "cafDisplayCoordTransform.h"
#include "cafPdmSetFieldValue.h"
#include "cafSelectionManager.h"
//--------------------------------------------------------------------------------------------------
@@ -54,7 +55,7 @@ bool RicVec3dPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eventObj
pickedPositionInUTM.z() *= -1.0;
m_vectorField->setValueWithFieldChanged( pickedPositionInUTM );
caf::setValueWithFieldChanged( m_vectorField, pickedPositionInUTM );
return true;
}

4
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp
View File

@@ -52,6 +52,7 @@
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "cafPdmSetFieldValue.h"
#include "cafPdmUiComboBoxEditor.h"
#include "cafPdmUiPushButtonEditor.h"
@@ -245,7 +246,8 @@ void RicSummaryPlotEditorUi::fieldChangedByUi( const caf::PdmFieldHandle* change
m_okButtonField = false;
caf::PdmField<bool>* field = dynamic_cast<caf::PdmField<bool>*>( m_targetPlot->uiCapability()->objectToggleField() );
field->setValueWithFieldChanged( true );
caf::setValueWithFieldChanged( field, true );
RiuPlotMainWindow* mainPlotWindow = RiaGuiApplication::instance()->mainPlotWindow();
mainPlotWindow->updateMultiPlotToolBar();

2
ApplicationLibCode/Commands/ToggleCommands/RicToggleItemsFeatureImpl.cpp
View File

@@ -137,7 +137,7 @@ void RicToggleItemsFeatureImpl::setObjectToggleStateForSelection( SelectionToggl
if ( field == lastField )
{
field->setValueWithFieldChanged( value );
caf::setValueWithFieldChanged( field, value );
}
else
{

4
ApplicationLibCode/Commands/ToggleCommands/RicToggleItemsOnOthersOffFeature.cpp
View File

@@ -25,7 +25,9 @@
#include "cafPdmObject.h"
#include "cafPdmObjectHandle.h"
#include "cafPdmSetFieldValue.h"
#include "cafPdmUiItem.h"
#include <QAction>
CAF_CMD_SOURCE_INIT( RicToggleItemsOnOthersOffFeature, "RicToggleItemsOnOthersOffFeature" );
@@ -72,7 +74,7 @@ void RicToggleItemsOnOthersOffFeature::onActionTriggered( bool isChecked )
{
caf::PdmField<bool>* field = dynamic_cast<caf::PdmField<bool>*>( selectedObject->objectToggleField() );
field->setValueWithFieldChanged( true );
caf::setValueWithFieldChanged( field, true );
}
}

6
ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
View File

@@ -50,6 +50,7 @@
#include "cafPdmFieldScriptingCapability.h"
#include "cafPdmObject.h"
#include "cafPdmObjectScriptingCapability.h"
#include "cafPdmSetFieldValue.h"
#include "cafPdmUiDoubleSliderEditor.h"
#include "cafPdmUiFilePathEditor.h"
#include "cafPdmUiTextEditor.h"
@@ -243,13 +244,14 @@ void RimStimPlanFractureTemplate::computeDepthOfWellPathAtFracture()
if ( firstTvd != HUGE_VAL && lastTvd != HUGE_VAL )
{
m_wellPathDepthAtFracture.setValueWithFieldChanged( ( firstTvd + lastTvd ) / 2 );
caf::setValueWithFieldChanged( &m_wellPathDepthAtFracture, ( firstTvd + lastTvd ) / 2 );
}
else
{
firstTvd = m_stimPlanFractureDefinitionData->minDepth();
lastTvd = m_stimPlanFractureDefinitionData->maxDepth();
m_wellPathDepthAtFracture.setValueWithFieldChanged( ( firstTvd + lastTvd ) / 2 );
caf::setValueWithFieldChanged( &m_wellPathDepthAtFracture, ( firstTvd + lastTvd ) / 2 );
}
}
}

4
ApplicationLibCode/ProjectDataModel/Completions/RimThermalFractureTemplate.cpp
View File

@@ -43,6 +43,7 @@
#include "cafPdmFieldScriptingCapability.h"
#include "cafPdmObject.h"
#include "cafPdmObjectScriptingCapability.h"
#include "cafPdmSetFieldValue.h"
#include "cafPdmUiFilePathEditor.h"
#include "cafPdmUiTextEditor.h"
@@ -289,7 +290,8 @@ void RimThermalFractureTemplate::computeDepthOfWellPathAtFracture()
if ( m_fractureDefinitionData )
{
double z = m_fractureDefinitionData->centerPosition().z();
m_wellPathDepthAtFracture.setValueWithFieldChanged( z );
caf::setValueWithFieldChanged( &m_wellPathDepthAtFracture, z );
}
}

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

@@ -39,6 +39,7 @@
#include "cafAppEnum.h"
#include "cafPdmFieldCvfColor.h"
#include "cafPdmFieldCvfMat4d.h"
#include "cafPdmSetFieldValue.h"
#include "cafPdmUiCheckBoxEditor.h"
#include "cafPdmUiTreeOrdering.h"
@@ -473,5 +474,5 @@ void RimFaultInViewCollection::setShowOppositeFaultFaces( bool bEnabled )
//--------------------------------------------------------------------------------------------------
void RimFaultInViewCollection::setShowFaultLabelWithFieldChanged( bool bEnabled )
{
m_showFaultLabel.setValueWithFieldChanged( bEnabled );
caf::setValueWithFieldChanged( &m_showFaultLabel, bEnabled );
}

33
ApplicationLibCode/ProjectDataModel/Flow/RimWellConnectivityTable.cpp
View File

@@ -45,6 +45,7 @@
#include "RiuMatrixPlotWidget.h"
#include "cafPdmSetFieldValue.h"
#include "cafPdmUiComboBoxEditor.h"
#include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiToolButtonEditor.h"
@@ -330,8 +331,8 @@ void RimWellConnectivityTable::fieldChangedByUi( const caf::PdmFieldHandle* chan
}
else
{
m_selectedProducerTracersUiField.setValueWithFieldChanged( {} );
m_selectedInjectorTracersUiField.setValueWithFieldChanged( {} );
caf::setValueWithFieldChanged( &m_selectedProducerTracersUiField, std::vector<QString>() );
caf::setValueWithFieldChanged( &m_selectedInjectorTracersUiField, std::vector<QString>() );
}
onLoadDataAndUpdate();
@@ -1074,8 +1075,8 @@ void RimWellConnectivityTable::setSelectedProducersAndInjectorsForSingleTimeStep
const int timeStepIndex = getTimeStepIndex( m_selectedTimeStep, m_case->timeStepDates() );
if ( timeStepIndex < 0 )
{
m_selectedProducerTracersUiField.setValueWithFieldChanged( {} );
m_selectedInjectorTracersUiField.setValueWithFieldChanged( {} );
caf::setValueWithFieldChanged( &m_selectedProducerTracersUiField, std::vector<QString>() );
caf::setValueWithFieldChanged( &m_selectedInjectorTracersUiField, std::vector<QString>() );
return;
}
@@ -1084,8 +1085,8 @@ void RimWellConnectivityTable::setSelectedProducersAndInjectorsForSingleTimeStep
injectorVec.push_back( RiaDefines::reservoirTracerName() );
// No filtering if all producers/injectors are selected and assign to UI-elements
m_selectedProducerTracersUiField.setValueWithFieldChanged( producerVec );
m_selectedInjectorTracersUiField.setValueWithFieldChanged( injectorVec );
caf::setValueWithFieldChanged( &m_selectedProducerTracersUiField, producerVec );
caf::setValueWithFieldChanged( &m_selectedInjectorTracersUiField, injectorVec );
}
//--------------------------------------------------------------------------------------------------
@@ -1118,8 +1119,8 @@ void RimWellConnectivityTable::setSelectedProducersAndInjectorsForTimeStepRange(
injectorSet.insert( RiaDefines::reservoirTracerName() );
// Assign to UI-elements
m_selectedProducerTracersUiField.setValueWithFieldChanged( std::vector<QString>( producerSet.begin(), producerSet.end() ) );
m_selectedInjectorTracersUiField.setValueWithFieldChanged( std::vector<QString>( injectorSet.begin(), injectorSet.end() ) );
caf::setValueWithFieldChanged( &m_selectedProducerTracersUiField, std::vector<QString>( producerSet.begin(), producerSet.end() ) );
caf::setValueWithFieldChanged( &m_selectedInjectorTracersUiField, std::vector<QString>( injectorSet.begin(), injectorSet.end() ) );
}
//--------------------------------------------------------------------------------------------------
@@ -1160,7 +1161,7 @@ void RimWellConnectivityTable::syncSelectedInjectorsFromProducerSelection()
injectors.push_back( RiaDefines::reservoirTracerName() );
}
m_selectedInjectorTracersUiField.setValueWithFieldChanged( injectors );
caf::setValueWithFieldChanged( &m_selectedInjectorTracersUiField, injectors );
}
//--------------------------------------------------------------------------------------------------
@@ -1200,7 +1201,7 @@ void RimWellConnectivityTable::syncSelectedProducersFromInjectorSelection()
producers.push_back( RiaDefines::reservoirTracerName() );
}
m_selectedProducerTracersUiField.setValueWithFieldChanged( producers );
caf::setValueWithFieldChanged( &m_selectedProducerTracersUiField, producers );
}
//--------------------------------------------------------------------------------------------------
@@ -1210,8 +1211,8 @@ void RimWellConnectivityTable::setProducerSelectionFromViewFilterAndSynchInjecto
{
if ( !m_cellFilterView || !m_case || !m_case->eclipseCaseData() ) return;
m_selectedProducerTracersUiField.setValueWithFieldChanged(
getViewFilteredWellNamesFromFilterType( ViewFilterType::FILTER_BY_VISIBLE_PRODUCERS ) );
caf::setValueWithFieldChanged( &m_selectedProducerTracersUiField,
getViewFilteredWellNamesFromFilterType( ViewFilterType::FILTER_BY_VISIBLE_PRODUCERS ) );
syncSelectedInjectorsFromProducerSelection();
}
@@ -1223,8 +1224,8 @@ void RimWellConnectivityTable::setInjectorSelectionFromViewFilterAndSynchProduce
{
if ( !m_cellFilterView || !m_case || !m_case->eclipseCaseData() ) return;
m_selectedInjectorTracersUiField.setValueWithFieldChanged(
getViewFilteredWellNamesFromFilterType( ViewFilterType::FILTER_BY_VISIBLE_INJECTORS ) );
caf::setValueWithFieldChanged( &m_selectedInjectorTracersUiField,
getViewFilteredWellNamesFromFilterType( ViewFilterType::FILTER_BY_VISIBLE_INJECTORS ) );
syncSelectedProducersFromInjectorSelection();
}
@@ -1236,8 +1237,8 @@ void RimWellConnectivityTable::setWellSelectionFromViewFilter()
{
if ( !m_cellFilterView || m_viewFilterType == ViewFilterType::CALCULATE_BY_VISIBLE_CELLS )
{
m_selectedProducerTracersUiField.setValueWithFieldChanged( {} );
m_selectedInjectorTracersUiField.setValueWithFieldChanged( {} );
caf::setValueWithFieldChanged( &m_selectedProducerTracersUiField, std::vector<QString>() );
caf::setValueWithFieldChanged( &m_selectedInjectorTracersUiField, std::vector<QString>() );
return;
}