X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_PropertiesDlg.cxx;h=d1c732fafb600333d6aafb188fd3577d2d625db6;hb=18dade91d06a5b9964bb5604dbfdbc0ff4deef0a;hp=400a02532f77e09d797a6bbdb724343d35509910;hpb=209c9bd9c33255f46bfa60acc76c4c3878f815aa;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_PropertiesDlg.cxx b/src/SMESHGUI/SMESHGUI_PropertiesDlg.cxx index 400a02532..d1c732faf 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 @@ -156,8 +156,8 @@ SMESHGUI_PropertiesDlg::SMESHGUI_PropertiesDlg( const VTK::MarkerMap& customMark myBallGrp = new QGroupBox( tr( "BALLS" ), mainFrame() ); QLabel* ballColorLab = new QLabel( tr( "COLOR" ), myBallGrp ); myBallColor = new QtxColorButton( myBallGrp ); - QLabel* ballSizeLab = new QLabel( tr( "SIZE" ), myBallGrp ); - myBallSize = new QtxIntSpinBox( myBallGrp ); + // QLabel* ballSizeLab = new QLabel( tr( "SIZE" ), myBallGrp ); + // myBallSize = new QtxIntSpinBox( myBallGrp ); QLabel* ballScaleLab = new QLabel( tr( "SCALE_FACTOR" ), myBallGrp ); myBallScale = new QtxDoubleSpinBox( 1e-2, 1e7, 0.5, myBallGrp ); hl = new QHBoxLayout( myBallGrp ); @@ -165,12 +165,12 @@ SMESHGUI_PropertiesDlg::SMESHGUI_PropertiesDlg( const VTK::MarkerMap& customMark hl->setSpacing( SPACING ); hl->addWidget( ballColorLab ); hl->addWidget( myBallColor ); - hl->addWidget( ballSizeLab ); - hl->addWidget( myBallSize ); + // hl->addWidget( ballSizeLab ); + // hl->addWidget( myBallSize ); hl->addWidget( ballScaleLab ); hl->addWidget( myBallScale ); widthLab1 = qMax( widthLab1, ballColorLab->minimumSizeHint().width() ); - widthLab2 = qMax( widthLab2, ballSizeLab->minimumSizeHint().width() ); + // widthLab2 = qMax( widthLab2, ballSizeLab->minimumSizeHint().width() ); // -- orientation vector controls myOrientationGrp = new QGroupBox( tr( "ORIENTATIONS" ), mainFrame() ); @@ -234,13 +234,13 @@ SMESHGUI_PropertiesDlg::SMESHGUI_PropertiesDlg( const VTK::MarkerMap& customMark myVolumeColor->label()->setMinimumWidth( widthLab2 ); outlineWidthLab->setMinimumWidth( widthLab2 ); elem0dSizeLab->setMinimumWidth( widthLab2 ); - ballSizeLab->setMinimumWidth( widthLab2 ); + // ballSizeLab->setMinimumWidth( widthLab2 ); orientationScaleLab->setMinimumWidth( widthLab2 ); myEdgeWidth->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); myOutlineWidth->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); myElem0dSize->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); - myBallSize->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); + // myBallSize->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); myBallScale->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); myOrientationSize->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); myShrinkSize->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); @@ -248,7 +248,7 @@ SMESHGUI_PropertiesDlg::SMESHGUI_PropertiesDlg( const VTK::MarkerMap& customMark // initialize widgets myNodeMarker->setCustomMarkers( customMarkers ); myElem0dSize->setRange( 1, 10 ); - myBallSize->setRange( 1, 10 ); + // myBallSize->setRange( 1, 10 ); myEdgeWidth->setRange( 1, 5 ); myOutlineWidth->setRange( 1, 5 ); myShrinkSize->setRange( 20, 100 ); @@ -522,19 +522,19 @@ QColor SMESHGUI_PropertiesDlg::ballColor() const \brief Set discrete elements (balls) size \param size discrete elements (balls) size */ -void SMESHGUI_PropertiesDlg::setBallSize( int size ) +/*void SMESHGUI_PropertiesDlg::setBallSize( int size ) { myBallSize->setValue( size ); -} +}*/ /*! \brief Get discrete elements (balls) size \return current discrete elements (balls) size */ -int SMESHGUI_PropertiesDlg::ballSize() const +/*int SMESHGUI_PropertiesDlg::ballSize() const { return myBallSize->value(); -} +}*/ /*! \brief Set discrete elements (balls) scale factor