From ff7507fd9de9938f37ddda723f3eb2126affff85 Mon Sep 17 00:00:00 2001 From: imn Date: Fri, 17 Apr 2015 11:02:17 +0300 Subject: [PATCH] INT PAL 0052682: Local selection for ball elements has incorrect size --- src/OBJECT/SMESH_Actor.cxx | 8 ++++++++ src/OBJECT/SMESH_SVTKActor.cxx | 4 ++++ src/OBJECT/SMESH_SVTKActor.h | 1 + 3 files changed, 13 insertions(+) diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx index 045bb9cce..65f9e8787 100644 --- a/src/OBJECT/SMESH_Actor.cxx +++ b/src/OBJECT/SMESH_Actor.cxx @@ -2116,6 +2116,14 @@ double SMESH_ActorDef::GetBallScale() void SMESH_ActorDef::SetBallScale( double theVal ) { myBallActor->SetBallScale( theVal ); + if(SMESH_SVTKActor* aCustom = SMESH_SVTKActor::SafeDownCast( myHighlightActor )) { + aCustom->SetBallScale(theVal); + } + if(SMESH_SVTKActor* aCustom = SMESH_SVTKActor::SafeDownCast( myPreHighlightActor )) { + aCustom->SetBallScale(theVal); + } + + Modified(); } int SMESH_ActorDef::GetObjDimension( const int theObjId ) diff --git a/src/OBJECT/SMESH_SVTKActor.cxx b/src/OBJECT/SMESH_SVTKActor.cxx index 1b21525bd..4503dd1c4 100644 --- a/src/OBJECT/SMESH_SVTKActor.cxx +++ b/src/OBJECT/SMESH_SVTKActor.cxx @@ -197,6 +197,10 @@ void SMESH_SVTKActor::SetBallSize(float theSize) { myBallActor->GetProperty()->SetPointSize(theSize); } +void SMESH_SVTKActor::SetBallScale(double theScale) { + myBallActor->SetBallScale(theScale); +} + void SMESH_SVTKActor::SetVisualObject(TVisualObjPtr theVisualObj) { myVisualObj = theVisualObj; } diff --git a/src/OBJECT/SMESH_SVTKActor.h b/src/OBJECT/SMESH_SVTKActor.h index 42ebbe58a..fa9b51245 100644 --- a/src/OBJECT/SMESH_SVTKActor.h +++ b/src/OBJECT/SMESH_SVTKActor.h @@ -43,6 +43,7 @@ public: vtkTypeMacro(SMESH_SVTKActor, SVTK_Actor); + void SetBallScale(double theSize); void SetBallSize(float theSize); void Set0DSize(float theSize); -- 2.39.2