Code refactoring

diff --git a/src/GroupGUI/GroupGUI.cxx b/src/GroupGUI/GroupGUI.cxx
index 863859fe4cc949e53b3fafad29388219eb49325c..c9b891fbee0813298c41d41ba572b0cf4ac6312c 100644 (file)
--- a/src/GroupGUI/GroupGUI.cxx
+++ b/src/GroupGUI/GroupGUI.cxx
@@ -97,11 +97,10 @@ bool GroupGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
         aSelMgr->selectedObjects( aList );
 
       if ( aList.Extent() == 1 ) {
-        Standard_Boolean aResult = Standard_False;
         GEOM::GEOM_Object_var anObj =
-          GEOMBase::ConvertIOinGEOMObject( aList.First(), aResult );
+          GEOMBase::ConvertIOinGEOMObject( aList.First() );
 
-        if ( aResult && !CORBA::is_nil( anObj ) && anObj->GetType() == GEOM_GROUP ) {
+        if ( !CORBA::is_nil( anObj ) && anObj->GetType() == GEOM_GROUP ) {
           aDlg = new GroupGUI_GroupDlg( GroupGUI_GroupDlg::EditGroup, getGeometryGUI(), parent ); 
           break;
         }

diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index 1b2caa0d2005dd9ed8636318b274a08518f150ba..9fb10fccc7a465566352fa6ddd1e8c4a6625f833 100644 (file)
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -213,11 +213,10 @@ void GroupGUI_GroupDlg::Init()
     aSelMgr->selectedObjects(aSelList);
 
     if (aSelList.Extent()) {
-      Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+        GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-      if (aResult && !CORBA::is_nil(anObj) && anObj->GetType() == GEOM_GROUP) {
+      if ( !CORBA::is_nil(anObj) && anObj->GetType() == GEOM_GROUP ) {
         myGroup = anObj;
 
         mainFrame()->ResultName->setText(GEOMBase::GetName(myGroup));
@@ -376,10 +375,9 @@ void GroupGUI_GroupDlg::onGetInPlace()
   if (aSelList.Extent() != 1)
     return;
 
-  Standard_Boolean aResult = Standard_False;
   GEOM::GEOM_Object_var anObj =
-    GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
-  if (aResult && !anObj->_is_nil() && GEOMBase::IsShape(anObj)) {
+    GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
+  if ( GEOMBase::IsShape(anObj) ) {
     if (!anObj->_is_equivalent(myMainObj) && !anObj->_is_equivalent(myGroup)) {
       SUIT_OverrideCursor wc;
       myEditCurrentArgument->setText(GEOMBase::GetName(anObj));
@@ -455,11 +453,10 @@ void GroupGUI_GroupDlg::SelectionIntoArgument()
     int nbSel = aSelList.Extent();
 
     if (nbSel == 1) {
-      Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+        GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-      if (aResult && !anObj->_is_nil() && GEOMBase::IsShape(anObj)) {
+      if ( GEOMBase::IsShape(anObj) ) {
         myMainObj = anObj;
         myEditCurrentArgument->setText(GEOMBase::GetName(anObj));
         // activate subshapes selection by default

diff --git a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
index b49a522841e6547944a700d5a027ed863df7822c..5000b36619dc266bb2c6926b689cb61601ac1c8d 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
@@ -159,10 +159,7 @@ void MeasureGUI_AngleDlg::SelectionIntoArgument()
   GEOM::GEOM_Object_var 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();
+    aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
   }
 
   // clear selection

diff --git a/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx b/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx
index b4a909c68166db0360d3025be501fd6c7868a506..32b81201105602288649d6020d25a0b31267d4a6 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx
@@ -170,11 +170,10 @@ void MeasureGUI_CenterMassDlg::SelectionIntoArgument()
     return;
   }
 
-  Standard_Boolean testResult = Standard_False;
   GEOM::GEOM_Object_var aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-  if (!testResult || aSelectedObject->_is_nil()) {
+  if ( aSelectedObject->_is_nil() ) {
     processObject();
     return;
   }

diff --git a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx
index 1bef4c4ba3d99208d69f96573150c40ac876e3fe..549542d2910d7333553bb5e9062a0c84689c8095 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx
@@ -176,11 +176,10 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::SelectionIntoArgument()
     return;
   }
 
-  Standard_Boolean testResult = Standard_False;
   GEOM::GEOM_Object_var aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-  if ( !testResult || aSelectedObject->_is_nil() ) {
+  if ( aSelectedObject->_is_nil() ) {
     myGrp->LineEdit1->setText( "" );
     processObject();
     return;
@@ -362,21 +361,16 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::onErrorsListSelectionChanged()
 
   GEOM::GEOM_IBlocksOperations::BCError aErr = aErrs[aCurItem];
   GEOM::ListOfLong aObjLst = aErr.incriminated;
-  TopoDS_Shape aSelShape;
-  TopoDS_Shape aSubShape;
-  TopTools_IndexedMapOfShape anIndices;
   QStringList aSubShapeList;
-  QString aSubShapeName( "" );
-  Standard_CString aTypeString;
+  TopoDS_Shape aSelShape;
   if ( !myObj->_is_nil() && GEOMBase::GetShape( myObj, aSelShape ) ) {
-    TopExp::MapShapes( aSelShape, anIndices);
+    TopTools_IndexedMapOfShape anIndices;
+    TopExp::MapShapes( aSelShape, anIndices );
     for ( int i = 0, n = aObjLst.length(); i < n; i++ ) {
-      aSubShapeName = "";
-      aSubShape = anIndices.FindKey(aObjLst[i]);
-      if ( GEOMBase::GetShapeTypeString( aSubShape, aTypeString ) )
-        aSubShapeName = QString( aTypeString ) + QString( "_" ) + QString::number( aObjLst[i] );
-      if ( !aSubShapeName.isEmpty() )
-      aSubShapeList.append( aSubShapeName );
+      TopoDS_Shape aSubShape = anIndices.FindKey( aObjLst[i] );
+      QString aType = GEOMBase::GetShapeTypeString( aSubShape );
+      if ( !aType.isEmpty() )
+       aSubShapeList.append( QString( "%1_%2" ).arg( aType ).arg( aObjLst[i] ) );
     }
   }
   myGrp->ListBox2->clear();

diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
index baf8a589733c09e5baf2c6f24d33ea030ee221f0..3796fc5b3c6b0f035f9ec20a358923cfc891348b 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
@@ -142,10 +142,7 @@ void MeasureGUI_DistanceDlg::SelectionIntoArgument()
   GEOM::GEOM_Object_var 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();
+    aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
   }
 
   // clear selection

diff --git a/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx b/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
index db8097deed7086e6ef6ccd6082d92bb854e4c16b..220a0c043a989fbddb9407b98de97ebd4ccc0500 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
@@ -171,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);

diff --git a/src/MeasureGUI/MeasureGUI_PointDlg.cxx b/src/MeasureGUI/MeasureGUI_PointDlg.cxx
index c7064a96b0d1b88312b07b5baa3efcb8b40d21ed..0cf30c1134f9c91a57a609a5ba874981b7d24c9e 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_PointDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_PointDlg.cxx
@@ -135,11 +135,10 @@ void MeasureGUI_PointDlg::SelectionIntoArgument()
     if (aSelList.Extent() < 1)
       return;
 
-    Standard_Boolean testResult = Standard_False;
     GEOM::GEOM_Object_var aSelectedObject =
-      GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+      GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-    if (!testResult || aSelectedObject->_is_nil())
+    if ( aSelectedObject->_is_nil() )
       return;
 
     myObj = aSelectedObject;

diff --git a/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx b/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx
index 9621487ed258d851f111f026a57c8593e2a6915b..50f39f3c224477ace391b75fac5a81e18bfc1cc9 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx
@@ -177,16 +177,13 @@ bool MeasureGUI_PropertiesDlg::getParameters( double& theLength,
 //=================================================================================
 SALOME_Prs* MeasureGUI_PropertiesDlg::buildPrs()
 {
-  TopoDS_Shape aShape, aResult;
-  
-  if ( myObj->_is_nil() ||
-       !GEOMBase::GetShape( myObj, aShape ) ||
-       aShape.IsNull() ||
-       aShape.ShapeType() != TopAbs_EDGE ||
-       !GEOMBase::CreateArrowForLinearEdge( aShape, aResult ) ||
-       aResult.IsNull() )
-    return 0;
-
-  return getDisplayer()->BuildPrs( aResult );
+  SALOME_Prs* prs = 0;
+  TopoDS_Shape shape;
   
+  if ( GEOMBase::GetShape( myObj, shape, TopAbs_EDGE ) ) {
+    shape = GEOMBase::CreateArrowForLinearEdge( shape );
+    if ( !shape.IsNull() )
+      prs = getDisplayer()->BuildPrs( shape );
+  }
+  return prs;
 }

diff --git a/src/MeasureGUI/MeasureGUI_Skeleton.cxx b/src/MeasureGUI/MeasureGUI_Skeleton.cxx
index 12a31df08b79ff9186efeaeb79b1cb9715889757..30104aaa8cfa3bbf279fd8851274a7b4b3794127 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_Skeleton.cxx
+++ b/src/MeasureGUI/MeasureGUI_Skeleton.cxx
@@ -254,10 +254,7 @@ void MeasureGUI_Skeleton::SelectionIntoArgument()
   GEOM::GEOM_Object_var 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();
+    aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
   }
 
   if (aSelectedObject->_is_nil()) {

diff --git a/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx b/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
index 3f023355203af07cae2bca1f0557fd82c036f75c..ac94da8a2a6583c7122899c165dad06597bdff52 100644 (file)
--- a/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
+++ b/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
@@ -188,10 +188,9 @@ void OperationGUI_ArchimedeDlg::SelectionIntoArgument()
   if (aSelList.Extent() != 1)
     return;
 
-  Standard_Boolean testResult = Standard_False;
-  myShape = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+  myShape = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-  if (!testResult || myShape->_is_nil() || !GEOMBase::IsShape(myShape)) {
+  if ( !GEOMBase::IsShape(myShape) ) {
     myShape = GEOM::GEOM_Object::_nil();
     return;
   }

diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.cxx b/src/OperationGUI/OperationGUI_ChamferDlg.cxx
index 71a6e290c634b823686d7af3b2bc53c4c961a56f..ccfc070c14161f7ea5fbfd608cd75e82f4ae73af 100644 (file)
--- a/src/OperationGUI/OperationGUI_ChamferDlg.cxx
+++ b/src/OperationGUI/OperationGUI_ChamferDlg.cxx
@@ -415,11 +415,10 @@ void OperationGUI_ChamferDlg::SelectionIntoArgument()
   {
     myShape = GEOM::GEOM_Object::_nil();
     if (aSelList.Extent() == 1) {
-      Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+        GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-      if (aResult && !anObj->_is_nil()) {
+      if ( !anObj->_is_nil() ) {
         myShape = anObj;
         myEditCurrentArgument->setText(GEOMBase::GetName(anObj));
         displayPreview();
@@ -433,11 +432,10 @@ void OperationGUI_ChamferDlg::SelectionIntoArgument()
   {
     myFace[ aCurrFocus ] = -1;
     if (aSelList.Extent() == 1) {
-      Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+        GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-      if (aResult && !anObj->_is_nil()) {
+      if ( !anObj->_is_nil() ) {
          TColStd_IndexedMapOfInteger anIndexes;
          aSelMgr->GetIndexes(aSelList.First(), anIndexes);
 
@@ -456,11 +454,10 @@ void OperationGUI_ChamferDlg::SelectionIntoArgument()
     if (aCurrFocus == Faces) myFaces.Clear();
     else myEdges.Clear();
     if (aSelList.Extent() == 1) {
-      Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+        GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-      if (aResult && !anObj->_is_nil()) {
+      if ( !anObj->_is_nil() ) {
         TColStd_IndexedMapOfInteger anIndexes;
         aSelMgr->GetIndexes(aSelList.First(), anIndexes);
 

diff --git a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx
index f7aea996cfc2c1b2f5801c87807ca56bd82a73f8..a22141dde65e6917999563c799fa59a15d652ef4 100644 (file)
--- a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx
+++ b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx
@@ -188,11 +188,10 @@ void OperationGUI_Fillet1d2dDlg::SelectionIntoArgument()
   if (myEditCurrentArgument == GroupVertexes->LineEdit1) {
     myShape = GEOM::GEOM_Object::_nil();
     if (aSelList.Extent() == 1) {
-      Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+        GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
       
-      if (aResult && !anObj->_is_nil()) {
+      if ( !anObj->_is_nil() ) {
         QString aName = GEOMBase::GetName( anObj );
         TopoDS_Shape aShape;
         if ( GEOMBase::GetShape( anObj, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) {
@@ -229,11 +228,10 @@ void OperationGUI_Fillet1d2dDlg::SelectionIntoArgument()
     myVertexes.Clear();
     bool isPreview = myIs1D;
     if (aSelList.Extent() == 1) {
-      Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+        GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-      if (aResult && !anObj->_is_nil()) {
+      if ( !anObj->_is_nil() ) {
         TColStd_IndexedMapOfInteger anIndexes;
         aSelMgr->GetIndexes(aSelList.First(), anIndexes);
 

diff --git a/src/OperationGUI/OperationGUI_FilletDlg.cxx b/src/OperationGUI/OperationGUI_FilletDlg.cxx
index e18e1cb4c0466facc01b2dc689dd0fe7f3fce3b3..8295c21788772ae24b8807ec4f7b5a81913c5926 100644 (file)
--- a/src/OperationGUI/OperationGUI_FilletDlg.cxx
+++ b/src/OperationGUI/OperationGUI_FilletDlg.cxx
@@ -345,11 +345,10 @@ void OperationGUI_FilletDlg::SelectionIntoArgument()
   {
     myShape = GEOM::GEOM_Object::_nil();
     if (aSelList.Extent() == 1) {
-      Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+        GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-      if (aResult && !anObj->_is_nil()) {
+      if ( !anObj->_is_nil() ) {
         myShape = anObj;
         myEditCurrentArgument->setText(GEOMBase::GetName(anObj));
         displayPreview();
@@ -365,11 +364,10 @@ void OperationGUI_FilletDlg::SelectionIntoArgument()
     if (myEditCurrentArgument == Group2->LineEdit2) myEdges.Clear();
     else myFaces.Clear();
     if (aSelList.Extent() == 1) {
-      Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+        GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-      if (aResult && !anObj->_is_nil()) {
+      if ( !anObj->_is_nil() ) {
         TColStd_IndexedMapOfInteger anIndexes;
         aSelMgr->GetIndexes(aSelList.First(), anIndexes);
 

diff --git a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
index 9d815ba0cc122f2799917e121232eb120c64d239..dd2b7225adf0c04b95eccd0b03499c9b70f0d4ad 100644 (file)
--- a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
+++ b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
@@ -189,9 +189,8 @@ void OperationGUI_GetShapesOnShapeDlg::SelectionIntoArgument()
   int nbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aName, true);
 
   if (nbSel > 0) {
-    Standard_Boolean aRes = Standard_False;
-    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aRes);
-    if (!CORBA::is_nil(aSelectedObject) && aRes && GEOMBase::IsShape(aSelectedObject)) {
+    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
+    if ( GEOMBase::IsShape(aSelectedObject) ) {
       myEditCurrentArgument->setText(aName);
 
       // clear selection
@@ -294,9 +293,8 @@ GEOM::GEOM_IOperations_ptr OperationGUI_GetShapesOnShapeDlg::createOperation()
 bool OperationGUI_GetShapesOnShapeDlg::isValid(QString&)
 {
   //Handle(SALOME_InteractiveObject) IO = firstIObject();
-  //Standard_Boolean testResult;
-  //GEOM::GEOM_Object_var anObject = GEOMBase::ConvertIOinGEOMObject(IO, testResult);
-  //if (!testResult || anObject->_is_nil())
+  //GEOM::GEOM_Object_var anObject = GEOMBase::ConvertIOinGEOMObject( IO );
+  //if ( anObject->_is_nil() )
   //  return false;
 
   return !CORBA::is_nil(myObject1) && !CORBA::is_nil(myObject2);

diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
index b7899baebbe257a23e416e915dae70cf974a1362..5ca674101dd52dd4d41f78eb1f62612c9482a4c0 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
@@ -248,10 +248,9 @@ void PrimitiveGUI_BoxDlg::SelectionIntoArgument()
   }
 
   // nbSel == 1
-  Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-  if (!testResult || CORBA::is_nil(aSelectedObject))
+  if ( CORBA::is_nil(aSelectedObject) )
     return;
 
   QString aName = GEOMBase::GetName(aSelectedObject);

diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
index 6e7138640a56763feaa2e604a8bb657965616a5c..4b479141492c8203e6afb14f527c56f4d9041ae9 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
@@ -263,10 +263,9 @@ void PrimitiveGUI_ConeDlg::SelectionIntoArgument()
   }
 
   // nbSel == 1
-  Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-  if (!testResult || CORBA::is_nil(aSelectedObject))
+  if ( CORBA::is_nil(aSelectedObject) )
     return;
 
   QString aName = GEOMBase::GetName(aSelectedObject);

diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
index 45905b643aa7bda629c3cb3d2db818c217ff7901..29532dabb8bc9020abdfda865129a0c2b2ea667c 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
@@ -257,10 +257,9 @@ void PrimitiveGUI_CylinderDlg::SelectionIntoArgument()
   }
 
   // nbSel == 1
-  Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-  if (!testResult || CORBA::is_nil(aSelectedObject))
+  if (CORBA::is_nil(aSelectedObject))
     return;
 
   QString aName = GEOMBase::GetName(aSelectedObject);

diff --git a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
index 264dee77249910239517f7574727e49d32476beb..397188996cce99568bebcfd8097962a0c2bc86b4 100755 (executable)
--- a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
@@ -309,10 +309,9 @@ void PrimitiveGUI_DiskDlg::SelectionIntoArgument()
 
   // nbSel == 1
   Handle(SALOME_InteractiveObject) anIO = aSelList.First();
-  Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(anIO, testResult);
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( anIO );
 
-  if (!testResult || CORBA::is_nil(aSelectedObject))
+  if ( CORBA::is_nil(aSelectedObject) )
     return;
 
   QString aName = GEOMBase::GetName(aSelectedObject);

diff --git a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx
index c803419d7c9f3b30f9f203e72508790c41997f2e..b5b4b4aaf3407417891e22e3486f31fc41d08e56 100755 (executable)
--- a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx
@@ -329,10 +329,9 @@ void PrimitiveGUI_FaceDlg::SelectionIntoArgument()
   }
 
   // nbSel == 1 
-  Standard_Boolean aRes = Standard_False;
   TopAbs_ShapeEnum aNeedType = TopAbs_EDGE;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First(), aRes );
-  if ( !CORBA::is_nil( aSelectedObject ) && aRes ) {
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
+  if ( !CORBA::is_nil( aSelectedObject ) ) {
     QString aName = GEOMBase::GetName( aSelectedObject );
     
     TopoDS_Shape aShape;

diff --git a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
index 9821190d98045672df588c3c1839cb7535d7462f..1102a37a5c5042118c7bf4a72e0e659b0d606fa7 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
@@ -246,10 +246,9 @@ void PrimitiveGUI_SphereDlg::SelectionIntoArgument()
   }
 
   /* nbSel == 1 ! */
-  Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+  GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-  if ( !testResult || CORBA::is_nil( aSelectedObject ) )
+  if ( CORBA::is_nil( aSelectedObject ) )
     return;
  
   QString aName = GEOMBase::GetName( aSelectedObject );

diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
index e331a0c305e3afd9d5ece1187c3f5764fe737c33..3b7ba62aa1ce83b9557218931fce8479a5d7e713 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
@@ -253,10 +253,9 @@ void PrimitiveGUI_TorusDlg::SelectionIntoArgument()
     return;
 
   // nbSel == 1
-  Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-  if (!testResult || CORBA::is_nil(aSelectedObject))
+  if ( CORBA::is_nil(aSelectedObject) )
     return;
 
   QString aName = GEOMBase::GetName(aSelectedObject);

diff --git a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx
index 87b6d503dadd4443ae16931fe774b5e534e6c8ab..fd8c6be0cbcb960e83281c292e54b94e05273b9f 100644 (file)
--- a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx
+++ b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx
@@ -173,11 +173,10 @@ void RepairGUI_ChangeOrientationDlg::SelectionIntoArgument()
   }
 
   // nbSel == 1
-  Standard_Boolean testResult = Standard_False;
   GEOM::GEOM_Object_ptr aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject( aSelList.First(), testResult );
+    GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
   
-  if ( !testResult )
+  if ( CORBA::is_nil( aSelectedObject ) )
     return;
 
   if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) {

diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
index eb90d8a4c5af8ffefa8d838f49120c5d1a09a779..565c9e5618979ba5005e994d411ba6cbe722117e 100644 (file)
--- a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
+++ b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
@@ -184,9 +184,8 @@ void RepairGUI_CloseContourDlg::SelectionIntoArgument()
     Handle(SALOME_InteractiveObject) anIO = aSelList.First();
 
     if (myEditCurrentArgument == GroupPoints->LineEdit1) { // face selection
-      Standard_Boolean aRes;
-      myObject = GEOMBase::ConvertIOinGEOMObject(anIO, aRes);
-      if (aRes && GEOMBase::IsShape(myObject)) {
+      myObject = GEOMBase::ConvertIOinGEOMObject( anIO );
+      if ( GEOMBase::IsShape(myObject) ) {
         myEditCurrentArgument->setText(GEOMBase::GetName(myObject));
         TopoDS_Shape aShape;
         if (GEOMBase::GetShape(myObject, aShape, TopAbs_WIRE))

diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
index 7423d3b94bd499c13f2444ac8933d237e425e613..4e67a04b032f31a5afe60e818b7bcfe6d54c7847 100644 (file)
--- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
+++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
@@ -243,9 +243,8 @@ void RepairGUI_DivideEdgeDlg::SelectionIntoArgument()
 
   if ( aSelList.Extent() == 1 ) {
     Handle(SALOME_InteractiveObject) anIO = aSelList.First();
-    Standard_Boolean aRes;
-    GEOM::GEOM_Object_var aSelectedObj = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
-    if ( !CORBA::is_nil( aSelectedObj ) && aRes )
+    GEOM::GEOM_Object_var aSelectedObj = GEOMBase::ConvertIOinGEOMObject( anIO );
+    if ( !CORBA::is_nil( aSelectedObj ) )
     {
       TopoDS_Shape aShape;
       QString aName = GEOMBase::GetName( aSelectedObj );

diff --git a/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx b/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
index b981055889f27a5bb6a9bd28ce40040baa97bb52..ddcb804722295431828f9309495d6501291de798 100644 (file)
--- a/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
+++ b/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
@@ -204,11 +204,10 @@ void RepairGUI_FreeBoundDlg::onSelectionDone()
   if ( aSelList.Extent() != 1 )
     return;
 
-  Standard_Boolean isOk = Standard_False;
   GEOM::GEOM_Object_var anObj =
-    GEOMBase::ConvertIOinGEOMObject( aSelList.First(), isOk );
+    GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-  if ( !isOk || anObj->_is_nil() || !GEOMBase::IsShape( anObj ) )
+  if ( !GEOMBase::IsShape( anObj ) )
     return;
   else {
     myObj = anObj;

diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
index 95cda8d98e6ded203735605c9645a102f203497a..88007ac2a6489f2a17fdf1c1717ac7d491ba0413 100644 (file)
--- a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
@@ -239,11 +239,10 @@ void RepairGUI_FreeFacesDlg::onSelectionDone()
     return;
   }
 
-  Standard_Boolean isOk = Standard_False;
   GEOM::GEOM_Object_var anObj =
-    GEOMBase::ConvertIOinGEOMObject( aSelList.First(), isOk );
+    GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-  if ( !isOk || anObj->_is_nil() || !GEOMBase::IsShape( anObj ) ) {
+  if ( !GEOMBase::IsShape( anObj ) ) {
     myEdit->setText( "" );
     return;
   }

diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx
index e4f44624692b1d85936cd8854d03c06d79e43e51..e1f233113d8c087d77f3570d7dd215354e5ebf7b 100644 (file)
--- a/src/RepairGUI/RepairGUI_GlueDlg.cxx
+++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx
@@ -298,9 +298,8 @@ void RepairGUI_GlueDlg::SelectionIntoArgument()
 
   if ( aSelList.Extent() == 1 ) {
     Handle(SALOME_InteractiveObject) anIO = aSelList.First();
-    Standard_Boolean aRes;
-    myObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
-    if ( aRes )
+    myObject = GEOMBase::ConvertIOinGEOMObject( anIO );
+    if ( !CORBA::is_nil( myObject ) )
       myEditCurrentArgument->setText( GEOMBase::GetName( myObject ) );
   }
   updateButtonState();

diff --git a/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx b/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx
index 19cfe7a02e405e0f2bc56f69d0ad606d49fc4320..ecebe2dfb5f4797530dc19f80c589477b31bc650 100644 (file)
--- a/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx
+++ b/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx
@@ -210,9 +210,8 @@ void RepairGUI_LimitToleranceDlg::SelectionIntoArgument()
 
   if (aSelList.Extent() == 1) {
     Handle(SALOME_InteractiveObject) anIO = aSelList.First();
-    Standard_Boolean aRes;
-    myObject = GEOMBase::ConvertIOinGEOMObject(anIO, aRes);
-    if (aRes)
+    myObject = GEOMBase::ConvertIOinGEOMObject( anIO );
+    if ( !CORBA::is_nil( myObject ) )
       myEditCurrentArgument->setText(GEOMBase::GetName(myObject));
   }
   updateButtonState();

diff --git a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx
index 1a654d7c0ac64bfcc1311c3d25e3dc6f90f45a82..c4f0c1038d560f9806e8ee399144a632c832a822 100644 (file)
--- a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx
@@ -179,11 +179,10 @@ void RepairGUI_RemoveExtraEdgesDlg::SelectionIntoArgument()
   }
   
   // nbSel == 1
-  Standard_Boolean testResult = Standard_False;
   GEOM::GEOM_Object_ptr aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject( aSelList.First(), testResult );
+    GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-  if ( !testResult )
+  if ( CORBA::is_nil( aSelectedObject ) )
     return;
   
   if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) {

diff --git a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
index c6a710636ce0153071317a0248e4f100ed237262..8c4335c29814df6f064673eabbef2d41a59afdd0 100644 (file)
--- a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
@@ -186,9 +186,8 @@ void RepairGUI_RemoveHolesDlg::SelectionIntoArgument()
     Handle(SALOME_InteractiveObject) anIO = aSelList.First();
 
     if (myEditCurrentArgument == GroupPoints->LineEdit1) { // face selection
-      Standard_Boolean aRes;
-      myObject = GEOMBase::ConvertIOinGEOMObject(anIO, aRes);
-      if (aRes && GEOMBase::IsShape(myObject)) {
+      myObject = GEOMBase::ConvertIOinGEOMObject( anIO );
+      if ( GEOMBase::IsShape(myObject) ) {
         myEditCurrentArgument->setText(GEOMBase::GetName(myObject));
 
         // clear selection

diff --git a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
index a844da195803ae15b68a5ad136a97270eb7e3b2e..97807e44929d4fcca2dcc00220dae534172cc70a 100644 (file)
--- a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
@@ -173,9 +173,8 @@ void RepairGUI_RemoveIntWiresDlg::SelectionIntoArgument()
     Handle(SALOME_InteractiveObject) anIO = aSelList.First();
 
     if (myEditCurrentArgument == GroupPoints->LineEdit1) { // face selection
-      Standard_Boolean aRes;
-      myObject = GEOMBase::ConvertIOinGEOMObject(anIO, aRes);
-      if (aRes && GEOMBase::IsShape(myObject)) {
+      myObject = GEOMBase::ConvertIOinGEOMObject( anIO );
+      if ( GEOMBase::IsShape(myObject) ) {
         myEditCurrentArgument->setText(GEOMBase::GetName(myObject));
 
         // clear selection

diff --git a/src/RepairGUI/RepairGUI_SewingDlg.cxx b/src/RepairGUI/RepairGUI_SewingDlg.cxx
index 006a929b809661185c17dfe51d03e5b4a39f18ff..1ce88ae297bc0535a41f9b731bbba0e08f66dc54 100644 (file)
--- a/src/RepairGUI/RepairGUI_SewingDlg.cxx
+++ b/src/RepairGUI/RepairGUI_SewingDlg.cxx
@@ -187,9 +187,8 @@ void RepairGUI_SewingDlg::SelectionIntoArgument()
 
   if ( aSelList.Extent() == 1 ) {
     Handle(SALOME_InteractiveObject) anIO = aSelList.First();
-    Standard_Boolean aRes;
-    myObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
-    if ( aRes )
+    myObject = GEOMBase::ConvertIOinGEOMObject( anIO );
+    if ( !CORBA::is_nil( myObject ) )
       myEditCurrentArgument->setText( GEOMBase::GetName( myObject ) );
   }
 }

diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
index 5e2871f1b16a34bd4790aceb62f8ded448230d18..7d8449d33aa26e3258a6d2caa88fbfdcd7237451 100755 (executable)
--- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
+++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
@@ -366,13 +366,12 @@ void RepairGUI_ShapeProcessDlg::selectionChanged()
   SALOME_ListIO aSelList;
   aSelMgr->selectedObjects(aSelList);
 
-  Standard_Boolean aRes = Standard_False;
   int i = 0;
   myObjects->length(aSelList.Extent());
   for (SALOME_ListIteratorOfListIO anIt (aSelList); anIt.More(); anIt.Next()) {
-    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( anIt.Value(), aRes );
-    if ( !CORBA::is_nil( aSelectedObject ) && aRes )
-        myObjects[i++] = aSelectedObject;
+    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( anIt.Value() );
+    if ( !CORBA::is_nil( aSelectedObject ) )
+      myObjects[i++] = aSelectedObject;
   }
   myObjects->length( i );
   if ( i == 1 )

diff --git a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
index 65a3900552efba7b2c4947d34bce58fc1fb7018a..9403ec7659c69103025bf7bed493a6a88929ebe0 100644 (file)
--- a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
@@ -177,9 +177,8 @@ void RepairGUI_SuppressFacesDlg::SelectionIntoArgument()
     if (aSelList.Extent() == 1) {
       Handle(SALOME_InteractiveObject) anIO = aSelList.First();
 
-      Standard_Boolean aRes;
-      myObject = GEOMBase::ConvertIOinGEOMObject(anIO, aRes);
-      if (aRes && GEOMBase::IsShape(myObject)) {
+      myObject = GEOMBase::ConvertIOinGEOMObject( anIO );
+      if ( GEOMBase::IsShape(myObject) ) {
         myEditCurrentArgument->setText(GEOMBase::GetName(myObject));
         TopoDS_Shape aShape;
         if (GEOMBase::GetShape(myObject, aShape, TopAbs_FACE))
@@ -245,10 +244,9 @@ void RepairGUI_SuppressFacesDlg::SelectionIntoArgument()
 
         aSelMgr->clearSelected();
 
-        Standard_Boolean isOk;
         QString objIOR = GEOMBase::GetIORFromObject(myObject);
-        Handle(GEOM_AISShape) aSh = GEOMBase::ConvertIORinGEOMAISShape(objIOR.toLatin1().constData(), isOk, true);
-        if (!isOk || aSh.IsNull())
+        Handle(GEOM_AISShape) aSh = GEOMBase::ConvertIORinGEOMAISShape( objIOR, true );
+        if ( aSh.IsNull() )
           return;
 
         aSelMgr->AddOrRemoveIndex(aSh->getIO(), anIds, false);

diff --git a/src/TransformationGUI/TransformationGUI.cxx b/src/TransformationGUI/TransformationGUI.cxx
index 3da2f8d8d14ba34bab6dec09503bbf318fe07781..aa725e4a3dd79e7928033ecc697d13eae8917ee8 100644 (file)
--- a/src/TransformationGUI/TransformationGUI.cxx
+++ b/src/TransformationGUI/TransformationGUI.cxx
@@ -122,9 +122,8 @@ bool TransformationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
       SALOME_ListIteratorOfListIO aSelIt (aSelList);
       for (; aSelIt.More(); aSelIt.Next()) {
         Handle(SALOME_InteractiveObject) io = aSelIt.Value();
-        Standard_Boolean testResult = Standard_False;
-        GEOM::GEOM_Object_var aGeomObj = GEOMBase::ConvertIOinGEOMObject(io, testResult);
-        if (testResult) {
+        GEOM::GEOM_Object_var aGeomObj = GEOMBase::ConvertIOinGEOMObject( io );
+        if ( !CORBA::is_nil( aGeomObj ) ) {
           anOp->RecomputeObject(aGeomObj);
 
           SUIT_ViewWindow* wnd;

diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
index 18c96f017577190d37f2b56f90e92b52372f8c71..58f650769f4ba735da9890b4e78f0ec3d7d656d6 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
@@ -244,49 +244,46 @@ void TransformationGUI_MirrorDlg::SelectionIntoArgument()
       return;
 
     // nbSel == 1
-    Standard_Boolean testResult = Standard_False;
-    myArgument = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
-    if (!testResult || CORBA::is_nil(myArgument))
+    myArgument = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
+    if ( CORBA::is_nil(myArgument) )
       return;
 
     aName = GEOMBase::GetName(myArgument);
 
-    if (testResult && !myArgument->_is_nil()) {
-      TopoDS_Shape aShape;
-      if (GEOMBase::GetShape(myArgument, aShape, TopAbs_SHAPE) && !aShape.IsNull()) {
-        TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
-        if (getConstructorId() == 1)
-          aNeedType = TopAbs_EDGE;
-        else if (getConstructorId() == 2)
-          aNeedType = TopAbs_FACE;
-
-        TColStd_IndexedMapOfInteger aMap;
-        aSelMgr->GetIndexes(aSelList.First(), aMap);
-        if (aMap.Extent() == 1) {
-          int anIndex = aMap(1);
-          if (aNeedType == TopAbs_VERTEX)
-            aName += QString(":vertex_%1").arg(anIndex);
-          else
-            aName += QString(":edge_%1").arg(anIndex);
-
-          //Find SubShape Object in Father
-          GEOM::GEOM_Object_var aFindedObject = findObjectInFather(myArgument, aName);
-
-          if (aFindedObject->_is_nil()) { // Object not found in study
-            GEOM::GEOM_IShapesOperations_var aShapesOp =
-              getGeomEngine()->GetIShapesOperations(getStudyId());
-            myArgument = aShapesOp->GetSubShape(myArgument, anIndex);
-          }
-          else {
-            myArgument = aFindedObject; // get Object from study
-          }
-        }
-        else {
-          if (aShape.ShapeType() != aNeedType) {
-            myArgument = GEOM::GEOM_Object::_nil();
-            aName = "";
-          }
-        }
+    TopoDS_Shape aShape;
+    if (GEOMBase::GetShape(myArgument, aShape, TopAbs_SHAPE) && !aShape.IsNull()) {
+      TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
+      if (getConstructorId() == 1)
+       aNeedType = TopAbs_EDGE;
+      else if (getConstructorId() == 2)
+       aNeedType = TopAbs_FACE;
+      
+      TColStd_IndexedMapOfInteger aMap;
+      aSelMgr->GetIndexes(aSelList.First(), aMap);
+      if (aMap.Extent() == 1) {
+       int anIndex = aMap(1);
+       if (aNeedType == TopAbs_VERTEX)
+         aName += QString(":vertex_%1").arg(anIndex);
+       else
+         aName += QString(":edge_%1").arg(anIndex);
+       
+       //Find SubShape Object in Father
+       GEOM::GEOM_Object_var aFindedObject = findObjectInFather(myArgument, aName);
+       
+       if (aFindedObject->_is_nil()) { // Object not found in study
+         GEOM::GEOM_IShapesOperations_var aShapesOp =
+           getGeomEngine()->GetIShapesOperations(getStudyId());
+         myArgument = aShapesOp->GetSubShape(myArgument, anIndex);
+       }
+       else {
+         myArgument = aFindedObject; // get Object from study
+       }
+      }
+      else {
+       if (aShape.ShapeType() != aNeedType) {
+         myArgument = GEOM::GEOM_Object::_nil();
+         aName = "";
+       }
       }
     }
     myEditCurrentArgument->setText(aName);

diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
index f1fbc770a3fd991fecd36a1937f9a7bf303338df..0ba657cc09e7aa2979fcc94cfbeda11b227ea893 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
@@ -307,11 +307,10 @@ void TransformationGUI_MultiRotationDlg::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) || !GEOMBase::IsShape(aSelectedObject))
+  if ( !GEOMBase::IsShape(aSelectedObject) )
     return;
 
   QString aName = GEOMBase::GetName(aSelectedObject);

diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
index 77c4a7bb5a6eff2786e6d5c1ae96b4997097b4fb..43be5d91d262c099fe8b45bbd597676d070a7afa 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
@@ -338,10 +338,9 @@ void TransformationGUI_MultiTranslationDlg::SelectionIntoArgument()
     return;
 
   // nbSel == 1
-  Standard_Boolean testResult = Standard_False;;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-  if (!testResult || CORBA::is_nil(aSelectedObject) || !GEOMBase::IsShape(aSelectedObject))
+  if ( !GEOMBase::IsShape(aSelectedObject) )
     return;
 
   QString aName = GEOMBase::GetName(aSelectedObject);

diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
index da9067e0f7cb2327f3fd754d5b41747bee0f7e43..7eeca104008dcc0e5b1efa339d4497d72d45c527 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
@@ -353,9 +353,8 @@ void TransformationGUI_PositionDlg::SelectionIntoArgument()
       return;
 
     // nbSel == 1
-    Standard_Boolean testResult = Standard_False;
-    myStartLCS = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
-    if (!testResult || CORBA::is_nil(myStartLCS))
+    myStartLCS = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
+    if ( CORBA::is_nil(myStartLCS) )
       return;
 
     aName = GEOMBase::GetName(myStartLCS);
@@ -369,9 +368,8 @@ void TransformationGUI_PositionDlg::SelectionIntoArgument()
     if (aSelList.Extent() != 1)
       return;
 
-    Standard_Boolean testResult = Standard_False;
-    myEndLCS = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
-    if (!testResult || CORBA::is_nil(myEndLCS))
+    myEndLCS = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
+    if ( CORBA::is_nil(myEndLCS) )
       return;
 
     aName = GEOMBase::GetName(myEndLCS);
@@ -385,9 +383,8 @@ void TransformationGUI_PositionDlg::SelectionIntoArgument()
     if (aSelList.Extent() != 1)
       return;
 
-    Standard_Boolean testResult = Standard_False;
-    GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
-    if (!testResult || aSelectedObject->_is_nil())
+    GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
+    if ( aSelectedObject->_is_nil() )
       return;
 
     aName = GEOMBase::GetName(myPath);

diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
index c999df5a2c5499a2ca63b317dddde9a8fa435af6..0711b7ac35bf758f57bf3c86ee90c63124c3cb05 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
@@ -288,10 +288,9 @@ void TransformationGUI_RotationDlg::SelectionIntoArgument()
       return;
 
     // nbSel == 1
-    Standard_Boolean testResult = Standard_False;
-    aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-    if (!testResult || CORBA::is_nil(aSelectedObject))
+    if ( CORBA::is_nil(aSelectedObject) )
       return;
 
     aName = GEOMBase::GetName(aSelectedObject);

diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
index 17023381f3bebe2b3796e7119284742cc7515df6..d8fba7cfe73f3080e72be7451c6a98e878dc4c4c 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
@@ -309,9 +309,8 @@ void TransformationGUI_ScaleDlg::SelectionIntoArgument()
     GEOM::GEOM_Object_var aSelectedObject = GEOM::GEOM_Object::_nil();
     if (aSelList.Extent() == 1)
     {
-      Standard_Boolean testResult = Standard_False;
-      aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
-      if (testResult)
+      aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
+      if ( !CORBA::is_nil( aSelectedObject ) )
       {
         aName = GEOMBase::GetName(aSelectedObject);
 

diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
index 292af61f67eaa5dd3b0346bb054fe925ca423005..cb60732a9e1181328163ff29be8c8e90a9fa6bbc 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
@@ -347,10 +347,9 @@ void TransformationGUI_TranslationDlg::SelectionIntoArgument()
       return;
 
     // nbSel == 1
-    Standard_Boolean testResult = Standard_False;
-    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
 
-    if (!testResult || CORBA::is_nil(aSelectedObject))
+    if ( CORBA::is_nil(aSelectedObject) )
       return;
 
     aName = GEOMBase::GetName(aSelectedObject);