Merge from V6_5_BR 05/06/2012

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

diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.cxx b/src/BasicGUI/BasicGUI_MarkerDlg.cxx
index 57115a86a93e4d9001487b8d89e96b44da13a13b..98c22720a5b092e39b4a3e2c3d79ff682c4f38ce 100644 (file)
--- a/src/BasicGUI/BasicGUI_MarkerDlg.cxx
+++ b/src/BasicGUI/BasicGUI_MarkerDlg.cxx
@@ -1,23 +1,23 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 // GEOM GEOMGUI : GUI for Geometry component
@@ -284,7 +284,7 @@ void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId )
     }
   }
 
-  displayPreview(true);
+  displayPreview();
 
   qApp->processEvents();
   updateGeometry();
@@ -301,6 +301,7 @@ void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId )
 //=================================================================================
 void BasicGUI_MarkerDlg::onOk()
 {
+  setIsApplyAndClose( true );
   if ( onApply() )
     ClickOnCancel();
 }
@@ -351,7 +352,7 @@ void BasicGUI_MarkerDlg::onSelectionDone0()
       myData[ DY2 ]->setValue( aYDir.Y() );
       myData[ DZ2 ]->setValue( aYDir.Z() );
     }
-    displayPreview(true);
+    displayPreview();
     return;
   }
   aSelectedObject = getSelected( TopAbs_VERTEX );
@@ -360,7 +361,7 @@ void BasicGUI_MarkerDlg::onSelectionDone0()
     myData[ X ]->setValue( aPnt.X() );
     myData[ Y ]->setValue( aPnt.Y() );
     myData[ Z ]->setValue( aPnt.Z() );
-    displayPreview(true);
+    displayPreview();
     return;
   }
 }
@@ -423,7 +424,7 @@ void BasicGUI_MarkerDlg::onSelectionDone()
     }
   }
 
-  displayPreview(true);
+  displayPreview();
 }
 
 //=================================================================================
@@ -617,7 +618,7 @@ void BasicGUI_MarkerDlg::addSubshapesToStudy()
 //=================================================================================
 void BasicGUI_MarkerDlg::onValueChanged( double )
 {
-  displayPreview(true);
+  displayPreview();
 }
 
 //=================================================================================
@@ -630,7 +631,7 @@ void BasicGUI_MarkerDlg::displayPreview ( const bool   activate,
                                           const double lineWidth )
 {
   if ( !myBlockPreview ) {
-    GEOMBase_Skeleton::displayPreview( activate, update, toRemoveFromEngine, lineWidth );
+    GEOMBase_Skeleton::displayPreview( true, activate, update, toRemoveFromEngine, lineWidth );
     if ( myConstructorId == 0 )
       GEOMBase_Skeleton::activate( GEOM_MARKER );
   }