X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_PropertiesDlg.cxx;h=c588a274ce3cb0bbac00607d078a72a9e79f1dec;hb=643fd1da5c2ecc024a65126897af312fdd019611;hp=ecda71b99a6a00d7bf48c1369411c326fa9e445b;hpb=8608b2b5ca86779ae0b3c42239cb83f8eebf68e2;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_PropertiesDlg.cxx b/src/SMESHGUI/SMESHGUI_PropertiesDlg.cxx index ecda71b99..c588a274c 100644 --- a/src/SMESHGUI/SMESHGUI_PropertiesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_PropertiesDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -158,7 +159,7 @@ SMESHGUI_PropertiesDlg::SMESHGUI_PropertiesDlg( const VTK::MarkerMap& customMark QLabel* ballSizeLab = new QLabel( tr( "SIZE" ), myBallGrp ); myBallSize = new QtxIntSpinBox( myBallGrp ); QLabel* ballScaleLab = new QLabel( tr( "SCALE_FACTOR" ), myBallGrp ); - myBallScale = new QtxIntSpinBox( myBallGrp ); + myBallScale = new QtxDoubleSpinBox( 1e-2, 1e7, 0.5, myBallGrp ); hl = new QHBoxLayout( myBallGrp ); hl->setMargin( MARGIN ); hl->setSpacing( SPACING ); @@ -248,7 +249,6 @@ SMESHGUI_PropertiesDlg::SMESHGUI_PropertiesDlg( const VTK::MarkerMap& customMark myNodeMarker->setCustomMarkers( customMarkers ); myElem0dSize->setRange( 1, 10 ); myBallSize->setRange( 1, 10 ); - myBallScale->setRange( 1, 10 ); myEdgeWidth->setRange( 1, 5 ); myOutlineWidth->setRange( 1, 5 ); myShrinkSize->setRange( 20, 100 ); @@ -540,7 +540,7 @@ int SMESHGUI_PropertiesDlg::ballSize() const \brief Set discrete elements (balls) scale factor \param size discrete elements (balls) scale factor */ -void SMESHGUI_PropertiesDlg::setBallScale( int size ) +void SMESHGUI_PropertiesDlg::setBallScale( double size ) { myBallScale->setValue( size ); } @@ -549,7 +549,7 @@ void SMESHGUI_PropertiesDlg::setBallScale( int size ) \brief Get discrete elements (balls) scale factor \return current discrete elements (balls) scale factor */ -int SMESHGUI_PropertiesDlg::ballScale() const +double SMESHGUI_PropertiesDlg::ballScale() const { return myBallScale->value(); }