Use template function

This commit is contained in:
Magne Sjaastad 2024-04-01 17:13:25 +02:00
parent 4a70bf04c9
commit 8f6388e2d3
3 changed files with 20 additions and 17 deletions

View File

@ -62,6 +62,7 @@
#include "cafFrameAnimationControl.h"
#include "cafPdmFieldScriptingCapability.h"
#include "cafPdmFieldScriptingCapabilityCvfColor3.h"
#include "cafPdmSetFieldValue.h"
#include "cafPdmUiComboBoxEditor.h"
#include "cvfCamera.h"
@ -877,8 +878,8 @@ void Rim3dView::setupBeforeSave()
//--------------------------------------------------------------------------------------------------
void Rim3dView::setMeshOnlyDrawstyle()
{
meshMode.setValueWithFieldChanged( RiaDefines::MeshModeType::FULL_MESH );
surfaceMode.setValueWithFieldChanged( NO_SURFACE );
caf::setValueWithFieldChanged( &meshMode, RiaDefines::MeshModeType::FULL_MESH );
caf::setValueWithFieldChanged( &surfaceMode, NO_SURFACE );
}
//--------------------------------------------------------------------------------------------------
@ -886,8 +887,8 @@ void Rim3dView::setMeshOnlyDrawstyle()
//--------------------------------------------------------------------------------------------------
void Rim3dView::setMeshSurfDrawstyle()
{
surfaceMode.setValueWithFieldChanged( SURFACE );
meshMode.setValueWithFieldChanged( RiaDefines::MeshModeType::FULL_MESH );
caf::setValueWithFieldChanged( &surfaceMode, SURFACE );
caf::setValueWithFieldChanged( &meshMode, RiaDefines::MeshModeType::FULL_MESH );
}
//--------------------------------------------------------------------------------------------------
@ -895,8 +896,8 @@ void Rim3dView::setMeshSurfDrawstyle()
//--------------------------------------------------------------------------------------------------
void Rim3dView::setFaultMeshSurfDrawstyle()
{
surfaceMode.setValueWithFieldChanged( SURFACE );
meshMode.setValueWithFieldChanged( RiaDefines::MeshModeType::FAULTS_MESH );
caf::setValueWithFieldChanged( &surfaceMode, SURFACE );
caf::setValueWithFieldChanged( &meshMode, RiaDefines::MeshModeType::FAULTS_MESH );
}
//--------------------------------------------------------------------------------------------------
@ -904,8 +905,8 @@ void Rim3dView::setFaultMeshSurfDrawstyle()
//--------------------------------------------------------------------------------------------------
void Rim3dView::setSurfOnlyDrawstyle()
{
surfaceMode.setValueWithFieldChanged( SURFACE );
meshMode.setValueWithFieldChanged( RiaDefines::MeshModeType::NO_MESH );
caf::setValueWithFieldChanged( &surfaceMode, SURFACE );
caf::setValueWithFieldChanged( &meshMode, RiaDefines::MeshModeType::NO_MESH );
}
//--------------------------------------------------------------------------------------------------
@ -913,7 +914,7 @@ void Rim3dView::setSurfOnlyDrawstyle()
//--------------------------------------------------------------------------------------------------
void Rim3dView::setSurfaceDrawstyle()
{
if ( surfaceMode() != NO_SURFACE ) surfaceMode.setValueWithFieldChanged( SURFACE );
if ( surfaceMode() != NO_SURFACE ) caf::setValueWithFieldChanged( &surfaceMode, SURFACE );
}
//--------------------------------------------------------------------------------------------------
@ -1234,7 +1235,7 @@ void Rim3dView::setScaleZAndUpdate( double scalingFactor )
{
if ( scaleZ() != scalingFactor )
{
this->m_scaleZ.setValueWithFieldChanged( scalingFactor );
caf::setValueWithFieldChanged( &m_scaleZ, scalingFactor );
}
}
@ -1598,7 +1599,7 @@ void Rim3dView::setCameraPointOfInterest( const cvf::Vec3d& cameraPointOfInteres
//--------------------------------------------------------------------------------------------------
void Rim3dView::forceShowWindowOn()
{
m_showWindow.setValueWithFieldChanged( true );
caf::setValueWithFieldChanged( &m_showWindow, true );
}
//--------------------------------------------------------------------------------------------------

View File

@ -66,6 +66,7 @@
#include "RiuTextContentFrame.h"
#include "cafPdmObject.h"
#include "cafPdmSetFieldValue.h"
#include "cafPdmUiColorEditor.h"
#include "cafPdmUiDateEditor.h"
#include "cafPdmUiDoubleSliderEditor.h"
@ -1273,7 +1274,7 @@ void RimEnsembleCurveSet::onColorTagClicked( const SignalEmitter* emitter, size_
{
auto myColor = RiaColorTools::fromQColorTo3f( newColor );
colorToModify->setValueWithFieldChanged( myColor );
caf::setValueWithFieldChanged( colorToModify, myColor );
}
}
}

View File

@ -41,6 +41,7 @@
#include "RiuPlotMainWindow.h"
#include "cafPdmSetFieldValue.h"
#include "cafPdmUiComboBoxEditor.h"
#include "cafPdmUiItem.h"
#include "cafPdmUiLabelEditor.h"
@ -1151,23 +1152,23 @@ void RimSummaryPlotSourceStepping::setStep( QString stepIdentifier )
switch ( m_stepDimension() )
{
case RimSummaryDataSourceStepping::SourceSteppingDimension::WELL:
m_wellName.setValueWithFieldChanged( stepIdentifier );
caf::setValueWithFieldChanged( &m_wellName, stepIdentifier );
break;
case RimSummaryDataSourceStepping::SourceSteppingDimension::GROUP:
m_groupName.setValueWithFieldChanged( stepIdentifier );
caf::setValueWithFieldChanged( &m_groupName, stepIdentifier );
break;
case RimSummaryDataSourceStepping::SourceSteppingDimension::NETWORK:
m_networkName.setValueWithFieldChanged( stepIdentifier );
caf::setValueWithFieldChanged( &m_networkName, stepIdentifier );
break;
case RimSummaryDataSourceStepping::SourceSteppingDimension::VECTOR:
m_vectorName.setValueWithFieldChanged( stepIdentifier );
caf::setValueWithFieldChanged( &m_vectorName, stepIdentifier );
break;
case RimSummaryDataSourceStepping::SourceSteppingDimension::BLOCK:
m_cellBlock.setValueWithFieldChanged( stepIdentifier );
caf::setValueWithFieldChanged( &m_cellBlock, stepIdentifier );
break;
case RimSummaryDataSourceStepping::SourceSteppingDimension::AQUIFER: