Fix problem with 'Glue all coincident edges' option

[modules/geom.git] / src / MeasureGUI / MeasureGUI_NormaleDlg.cxx

diff --git a/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx b/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
index b5207d79085cad49da643ee102a14c75520f6407..44fc3639a47adabc818d0a032a3dfc97a5e81453 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
@@ -1,24 +1,22 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011  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
+// 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
 // File   : MeasureGUI_NormaleDlg.cxx
 // Author : Julia DOROVSKIKH, Open CASCADE S.A.S.
@@ -173,11 +171,10 @@ void MeasureGUI_NormaleDlg::SelectionIntoArgument()
     return;
 
   // nbSel == 1
-  Standard_Boolean testResult = Standard_False;
   GEOM::GEOM_Object_var aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-  if (!testResult || CORBA::is_nil(aSelectedObject))
+  if ( CORBA::is_nil(aSelectedObject) )
     return;
 
   QString aName = GEOMBase::GetName(aSelectedObject);
@@ -249,7 +246,7 @@ void MeasureGUI_NormaleDlg::SelectionIntoArgument()
       GroupArgs->PushButton1->click();
   }
 
-  displayPreview();
+  displayPreview(true);
 }
 
 //=================================================================================
@@ -289,7 +286,7 @@ void MeasureGUI_NormaleDlg::SetEditCurrentArgument()
   send->setDown(true);
 
   // seems we need it only to avoid preview disappearing, caused by selection mode change
-  displayPreview();
+  displayPreview(true);
 }
 
 //=================================================================================
@@ -314,9 +311,9 @@ void MeasureGUI_NormaleDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
   connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
-          this, SLOT( SelectionIntoArgument() ) );
+           this, SLOT( SelectionIntoArgument() ) );
 
-  displayPreview();
+  displayPreview(true);
 }
 
 //=================================================================================
@@ -354,8 +351,8 @@ bool MeasureGUI_NormaleDlg::isValid (QString&)
 //=================================================================================
 bool MeasureGUI_NormaleDlg::execute (ObjectList& objects)
 {
-  GEOM::GEOM_Object_var anObj =
-    GEOM::GEOM_IMeasureOperations::_narrow(getOperation())->GetNormal(myFace, myPoint);
+  GEOM::GEOM_IMeasureOperations_var anOper = GEOM::GEOM_IMeasureOperations::_narrow( getOperation() );
+  GEOM::GEOM_Object_var anObj = anOper->GetNormal(myFace, myPoint);
 
   if (!anObj->_is_nil())
     objects.push_back(anObj._retn());