mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-25 06:38:13 -05:00
Add ADL-based field traits, migrate all call sites, remove cafInternalPdmValueFieldSpecializations.h
Introduce cafPdmFieldTraits.h with ADL-based pdmToVariant/pdmFromVariant/pdmVariantEqual as a replacement for PdmValueFieldSpecialization. Migrate all types (AppEnum, FilePath, PdmPointer, cvf types) and all call sites (PdmDataValueField, PdmProxyValueField, UI framework, ApplicationLibCode). Delete cafInternalPdmValueFieldSpecializations.h. Add cafPdmFieldTraits unit tests and fix std::optional support.
This commit is contained in:
1 parent
e0a3606ae1
commit
ab97381d94
52 files changed
+995
-484
No files matched your search
@@ -94,7 +94,7 @@ void RicApplyUserDefinedCameraFeature::readCameraFromSettings( cvf::Vec3d& eye,
|
||||
QVariant upVariant = settings.value( RicStoreUserDefinedCameraFeature::upName() );
|
||||
if ( eyeVariant.isNull() || vrpVariant.isNull() || upVariant.isNull() ) return;
|
||||
|
||||
caf::PdmValueFieldSpecialization<cvf::Vec3d>::setFromVariant( eyeVariant, eye );
|
||||
caf::PdmValueFieldSpecialization<cvf::Vec3d>::setFromVariant( vrpVariant, vrp );
|
||||
caf::PdmValueFieldSpecialization<cvf::Vec3d>::setFromVariant( upVariant, up );
|
||||
caf::pdmFromVariant( eyeVariant, eye );
|
||||
caf::pdmFromVariant( vrpVariant, vrp );
|
||||
caf::pdmFromVariant( upVariant, up );
|
||||
}
|
||||
@@ -104,13 +104,13 @@ void RicStoreUserDefinedCameraFeature::onActionTriggered( bool isChecked )
|
||||
|
||||
camera->toLookAt( &eye, &vrp, &up );
|
||||
|
||||
QVariant eyeVariant = caf::PdmValueFieldSpecialization<cvf::Vec3d>::convert( eye );
|
||||
QVariant eyeVariant = caf::pdmToVariant( eye );
|
||||
settings.setValue( RicStoreUserDefinedCameraFeature::eyeName(), eyeVariant );
|
||||
|
||||
QVariant vrpVariant = caf::PdmValueFieldSpecialization<cvf::Vec3d>::convert( vrp );
|
||||
QVariant vrpVariant = caf::pdmToVariant( vrp );
|
||||
settings.setValue( RicStoreUserDefinedCameraFeature::viewReferencePointName(), vrpVariant );
|
||||
|
||||
QVariant upVariant = caf::PdmValueFieldSpecialization<cvf::Vec3d>::convert( up );
|
||||
QVariant upVariant = caf::pdmToVariant( up );
|
||||
settings.setValue( RicStoreUserDefinedCameraFeature::upName(), upVariant );
|
||||
|
||||
RiuMainWindow::instance()->refreshViewActions();
|
||||
|
||||
@@ -177,7 +177,7 @@ void RicTextAnnotation3dEditor::updatePoint( caf::PdmUiFieldHandle* uiField, con
|
||||
|
||||
cvf::Vec3d domainPos = dispXf->transformToDomainCoord( newPos );
|
||||
domainPos.z() = -domainPos.z();
|
||||
QVariant originVariant = caf::PdmValueFieldSpecialization<cvf::Vec3d>::convert( domainPos );
|
||||
QVariant originVariant = caf::pdmToVariant( domainPos );
|
||||
|
||||
caf::PdmUiCommandSystemProxy::instance()->setUiValueToField( uiField, originVariant );
|
||||
}
|
||||
+1
-1
@@ -142,7 +142,7 @@ void RicPolylineTarget3dEditor::slotUpdated( const cvf::Vec3d& origin, const cvf
|
||||
|
||||
cvf::Vec3d domainOrigin = dispXf->transformToDomainCoord( origin );
|
||||
domainOrigin.z() = -domainOrigin.z();
|
||||
QVariant originVariant = caf::PdmValueFieldSpecialization<cvf::Vec3d>::convert( domainOrigin );
|
||||
QVariant originVariant = caf::pdmToVariant( domainOrigin );
|
||||
|
||||
caf::PdmUiCommandSystemProxy::instance()->setUiValueToField( target->targetPointUiCapability(), originVariant );
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user