Qt4 porting: it's impossible to validate Scale Factor = 0 set by typing

diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
index 879691f5a3b50427718f7ca72346f5272cd2d495..7cdb29cbdd9364da69a854a79bc5780a50db1c0c 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
@@ -188,7 +188,7 @@ VisuGUI_CutPlanesPane::VisuGUI_CutPlanesPane (QWidget* theParent)
   
   QLabel* LabelDeformation2 = new QLabel (tr("LBL_DEFROMATION_SCALE"), GDeformation);
   GDeformationLayout->addWidget( LabelDeformation2, 1, 0 );
-  myScaleSpn = new QtxDoubleSpinBox (0.0, 1.0E+38, 0.1, aPrecision*(-1), 38, GDeformation);
+  myScaleSpn = new QtxDoubleSpinBox (0, 1.0E+38, 0.1, aPrecision*(-1), 38, GDeformation);
   myScaleSpn->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
   GDeformationLayout->addWidget( myScaleSpn, 1, 1 );
   connect(myVectorialFieldCombo,     SIGNAL(activated(int)), this, SLOT(onVectorialFieldChanged(int)));
@@ -312,17 +312,17 @@ double VisuGUI_CutPlanesPane::getScaleFactor(){
 
 void VisuGUI_CutPlanesPane::setScaleFactor(double theFactor){
   double i=0.1;
-  while (1) { // Calculate Step & Precission
-    if ( int (theFactor/i) >= 0)
-      break;
-    else {
-      i = i*0.1;
+  if (theFactor > 0) {
+    while (1) { // Calculate Step & Precission
+      if ( int (theFactor/i) >= 0)
+       break;
+      else
+       i = i*0.1;
     }
   }
 
   myScaleSpn->setSingleStep(i);
   myScaleSpn->setValue(theFactor);
-  
 }
 
 void VisuGUI_CutPlanesPane::createPlanes()

diff --git a/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
index c48a8d03f4955c584ea565e45f691dd5494beb2e..69ff6259573f276eb640676ba81c2b367698d223 100644 (file)
--- a/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
+++ b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
@@ -100,7 +100,7 @@ VisuGUI_DeformedShapeAndScalarMapDlg::VisuGUI_DeformedShapeAndScalarMapDlg (Salo
   SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr();
   int aPrecision = aResourceMgr->integerValue( "VISU", "floating_point_precision", 0 );
 
-  ScalFact = new QtxDoubleSpinBox (1.0E-20, 1.0E+38, 0.1, aPrecision*(-1), 32, TopGroup);
+  ScalFact = new QtxDoubleSpinBox (0, 1.0E+38, 0.1, aPrecision*(-1), 32, TopGroup);
   ScalFact->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
   ScalFact->setValue(0.1);
   TopGroupLayout->addWidget(ScalFact, 0, 1);
@@ -295,16 +295,16 @@ double VisuGUI_DeformedShapeAndScalarMapDlg::getFactor() const
 void VisuGUI_DeformedShapeAndScalarMapDlg::setFactor(double theFactor)
 {
   double i=0.1;
-  while (1) { // Calculate Step & Precission
-    if ( int (theFactor/i) > 0)
-      break;
-    else {
-      i = i*0.1;
+  if ( theFactor > 0 ) {
+    while (1) { // Calculate Step & Precission
+      if ( int (theFactor/i) > 0)
+       break;
+      else
+       i = i*0.1;
     }
   }
 
   ScalFact->setSingleStep(i);
-
   ScalFact->setValue(theFactor);
 }
 

diff --git a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
index a6129feb9a27bb73c32a2fb63a568f0187b05326..9f4de1b4e93ffe05a66a3ff5ac2769fc8a148e51 100644 (file)
--- a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
+++ b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
@@ -92,7 +92,7 @@ VisuGUI_DeformedShapeDlg::VisuGUI_DeformedShapeDlg (SalomeApp_Module* theModule)
   SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr();
   int aPrecision = aResourceMgr->integerValue( "VISU", "floating_point_precision", 0 );
 
-  ScalFact = new QtxDoubleSpinBox (1.0E-20, 1.0E+38, 0.1, aPrecision*(-1), 38, TopGroup);
+  ScalFact = new QtxDoubleSpinBox (0, 1.0E+38, 0.1, aPrecision*(-1), 38, TopGroup);
   ScalFact->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
   ScalFact->setValue(0.1);
   TopGroupLayout->addWidget(ScalFact, 0, 1);
@@ -173,16 +173,16 @@ void VisuGUI_DeformedShapeDlg::initFromPrsObject (VISU::ColoredPrs3d_i* thePrs,
 void VisuGUI_DeformedShapeDlg::setFactor(double theFactor)
 {
   double i=0.1;
-  while (1) { // Calculate Step & Precission
-    if ( int (theFactor/i) > 0)
-      break;
-    else {
-      i = i*0.1;
+  if (theFactor > 0) {
+    while (1) { // Calculate Step & Precission
+      if ( int (theFactor/i) > 0)
+       break;
+      else
+       i = i*0.1;
     }
   }
 
   ScalFact->setSingleStep(i);
-
   ScalFact->setValue(theFactor);
 }
 

diff --git a/src/VISUGUI/VisuGUI_VectorsDlg.cxx b/src/VISUGUI/VisuGUI_VectorsDlg.cxx
index 91e037a68c740d78b7c2001950bc594f4aadc515..10b210c9b84b4a093e0fb0f65250c4f08d2ff99b 100644 (file)
--- a/src/VISUGUI/VisuGUI_VectorsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_VectorsDlg.cxx
@@ -93,7 +93,7 @@ VisuGUI_VectorsDlg::VisuGUI_VectorsDlg (SalomeApp_Module* theModule)
   SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr();
   int aPrecision = aResourceMgr->integerValue( "VISU", "floating_point_precision", 0 );
 
-  ScalFact = new QtxDoubleSpinBox( 1e-20, 1.0E+38, 0.1, aPrecision*(-1), 32, TopGroup );
+  ScalFact = new QtxDoubleSpinBox( 0, 1.0E+38, 0.1, aPrecision*(-1), 32, TopGroup );
   ScalFact->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
   ScalFact->setValue( 0.1 );
 
@@ -327,16 +327,16 @@ void VisuGUI_VectorsDlg::enableSetColor()
 void VisuGUI_VectorsDlg::setScaleFactor( double theFactor )
 {
   double i=0.1;
-  while (1) { // Calculate Step & Precission
-    if ( int (theFactor/i) > 0)
-      break;
-    else {
-      i = i*0.1;
+  if (theFactor > 0) { // Calculate Step & Precission
+    while (1) { 
+      if ( int (theFactor/i) > 0)
+       break;
+      else
+       i = i*0.1;
     }
   }
   
   ScalFact->setSingleStep(i);
-
   ScalFact->setValue( theFactor );
 }