merge from V4_1_0_maintainance branch

diff --git a/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx b/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx
index 432186e9ac562eb897c080627af4d710971493bb..72d0fbd51ce33664d26b49556a45191cfffea931 100644 (file)
--- a/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx
+++ b/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx
@@ -123,6 +123,8 @@ OCCViewer_AxialScaleDlg::OCCViewer_AxialScaleDlg( OCCViewer_ViewWindow* view, QW
   connect( m_bReset,  SIGNAL( clicked() ), this, SLOT( reset() ) );
 
   connect( view,      SIGNAL( Hide( QHideEvent* ) ), this, SLOT( hide() ) );
+
+  resize( minimumSizeHint() );
 }
 
 /*!

diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.cxx b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
index 40fd9988ee4accb5e0be13703f8f72948f3ecb61..f8dacb54142cac673324825d5cbcd7c07cd48718 100644 (file)
--- a/src/OCCViewer/OCCViewer_ClippingDlg.cxx
+++ b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
@@ -80,11 +80,10 @@ OCCViewer_ClippingDlg::OCCViewer_ClippingDlg( OCCViewer_ViewWindow* view, QWidge
   GroupPointLayout->setMargin( 11 );
   
   // Controls
-  const double min = -1e+16;
-  const double max =  1e+16;
+  const double min = -1e+7;
+  const double max =  1e+7;
   const double step = 5;
-  const int precision = -6; // PAL12789. Minus is for using 'g' double->string conversion specifier,
-  //                          see QtxDoubleSpinBox::mapValueToText( double v )
+  const int precision = 3;
 
   TextLabelX = new QLabel( GroupPoint );
   TextLabelX->setObjectName( "TextLabelX" );

diff --git a/src/SVTK/SVTK_CubeAxesDlg.cxx b/src/SVTK/SVTK_CubeAxesDlg.cxx
index 050028a08fbce398c268344654646e994533dcc7..92c3f28476b6e707ba701f9f1a428b18801c4f2f 100644 (file)
--- a/src/SVTK/SVTK_CubeAxesDlg.cxx
+++ b/src/SVTK/SVTK_CubeAxesDlg.cxx
@@ -176,7 +176,7 @@ SVTK_CubeAxesDlg::AxisWidget::AxisWidget (QWidget* theParent)
   // Layout
 
   QVBoxLayout* aLay = new QVBoxLayout(this);
-  aLay->setMargin(0);
+  aLay->setMargin(5);
   aLay->setSpacing(5);
   aLay->addWidget(myNameGrp);
   aLay->addWidget(myLabelsGrp);
@@ -412,8 +412,6 @@ QWidget* SVTK_CubeAxesDlg::createMainFrame(QWidget* theParent)
   myTabWg->addTab(myAxes[ 1 ], tr("Y_AXIS"));
   myTabWg->addTab(myAxes[ 2 ], tr("Z_AXIS"));
 
-  myTabWg->setContentsMargins(5,5,5,5);
-
   myIsVisible = new QCheckBox(tr("IS_VISIBLE"), aFrame);
 
   QVBoxLayout* aLay = new QVBoxLayout(aFrame);