Skip to content

#4041 Annotations: make cvf::Vec3d::UNDEFINED the default "not set" v… #14218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kriben wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

#4041 Annotations: make cvf::Vec3d::UNDEFINED the default "not set" v… #14218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ApplicationLibCode/Commands/AnnotationCommands/RicTextAnnotation3dEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ void RicTextAnnotation3dEditor::configureAndUpdateUi( const QString& uiConfigNam
RiuViewer* ownerRiuViewer = dynamic_cast<RiuViewer*>( ownerViewer() );
Rim3dView* view = mainOrComparisonView();

if ( !textAnnot || !textAnnot->isActive() || !view )
if ( !textAnnot || !textAnnot->isActive() || !view || textAnnot->m_anchorPointXyd().isUndefined() ||
textAnnot->m_labelPointXyd().isUndefined() )
{
if ( m_cvfModel.notNull() ) m_cvfModel->removeAllParts();

Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/ModelVisualization/RivReachCircleAnnotationPartMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ void RivReachCircleAnnotationPartMgr::appendDynamicGeometryPartsToModel( cvf::Mo
bool RivReachCircleAnnotationPartMgr::validateAnnotation( const RimReachCircleAnnotation* annotation ) const
{
auto a = m_rimAnnotationInView->sourceAnnotation();
return a->centerPoint() != cvf::Vec3d::ZERO && a->radius() > 0.0;
return !a->centerPoint().isUndefined() && a->radius() > 0.0;
}

//--------------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/ModelVisualization/RivTextAnnotationPartMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ void RivTextAnnotationPartMgr::appendDynamicGeometryPartsToModel( cvf::ModelBasi
//--------------------------------------------------------------------------------------------------
bool RivTextAnnotationPartMgr::validateAnnotation( const RimTextAnnotation* annotation ) const
{
return rimAnnotation()->anchorPoint() != cvf::Vec3d::ZERO && !rimAnnotation()->text().isEmpty();
return !rimAnnotation()->anchorPoint().isUndefined() && !rimAnnotation()->text().isEmpty();
}

//--------------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ RimReachCircleAnnotation::RimReachCircleAnnotation()
nameField()->registerKeywordAlias( "Name" );
setName( "Circle Annotation" );

CAF_PDM_InitField( &m_centerPointXyd, "CenterPointXyd", Vec3d::ZERO, "Center Point" );
CAF_PDM_InitField( &m_centerPointXyd, "CenterPointXyd", Vec3d::UNDEFINED, "Center Point" );
m_centerPointXyd.uiCapability()->setUiEditorTypeName( caf::PdmUiPickableLineEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_centerPointPickEnabled, "AnchorPointPick", false, "" );
caf::PdmUiPushButtonEditor::configureEditorLabelHidden( &m_centerPointPickEnabled );
Expand Down Expand Up @@ -162,7 +162,7 @@ void RimReachCircleAnnotation::defineEditorAttribute( const caf::PdmFieldHandle*
{
attr->pickEventHandler = m_centerPointEventHandler;
attr->enablePicking = m_centerPointPickEnabled;
if ( m_centerPointXyd().isZero() )
if ( m_centerPointXyd().isUndefined() )
{
attr->enablePicking = true;
}
Expand Down
6 changes: 3 additions & 3 deletions ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ RimTextAnnotation::RimTextAnnotation()
CAF_PDM_InitScriptableObject( "TextAnnotation", ":/TextAnnotation16x16.png" );
setUi3dEditorTypeName( RicTextAnnotation3dEditor::uiEditorTypeName() );

CAF_PDM_InitField( &m_anchorPointXyd, "AnchorPointXyd", Vec3d::ZERO, "Anchor Point" );
CAF_PDM_InitField( &m_anchorPointXyd, "AnchorPointXyd", Vec3d::UNDEFINED, "Anchor Point" );
m_anchorPointXyd.uiCapability()->setUiEditorTypeName( caf::PdmUiPickableLineEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_anchorPointPickEnabledButtonField, "AnchorPointPick", false, "" );
caf::PdmUiPushButtonEditor::configureEditorLabelHidden( &m_anchorPointPickEnabledButtonField );

CAF_PDM_InitField( &m_labelPointXyd, "LabelPointXyd", Vec3d::ZERO, "Label Point" );
CAF_PDM_InitField( &m_labelPointXyd, "LabelPointXyd", Vec3d::UNDEFINED, "Label Point" );
m_labelPointXyd.uiCapability()->setUiEditorTypeName( caf::PdmUiPickableLineEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_labelPointPickEnabledButtonField, "LabelPointPick", false, "" );
caf::PdmUiPushButtonEditor::configureEditorLabelHidden( &m_labelPointPickEnabledButtonField );
Expand Down Expand Up @@ -166,7 +166,7 @@ void RimTextAnnotation::fieldChangedByUi( const caf::PdmFieldHandle* changedFiel
if ( changedField == &m_anchorPointXyd )
{
m_anchorPointPickEnabledButtonField = false;
if ( m_labelPointXyd().isZero() )
if ( m_labelPointXyd().isUndefined() )
{
m_labelPointXyd = m_anchorPointXyd;
}
Expand Down