ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-24 04:20:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from V6_main 06/03/2013

Browse Source
This commit is contained in:
vsr 2013-03-07 11:07:32 +00:00
parent 1dac6744a7
commit 9be9f89876
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/GEOMImpl/GEOMImpl_IGroupOperations.cxx
View File

@ -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;