INT PAL 0052699: Incorrect closing of "Manage dimensions" dialog box (edited)

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

diff --git a/src/MeasureGUI/MeasureGUI_PointDlg.cxx b/src/MeasureGUI/MeasureGUI_PointDlg.cxx
old mode 100755 (executable)
new mode 100644 (file)
index e21d525..a0bd276
--- a/src/MeasureGUI/MeasureGUI_PointDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_PointDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -80,7 +80,7 @@ MeasureGUI_PointDlg::MeasureGUI_PointDlg( GeometryGUI* GUI, QWidget* parent )
   layout->setMargin( 0 ); layout->setSpacing( 6 );
   layout->addWidget( myGrp );
 
-  myHelpFileName = "using_measurement_tools_page.html#point_coord_anchor";
+  myHelpFileName = "point_coordinates_page.html";
 
   Init();
 }
@@ -122,7 +122,7 @@ void MeasureGUI_PointDlg::activateSelection()
 void MeasureGUI_PointDlg::SelectionIntoArgument()
 {
   try {
-    myObj = GEOM::GEOM_Object::_nil();
+    myObj.nullify();
     myGrp->LineEdit1->setText( "" );
     myGrp->LineEdit2->setText( "" );
     myGrp->LineEdit3->setText( "" );
@@ -135,23 +135,20 @@ void MeasureGUI_PointDlg::SelectionIntoArgument()
     if (aSelList.Extent() < 1)
       return;
 
-    GEOM::GEOM_Object_var aSelectedObject =
-      GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
+    myObj = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-    if ( aSelectedObject->_is_nil() )
+    if ( !myObj )
       return;
 
-    myObj = aSelectedObject;
-
     TColStd_IndexedMapOfInteger anIndexes;
     aSelMgr->GetIndexes(aSelList.First(), anIndexes);
 
     TopoDS_Shape aShape;
-    if ( anIndexes.Extent() > 1 || !GEOMBase::GetShape( myObj, aShape ) || aShape.IsNull() )
+    if ( anIndexes.Extent() > 1 || !GEOMBase::GetShape( myObj.get(), aShape ) || aShape.IsNull() )
       return;
 
     TopoDS_Vertex aPoint;
-    QString aName = GEOMBase::GetName( myObj );
+    QString aName = GEOMBase::GetName( myObj.get() );
     if ( anIndexes.Extent() == 0 ) {
       if ( aShape.ShapeType() == TopAbs_VERTEX )
         aPoint = TopoDS::Vertex( aShape );
@@ -180,7 +177,7 @@ void MeasureGUI_PointDlg::SelectionIntoArgument()
   }
   catch( ... )
   {
-    myObj = GEOM::GEOM_Object::_nil();
+    myObj.nullify();
     myGrp->LineEdit1->setText( "" );
     myGrp->LineEdit2->setText( "" );
     myGrp->LineEdit3->setText( "" );