Fix regression List.Empty

diff --git a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
index 1ec8fd5c8f22bdf53cbb063da5775748c31d3213..31f5a69e6b29c1727766a092f5011d9970f1986f 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
@@ -153,14 +153,16 @@ void MeasureGUI_AngleDlg::SelectionIntoArgument()
   SALOME_ListIO aSelList;
   aSelMgr->selectedObjects(aSelList);
 
-  Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+  GEOM::GEOM_Object_var aSelectedObject = GEOM::GEOM_Object::_nil();
 
-  if ( !testResult )
-    aSelectedObject = GEOM::GEOM_Object::_nil();
+  if (aSelList.Extent() > 0) {
+    Standard_Boolean testResult = Standard_False;
+    aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    if (!testResult)
+      aSelectedObject = GEOM::GEOM_Object::_nil();
+  }
 
-  if ( myEditCurrentArgument == mySelEdit )
+  if (myEditCurrentArgument == mySelEdit)
     myObj = aSelectedObject;
   else
     myObj2 = aSelectedObject;

diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
index 075c2759673e55a1317afdd6fee6bb6cd0e2b1ba..f5423056d8f6dd081c2b2bc5932cdb308dc613ff 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
@@ -140,12 +140,14 @@ void MeasureGUI_DistanceDlg::SelectionIntoArgument()
   SALOME_ListIO aSelList;
   aSelMgr->selectedObjects(aSelList);
 
-  Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+  GEOM::GEOM_Object_var aSelectedObject = GEOM::GEOM_Object::_nil();
 
-  if ( !testResult )
-    aSelectedObject = GEOM::GEOM_Object::_nil();
+  if (aSelList.Extent() > 0) {
+    Standard_Boolean testResult = Standard_False;
+    aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    if (!testResult)
+      aSelectedObject = GEOM::GEOM_Object::_nil();
+  }
 
   if ( myEditCurrentArgument == mySelEdit )
     myObj = aSelectedObject;

diff --git a/src/MeasureGUI/MeasureGUI_PointDlg.cxx b/src/MeasureGUI/MeasureGUI_PointDlg.cxx
index 843a9922c3fdac274bf664d7e3a7eeb2c2547438..d668675f9ae3b4fd92f806065e7cd9974f4a2fbb 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_PointDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_PointDlg.cxx
@@ -131,11 +131,14 @@ void MeasureGUI_PointDlg::SelectionIntoArgument()
     SALOME_ListIO aSelList;
     aSelMgr->selectedObjects(aSelList);
 
+    if (aSelList.Extent() < 1)
+      return;
+
     Standard_Boolean testResult = Standard_False;
     GEOM::GEOM_Object_var aSelectedObject =
       GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
 
-    if ( !testResult || aSelectedObject->_is_nil() )
+    if (!testResult || aSelectedObject->_is_nil())
       return;
 
     myObj = aSelectedObject;

diff --git a/src/MeasureGUI/MeasureGUI_Skeleton.cxx b/src/MeasureGUI/MeasureGUI_Skeleton.cxx
index 2dd79a196a21acb03db8ed59463bc0a074fa22cc..fd1c345e5d8075808dcc82004b6073278d03cdce 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_Skeleton.cxx
+++ b/src/MeasureGUI/MeasureGUI_Skeleton.cxx
@@ -250,11 +250,16 @@ void MeasureGUI_Skeleton::SelectionIntoArgument()
   SALOME_ListIO aSelList;
   aSelMgr->selectedObjects(aSelList);
 
-  Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+  GEOM::GEOM_Object_var aSelectedObject = GEOM::GEOM_Object::_nil();
 
-  if (!testResult || aSelectedObject->_is_nil()) {
+  if (aSelList.Extent() > 0) {
+    Standard_Boolean testResult = Standard_False;
+    aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    if (!testResult)
+      aSelectedObject = GEOM::GEOM_Object::_nil();
+  }
+
+  if (aSelectedObject->_is_nil()) {
     mySelEdit->setText("");
     processObject();
     erasePreview();