From 1e978229c19de19fcf9f65f6a7ee15a8c4baf4a0 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 16 Jul 2008 12:44:43 +0000 Subject: [PATCH] merge from V4_1_0_maintainance branch --- src/OCCViewer/OCCViewer_AxialScaleDlg.cxx | 2 ++ src/OCCViewer/OCCViewer_ClippingDlg.cxx | 7 +++---- src/SVTK/SVTK_CubeAxesDlg.cxx | 4 +--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx b/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx index 432186e9a..72d0fbd51 100644 --- 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 40fd9988e..f8dacb541 100644 --- 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 050028a08..92c3f2847 100644 --- 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); -- 2.39.2