From e90528d522038bb11395872d1da9d3a4581c3c6a Mon Sep 17 00:00:00 2001 From: mpa Date: Wed, 2 Apr 2014 09:51:41 +0400 Subject: [PATCH] Correction of mistakes: 0022479: EDF 2823 SMESH: Add "multiplier" coefficient for balls --- src/VTKViewer/VTKViewer_PolyDataMapper.cxx | 10 +++++----- src/VTKViewer/VTKViewer_PolyDataMapper.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/VTKViewer/VTKViewer_PolyDataMapper.cxx b/src/VTKViewer/VTKViewer_PolyDataMapper.cxx index 3d8733cc5..0f1f19587 100644 --- a/src/VTKViewer/VTKViewer_PolyDataMapper.cxx +++ b/src/VTKViewer/VTKViewer_PolyDataMapper.cxx @@ -254,7 +254,7 @@ VTKViewer_PolyDataMapper::VTKViewer_PolyDataMapper() this->MarkerScale = VTK::MS_NONE; this->MarkerId = 0; this->BallEnabled = false; - this->BallScale = VTK::MS_10; + this->BallScale = 1.0; this->VertexProgram = 0; } @@ -386,12 +386,12 @@ void VTKViewer_PolyDataMapper::SetBallEnabled( bool theBallEnabled ) } //----------------------------------------------------------------------------- -int VTKViewer_PolyDataMapper::GetBallScale() +double VTKViewer_PolyDataMapper::GetBallScale() { return this->BallScale; } //----------------------------------------------------------------------------- -void VTKViewer_PolyDataMapper::SetBallScale( int theBallScale ) +void VTKViewer_PolyDataMapper::SetBallScale( double theBallScale ) { if( this->BallScale == theBallScale ) return; @@ -794,7 +794,7 @@ namespace VTK vtkIdType &theVertexId, TBall* theBallArr, vtkDataArray* theDiamArray, - int theBallScale ) + double theBallScale ) { vtkIdType* ptIds = theCells->GetPointer(); vtkIdType* endPtIds = ptIds + theCells->GetNumberOfConnectivityEntries(); @@ -839,7 +839,7 @@ namespace VTK TColorFunctorBase* theColorFunctor, TVertex* theVertexArr, TBall* theBallArr, - int theBallScale ) + double theBallScale ) { vtkIdType aCellId = 0, aVertexId = 0; diff --git a/src/VTKViewer/VTKViewer_PolyDataMapper.h b/src/VTKViewer/VTKViewer_PolyDataMapper.h index 44b5e6bc6..88592e9a2 100644 --- a/src/VTKViewer/VTKViewer_PolyDataMapper.h +++ b/src/VTKViewer/VTKViewer_PolyDataMapper.h @@ -76,9 +76,9 @@ public: bool GetBallEnabled( ); //! Set ball scale factor - void SetBallScale( int ); + void SetBallScale( double ); - int GetBallScale( ); + double GetBallScale( ); //! Set standard point marker void SetMarkerStd( VTK::MarkerType, VTK::MarkerScale ); @@ -131,7 +131,7 @@ private: bool MarkerEnabled; bool BallEnabled; - int BallScale; + double BallScale; VTK::MarkerType MarkerType; VTK::MarkerScale MarkerScale; int MarkerId; -- 2.39.2