Dump Puthon extension

[modules/geom.git] / src / BasicGUI / BasicGUI_PlaneDlg.cxx

diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.cxx b/src/BasicGUI/BasicGUI_PlaneDlg.cxx
index 8647aa74ae9883c9ad21ee80cad4a0d386d0e534..d34e63c9ef00dd7a8225836d9364256a5190f9d7 100644 (file)
--- a/src/BasicGUI/BasicGUI_PlaneDlg.cxx
+++ b/src/BasicGUI/BasicGUI_PlaneDlg.cxx
@@ -613,16 +613,19 @@ bool BasicGUI_PlaneDlg::isValid( QString& msg )
     return false;
   }
 
-  if ( id == 0 )
-    return !CORBA::is_nil( myPoint ) && !CORBA::is_nil( myDir ) && 
-      GroupPntDir->SpinBox_DX->isValid( msg, !IsPreview() );
+  if ( id == 0 ) { 
+    bool ok = GroupPntDir->SpinBox_DX->isValid( msg, !IsPreview() );
+    return !CORBA::is_nil( myPoint ) && !CORBA::is_nil( myDir ) && ok;
+  }
   else if ( id == 1 ) {
+    bool ok = Group3Pnts->SpinBox_DX->isValid( msg, !IsPreview() );
     return !CORBA::is_nil( myPoint1  ) && !CORBA::is_nil( myPoint2 ) && !CORBA::is_nil( myPoint3 ) &&
-      !isEqual( myPoint1, myPoint2 ) && !isEqual( myPoint1, myPoint3 ) && !isEqual( myPoint2, myPoint3 ) &&
-      Group3Pnts->SpinBox_DX->isValid( msg, !IsPreview() );;
+      !isEqual( myPoint1, myPoint2 ) && !isEqual( myPoint1, myPoint3 ) && !isEqual( myPoint2, myPoint3 ) && ok;
+  }
+  else if ( id == 2 ) {
+    bool ok = GroupFace->SpinBox_DX->isValid( msg, !IsPreview() );
+    return !CORBA::is_nil( myFace ) && ok;
   }
-  else if ( id == 2 )
-    return !CORBA::is_nil( myFace ) && GroupFace->SpinBox_DX->isValid( msg, !IsPreview() );
   return false;
 }
 
@@ -652,7 +655,8 @@ bool BasicGUI_PlaneDlg::execute( ObjectList& objects )
   }
   
   if ( !anObj->_is_nil() ) {
-    anObj->SetParameters(getSizeAsString().toLatin1().constData());
+    if ( !IsPreview() )
+      anObj->SetParameters(getSizeAsString().toLatin1().constData());
     objects.push_back( anObj._retn() );
   }
   return res;