From 9be9f89876c241f43504e451c038a8d3d39c16f6 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 7 Mar 2013 11:07:32 +0000 Subject: [PATCH] Merge from V6_main 06/03/2013 --- src/GEOMImpl/GEOMImpl_IGroupOperations.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx index 78a0548e8..49675b0ad 100644 --- a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx @@ -1151,8 +1151,8 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::UnionListOfGroups for (i = 1; i <= aLen; i++) { Handle(GEOM_Object) aGr_i = Handle(GEOM_Object)::DownCast(theGList->Value(i)); if ( aGr_i->GetType() != GEOM_GROUP ) { - SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); - return NULL; + SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); + return NULL; } // Get group type aType_i = GetType(aGr_i); @@ -1582,11 +1582,13 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::GetMainShape (Handle(GEOM_Object) { SetErrorCode(KO); - if(theGroup.IsNull()) return NULL; - if ( theGroup->GetType() != GEOM_GROUP ) { - SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); + if (theGroup.IsNull()) return NULL; + if (theGroup->GetType() != GEOM_GROUP && + theGroup->GetType() != GEOM_SUBSHAPE) { + SetErrorCode("Error: You could perform this operation only with a group or a sub-shape."); return NULL; } + Handle(GEOM_Function) aGroupFunction = theGroup->GetFunction(1); if (aGroupFunction.IsNull()) return NULL; -- 2.39.2