X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMImpl%2FGEOMImpl_IGroupOperations.cxx;h=e603adc90ad2a5fbf72d70075ffa1f0d93e401f6;hb=ed87a1f7c81ec39992aff1f463d73dc81e5791e0;hp=67b43781fca305d3397d992f2fdc5033e6ddb4d1;hpb=f505d638da4d75d3fe3daf6ce3bf7fab668bfad5;p=modules%2Fgeom.git diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx index 67b43781f..e603adc90 100644 --- a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx @@ -1,22 +1,25 @@ -// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// Copyright (C) 2007-2014 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 -// +// // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + #include #include @@ -38,6 +41,7 @@ #include #include +#include #include #include @@ -45,14 +49,12 @@ #include #include -#include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC - //============================================================================= /*! * constructor: */ //============================================================================= -GEOMImpl_IGroupOperations::GEOMImpl_IGroupOperations (GEOM_Engine* theEngine, int theDocID) +GEOMImpl_IGroupOperations::GEOMImpl_IGroupOperations (GEOM_Engine* theEngine, int theDocID) : GEOM_IOperations(theEngine, theDocID) { MESSAGE("GEOMImpl_IGroupOperations::GEOMImpl_IGroupOperations"); @@ -75,33 +77,37 @@ GEOMImpl_IGroupOperations::~GEOMImpl_IGroupOperations() */ //============================================================================= Handle(GEOM_Object) GEOMImpl_IGroupOperations::CreateGroup - (Handle(GEOM_Object) theMainShape, TopAbs_ShapeEnum theShapeType) + (Handle(GEOM_Object) theMainShape, TopAbs_ShapeEnum theShapeType) { SetErrorCode(KO); + if ( theShapeType != TopAbs_VERTEX && theShapeType != TopAbs_EDGE && + theShapeType != TopAbs_FACE && theShapeType != TopAbs_SOLID ) { + SetErrorCode( "Error: You could create group of only next type: vertex, edge, face or solid" ); + return NULL; + } + Handle(TColStd_HArray1OfInteger) anArray = new TColStd_HArray1OfInteger(1,1); anArray->SetValue(1, -1); - //Add a new Fillet object + //Add a new Sub-shape object Handle(GEOM_Object) aGroup = GetEngine()->AddSubShape(theMainShape, anArray); //Set a GROUP type aGroup->SetType(GEOM_GROUP); - //Set a sub shape type + //Set a sub-shape type TDF_Label aFreeLabel = aGroup->GetFreeLabel(); TDataStd_Integer::Set(aFreeLabel, (Standard_Integer)theShapeType); //Make a Python command Handle(GEOM_Function) aFunction = aGroup->GetFunction(1); - //TCollection_AsciiString anOldDescr = aFunction->GetDescription(); - //GEOM::TPythonDump(aFunction) << anOldDescr.ToCString() << "\n\t" << aGroup GEOM::TPythonDump(aFunction) << aGroup - << " = geompy.CreateGroup(" << theMainShape << ", " << (int)theShapeType << ")"; + << " = geompy.CreateGroup(" << theMainShape << ", " << theShapeType << ")"; SetErrorCode(OK); - return aGroup; + return aGroup; } //============================================================================= @@ -114,7 +120,12 @@ void GEOMImpl_IGroupOperations::AddObject(Handle(GEOM_Object) theGroup, int theS SetErrorCode(KO); if(theGroup.IsNull()) return; - Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); + if ( theGroup->GetType() != GEOM_GROUP ) { + SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); + return; + } + + Handle(GEOM_Function) aFunction = theGroup->GetLastFunction(); if(aFunction.IsNull()) return; GEOM_ISubShape aSSI (aFunction); @@ -122,14 +133,21 @@ void GEOMImpl_IGroupOperations::AddObject(Handle(GEOM_Object) theGroup, int theS // Check sub-shape index validity TDF_Label aLabel = aSSI.GetMainShape()->GetOwnerEntry(); if (aLabel.IsRoot()) return; - Handle(GEOM_Object) anObj = GEOM_Object::GetObject(aLabel); - if (anObj.IsNull()) return; - TopoDS_Shape aMainShape = anObj->GetValue(); + Handle(GEOM_Object) aMainObj = GEOM_Object::GetObject(aLabel); + if (aMainObj.IsNull()) return; + TopoDS_Shape aMainShape = aMainObj->GetValue(); if (aMainShape.IsNull()) return; TopTools_IndexedMapOfShape aMapOfShapes; TopExp::MapShapes(aMainShape, aMapOfShapes); + TopAbs_ShapeEnum aGroupType = GetType(theGroup); + TopAbs_ShapeEnum aShapeType = aMapOfShapes.FindKey(theSubShapeID).ShapeType(); + if ( aGroupType != aShapeType ) { + SetErrorCode( "Error: You could perform this operation only with object the same type as the type of group." ); + return; + } + if (theSubShapeID < 1 || aMapOfShapes.Extent() < theSubShapeID) { SetErrorCode("Invalid sub-shape index: out of range"); return; @@ -147,18 +165,28 @@ void GEOMImpl_IGroupOperations::AddObject(Handle(GEOM_Object) theGroup, int theS for(Standard_Integer i = 1; i<=aLength; i++) { aNewSeq->SetValue(i, aSeq->Value(i)); if(aSeq->Value(i) == theSubShapeID) { - SetErrorCode(ALREADY_PRESENT); - return; // + SetErrorCode(ALREADY_PRESENT); + return; // } } aNewSeq->SetValue(aLength+1, theSubShapeID); - aSSI.SetIndices(aNewSeq); + if ( aFunction->IsLastFuntion() ) { + aSSI.SetIndices(aNewSeq); + } + else { + aFunction = theGroup->AddFunction( GEOM_Object::GetSubShapeID(), 0, true ); + GEOM_ISubShape aSSI2 (aFunction); + aSSI2.SetIndices(aNewSeq); + aSSI2.SetMainShape( aSSI.GetMainShape() ); + } } - //Make a Python command - TCollection_AsciiString anOldDescr = aFunction->GetDescription(); + // As we do not recompute here our group, lets mark it as Modified + Standard_Integer aTic = aMainObj->GetTic(); // tic of main shape + theGroup->SetTic(aTic - 1); - GEOM::TPythonDump(aFunction) << anOldDescr.ToCString() << "\n\t" + //Make a Python command + GEOM::TPythonDump(aFunction, /*append=*/true) << "geompy.AddObject(" << theGroup << ", " << theSubShapeID << ")"; SetErrorCode(OK); @@ -175,60 +203,77 @@ void GEOMImpl_IGroupOperations::RemoveObject (Handle(GEOM_Object) theGroup, int SetErrorCode(KO); if(theGroup.IsNull()) return; - Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); + if ( theGroup->GetType() != GEOM_GROUP ) { + SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); + return; + } + + Handle(GEOM_Function) aFunction = theGroup->GetLastFunction(); if(aFunction.IsNull()) return; GEOM_ISubShape aSSI(aFunction); Handle(TColStd_HArray1OfInteger) aSeq = aSSI.GetIndices(); if(aSeq.IsNull()) return; + if(aSeq->Length() == 1 && aSeq->Value(1) == -1) { SetErrorCode(NOT_EXISTS); return; } + + Handle(TColStd_HArray1OfInteger) aNewSeq; + Standard_Integer aLength = aSeq->Length(); + if(aLength == 1) { + if(aSeq->Value(1) != theSubShapeID) { + SetErrorCode(NOT_EXISTS); + return; + } + aNewSeq = new TColStd_HArray1OfInteger(1,1); + aNewSeq->SetValue(1, -1); + } else { - Handle(TColStd_HArray1OfInteger) aNewSeq; - Standard_Integer aLength = aSeq->Length(); - if(aLength == 1) { - if(aSeq->Value(1) != theSubShapeID) { - SetErrorCode(NOT_EXISTS); - return; + aNewSeq = new TColStd_HArray1OfInteger(1, aLength-1); + Standard_Boolean isFound = Standard_False; + for (Standard_Integer i = 1, k = 1; i <= aLength; i++) { + if (aSeq->Value(i) == theSubShapeID) { + isFound = Standard_True; + } else { + if (k < aLength) { // this check is to avoid sequence overflow + aNewSeq->SetValue(k, aSeq->Value(i)); + k++; + } } - aNewSeq = new TColStd_HArray1OfInteger(1,1); - aNewSeq->SetValue(1, -1); } - else { - aNewSeq = new TColStd_HArray1OfInteger(1, aLength-1); - Standard_Boolean isFound = Standard_False; - for(Standard_Integer i = 1, k=1; i<=aLength; i++) { - if(i == aLength && !isFound) { - SetErrorCode(NOT_EXISTS); - return; - } - if(aSeq->Value(i) == theSubShapeID) { - isFound = Standard_True; - continue; - } - aNewSeq->SetValue(k, aSeq->Value(i)); - k++; - } - if(!isFound) { - SetErrorCode(NOT_EXISTS); - return; - } + if (!isFound) { + SetErrorCode(NOT_EXISTS); + return; } + } + if ( aFunction->IsLastFuntion() ) { aSSI.SetIndices(aNewSeq); } + else { + aFunction = theGroup->AddFunction( GEOM_Object::GetSubShapeID(), 0, true ); + GEOM_ISubShape aSSI2 (aFunction); + aSSI2.SetIndices(aNewSeq); + aSSI2.SetMainShape( aSSI.GetMainShape() ); + } - //Make a Python command - TCollection_AsciiString anOldDescr = aFunction->GetDescription(); + // As we do not recompute here our group, lets mark it as Modified + TDF_Label aLabel = aSSI.GetMainShape()->GetOwnerEntry(); + if (aLabel.IsRoot()) return; + Handle(GEOM_Object) aMainObj = GEOM_Object::GetObject(aLabel); + if (aMainObj.IsNull()) return; + Standard_Integer aTic = aMainObj->GetTic(); // tic of main shape + theGroup->SetTic(aTic - 1); - GEOM::TPythonDump(aFunction) << anOldDescr.ToCString() << "\n\t" + //Make a Python command + GEOM::TPythonDump(aFunction, /*append=*/true) << "geompy.RemoveObject(" << theGroup << ", " << theSubShapeID << ")"; SetErrorCode(OK); - return; + return; } //============================================================================= @@ -242,7 +287,19 @@ void GEOMImpl_IGroupOperations::UnionList (Handle(GEOM_Object) theGroup, SetErrorCode(KO); if (theGroup.IsNull()) return; - Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); + if ( theGroup->GetType() != GEOM_GROUP ) { + SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); + return; + } + + Standard_Integer aLen = theSubShapes->Length(); + if (aLen < 1) { + //SetErrorCode("The list is empty"); + SetErrorCode(OK); + return; + } + + Handle(GEOM_Function) aFunction = theGroup->GetLastFunction(); if (aFunction.IsNull()) return; GEOM_ISubShape aSSI (aFunction); @@ -276,80 +333,69 @@ void GEOMImpl_IGroupOperations::UnionList (Handle(GEOM_Object) theGroup, TopTools_IndexedMapOfShape mapIndices; TopExp::MapShapes(aMainShape, mapIndices); + // Get group type + TopAbs_ShapeEnum aType = GetType(theGroup); + // Get IDs of sub-shapes to add - Standard_Integer i, new_id, aLen = theSubShapes->Length(); + Standard_Integer i, new_id; for (i = 1; i <= aLen; i++) { Handle(GEOM_Object) anObj_i = Handle(GEOM_Object)::DownCast(theSubShapes->Value(i)); + TopoDS_Shape aShape_i = anObj_i->GetValue(); + if ( aShape_i.IsNull() ) continue; + TopAbs_ShapeEnum aType_i = aShape_i.ShapeType(); + + // 1. If aShape_i is sub-shape of aMainShape - add it if (anObj_i->IsMainShape()) { - TopoDS_Shape aShape_i = anObj_i->GetValue(); - if (mapIndices.Contains(aShape_i)) { - new_id = mapIndices.FindIndex(aShape_i); - if (mapIDs.Add(new_id)) { - aNewIDs.Append(new_id); - } - } else { - SetErrorCode("One of given objects can not be added to the group, because it is not a sub-shape of the group's main shape"); + if (aType_i != aType && aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) { + SetErrorCode("Operation aborted: one of given objects has a wrong type"); return; } - } else { - // Check main shape of sub-shape to add - Handle(GEOM_Function) aFunc_i = anObj_i->GetFunction(1); - if (aFunc_i.IsNull()) return; - - GEOM_ISubShape aSSI_i (aFunc_i); - - Handle(GEOM_Function) aMainShapeFunc_i = aSSI_i.GetMainShape(); - if (aMainShapeFunc_i.IsNull()) return; - TDF_Label aLabel_i = aMainShapeFunc_i->GetOwnerEntry(); - if (aLabel_i.IsRoot()) return; - Handle(GEOM_Object) aMainObj_i = GEOM_Object::GetObject(aLabel); - if (aMainObj_i.IsNull()) return; - TopoDS_Shape aMainShape_i = aMainObj_i->GetValue(); - if (aMainShape_i.IsNull()) return; - - if (aMainShape_i.IsSame(aMainShape)) { - // add all sub-shape IDs to the list - - // Get IDs - Handle(TColStd_HArray1OfInteger) aSeq_i = aSSI_i.GetIndices(); - if (aSeq_i.IsNull()) return; - Standard_Integer aLength_i = aSeq_i->Length(); - - for (Standard_Integer i_j = 1; i_j <= aLength_i; i_j++) { - new_id = aSeq_i->Value(i_j); - if (new_id > 0) { - if (mapIDs.Add(new_id)) { - aNewIDs.Append(new_id); - } - } - } - - } else if (mapIndices.Contains(aMainShape_i)) { - // compute new IDs and add them to the list - TopTools_IndexedMapOfShape mapIndices_i; - TopExp::MapShapes(aMainShape_i, mapIndices_i); - - // Get IDs - Handle(TColStd_HArray1OfInteger) aSeq_i = aSSI_i.GetIndices(); - if (aSeq_i.IsNull()) return; - Standard_Integer aLength_i = aSeq_i->Length(); - - for (Standard_Integer i_j = 1; i_j <= aLength_i; i_j++) { - if (aSeq_i->Value(i_j) > 0) { - TopoDS_Shape aShape_i_j = mapIndices_i.FindKey(i_j); - new_id = mapIndices.FindIndex(aShape_i_j); - if (mapIDs.Add(new_id)) { - aNewIDs.Append(new_id); - } + if (!mapIndices.Contains(aShape_i)) { + SetErrorCode("Operation aborted: not a sub-shape given"); + return; + } + new_id = mapIndices.FindIndex(aShape_i); + if (mapIDs.Add(new_id)) { + aNewIDs.Append(new_id); + } + } + // 2. If type of group is not defined - add all sub-shapes of aShape_i + else if (aType == TopAbs_SHAPE || aType == TopAbs_COMPOUND) { + TopTools_IndexedMapOfShape mapIndices_i; + TopExp::MapShapes(aShape_i, mapIndices_i); + Standard_Integer ii = 1, nbSubSh = mapIndices_i.Extent(); + Standard_Boolean someGood = Standard_False; + for (; ii <= nbSubSh; ii++) { + TopoDS_Shape aSubShape_i = mapIndices_i.FindKey(ii); + if (mapIndices.Contains(aSubShape_i)) { + someGood = Standard_True; + new_id = mapIndices.FindIndex(aSubShape_i); + if (mapIDs.Add(new_id)) { + aNewIDs.Append(new_id); } } - - } else { - SetErrorCode("One of given objects can not be added to the group, because it is not a sub-shape of the group's main shape"); + } + if (!someGood) { + SetErrorCode("Operation aborted: not a sub-shape given"); return; } } + // 3. If type of group is defined - add all sub-shapes of aShape_i of that type + else { + TopExp_Explorer aSubShapes_i (aShape_i, aType); + for (; aSubShapes_i.More(); aSubShapes_i.Next()) { + TopoDS_Shape aSubShape_i = aSubShapes_i.Current(); + if (!mapIndices.Contains(aSubShape_i)) { + SetErrorCode("Operation aborted: not a sub-shape given"); + return; + } + new_id = mapIndices.FindIndex(aSubShape_i); + if (mapIDs.Add(new_id)) { + aNewIDs.Append(new_id); + } + } + } } if (aNewIDs.Extent() > 0) { @@ -359,15 +405,23 @@ void GEOMImpl_IGroupOperations::UnionList (Handle(GEOM_Object) theGroup, for (; aNewIDsIter.More(); aNewIDsIter.Next(), k++) { aNewSeq->SetValue(k, aNewIDsIter.Value()); } - - aSSI.SetIndices(aNewSeq); + if ( aFunction->IsLastFuntion() ) { + aSSI.SetIndices(aNewSeq); + } + else { + aFunction = theGroup->AddFunction( GEOM_Object::GetSubShapeID(), 0, true ); + GEOM_ISubShape aSSI2 (aFunction); + aSSI2.SetIndices(aNewSeq); + aSSI2.SetMainShape(aMainShapeFunc); + } + // As we do not recompute here our group, lets mark it as Modified + Standard_Integer aTic = aMainObj->GetTic(); // tic of main shape + theGroup->SetTic(aTic - 1); } - //Make a Python command - TCollection_AsciiString anOldDescr = aFunction->GetDescription(); - - GEOM::TPythonDump pd (aFunction); - pd << anOldDescr.ToCString() << "\n\t" << "geompy.UnionList(" << theGroup << ", ["; + //Make a Python command + GEOM::TPythonDump pd (aFunction, /*append=*/true); + pd << "geompy.UnionList(" << theGroup << ", ["; for (i = 1; i <= aLen; i++) { Handle(GEOM_Object) anObj_i = Handle(GEOM_Object)::DownCast(theSubShapes->Value(i)); @@ -388,7 +442,19 @@ void GEOMImpl_IGroupOperations::DifferenceList (Handle(GEOM_Object) theGroup, SetErrorCode(KO); if (theGroup.IsNull()) return; - Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); + if ( theGroup->GetType() != GEOM_GROUP ) { + SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); + return; + } + + Standard_Integer aLen = theSubShapes->Length(); + if (aLen < 1) { + //SetErrorCode("The list is empty"); + SetErrorCode(OK); + return; + } + + Handle(GEOM_Function) aFunction = theGroup->GetLastFunction(); if (aFunction.IsNull()) return; GEOM_ISubShape aSSI (aFunction); @@ -401,8 +467,9 @@ void GEOMImpl_IGroupOperations::DifferenceList (Handle(GEOM_Object) theGroup, if (aSeq.IsNull()) return; Standard_Integer aLength = aSeq->Length(); - if (aLength == 1 && aSeq->Value(1) == -1) // empty group - return; + // VSR 28/04/2011 commented to allow operation even for empty group + // if (aLength == 1 && aSeq->Value(1) == -1) // empty group + // return; TColStd_MapOfInteger mapIDsCurrent; Standard_Integer j = 1; @@ -423,101 +490,88 @@ void GEOMImpl_IGroupOperations::DifferenceList (Handle(GEOM_Object) theGroup, TopTools_IndexedMapOfShape mapIndices; TopExp::MapShapes(aMainShape, mapIndices); + // Get group type + TopAbs_ShapeEnum aType = GetType(theGroup); + // Get IDs of sub-shapes to be removed - Standard_Integer i, rem_id, aLen = theSubShapes->Length(); + Standard_Integer i, rem_id; for (i = 1; i <= aLen; i++) { Handle(GEOM_Object) anObj_i = Handle(GEOM_Object)::DownCast(theSubShapes->Value(i)); - if (anObj_i->IsMainShape()) { - TopoDS_Shape aShape_i = anObj_i->GetValue(); - if (mapIndices.Contains(aShape_i)) { - rem_id = mapIndices.FindIndex(aShape_i); - if (mapIDsCurrent.Contains(rem_id)) { - mapIDsToRemove.Add(rem_id); - } - } else { - SetErrorCode("One of given objects can not be removed from the group, because it is not a sub-shape of the group's main shape"); - return; + TopoDS_Shape aShape_i = anObj_i->GetValue(); + + // 1. If aShape_i is sub-shape of aMainShape - remove it + if (mapIndices.Contains(aShape_i)) { + rem_id = mapIndices.FindIndex(aShape_i); + if (rem_id > 0 && mapIDsCurrent.Contains(rem_id)) { + mapIDsToRemove.Add(rem_id); } - } else { - // Check main shape of sub-shape to be removed - Handle(GEOM_Function) aFunc_i = anObj_i->GetFunction(1); - if (aFunc_i.IsNull()) return; - - GEOM_ISubShape aSSI_i (aFunc_i); - - Handle(GEOM_Function) aMainShapeFunc_i = aSSI_i.GetMainShape(); - if (aMainShapeFunc_i.IsNull()) return; - TDF_Label aLabel_i = aMainShapeFunc_i->GetOwnerEntry(); - if (aLabel_i.IsRoot()) return; - Handle(GEOM_Object) aMainObj_i = GEOM_Object::GetObject(aLabel); - if (aMainObj_i.IsNull()) return; - TopoDS_Shape aMainShape_i = aMainObj_i->GetValue(); - if (aMainShape_i.IsNull()) return; - - if (aMainShape_i.IsSame(aMainShape)) { - // remove all sub-shapes - - // Get IDs - Handle(TColStd_HArray1OfInteger) aSeq_i = aSSI_i.GetIndices(); - if (aSeq_i.IsNull()) return; - Standard_Integer aLength_i = aSeq_i->Length(); - - for (Standard_Integer i_j = 1; i_j <= aLength_i; i_j++) { - rem_id = aSeq_i->Value(i_j); - if (rem_id > 0) { - if (mapIDsCurrent.Contains(rem_id)) { - mapIDsToRemove.Add(rem_id); - } + } + // 2. If type of group is not defined - remove all sub-shapes of aShape_i + else if (aType == TopAbs_SHAPE || aType == TopAbs_COMPOUND) { + TopTools_IndexedMapOfShape mapIndices_i; + TopExp::MapShapes(aShape_i, mapIndices_i); + Standard_Integer nbSubSh = mapIndices_i.Extent(); + Standard_Integer ii = 1; + for (; ii <= nbSubSh; ii++) { + TopoDS_Shape aSubShape_i = mapIndices_i.FindKey(ii); + if (mapIndices.Contains(aSubShape_i)) { + rem_id = mapIndices.FindIndex(aSubShape_i); + if (rem_id > 0 && mapIDsCurrent.Contains(rem_id)) { + mapIDsToRemove.Add(rem_id); } } - - } else if (mapIndices.Contains(aMainShape_i)) { - // compute new IDs and add them to the map of ids to be removed - TopTools_IndexedMapOfShape mapIndices_i; - TopExp::MapShapes(aMainShape_i, mapIndices_i); - - // Get IDs - Handle(TColStd_HArray1OfInteger) aSeq_i = aSSI_i.GetIndices(); - if (aSeq_i.IsNull()) return; - Standard_Integer aLength_i = aSeq_i->Length(); - - for (Standard_Integer i_j = 1; i_j <= aLength_i; i_j++) { - if (aSeq_i->Value(i_j) > 0) { - TopoDS_Shape aShape_i_j = mapIndices_i.FindKey(i_j); - rem_id = mapIndices.FindIndex(aShape_i_j); - if (mapIDsCurrent.Contains(rem_id)) { - mapIDsToRemove.Add(rem_id); - } + } + } + // 3. If type of group is defined - remove all sub-shapes of aShape_i of that type + else { + TopExp_Explorer aSubShapes_i (aShape_i, aType); + for (; aSubShapes_i.More(); aSubShapes_i.Next()) { + TopoDS_Shape aSubShape_i = aSubShapes_i.Current(); + if (mapIndices.Contains(aSubShape_i)) { + rem_id = mapIndices.FindIndex(aSubShape_i); + if (rem_id > 0 && mapIDsCurrent.Contains(rem_id)) { + mapIDsToRemove.Add(rem_id); } } - - } else { - SetErrorCode("One of given objects can not be removed from the group, because it is not a sub-shape of the group's main shape"); - return; } } } if (mapIDsToRemove.Extent() > 0) { Standard_Integer k = 1, aRemLength = mapIDsToRemove.Extent(); - Handle(TColStd_HArray1OfInteger) aNewSeq = new TColStd_HArray1OfInteger(1, aLength - aRemLength); - - for (j = 1; j <= aLength; j++) { - if (!mapIDsToRemove.Contains(aSeq->Value(j))) { - aNewSeq->SetValue(k, aSeq->Value(j)); - k++; + Handle(TColStd_HArray1OfInteger) aNewSeq; + if ( aLength - aRemLength > 0 ) { + aNewSeq = new TColStd_HArray1OfInteger(1, aLength - aRemLength); + for (j = 1; j <= aLength; j++) { + if (!mapIDsToRemove.Contains(aSeq->Value(j))) { + aNewSeq->SetValue(k, aSeq->Value(j)); + k++; + } } } + else { + aNewSeq = new TColStd_HArray1OfInteger(1,1); + aNewSeq->SetValue(1, -1); + } - aSSI.SetIndices(aNewSeq); + if ( aFunction->IsLastFuntion() ) { + aSSI.SetIndices(aNewSeq); + } + else { + aFunction = theGroup->AddFunction( GEOM_Object::GetSubShapeID(), 0, true ); + GEOM_ISubShape aSSI2 (aFunction); + aSSI2.SetIndices(aNewSeq); + aSSI2.SetMainShape(aMainShapeFunc); + } + // As we do not recompute here our group, lets mark it as Modified + Standard_Integer aTic = aMainObj->GetTic(); // tic of main shape + theGroup->SetTic(aTic - 1); } //Make a Python command - TCollection_AsciiString anOldDescr = aFunction->GetDescription(); - - GEOM::TPythonDump pd (aFunction); - pd << anOldDescr.ToCString() << "\n\t" << "geompy.DifferenceList(" << theGroup << ", ["; + GEOM::TPythonDump pd (aFunction, /*append=*/true); + pd << "geompy.DifferenceList(" << theGroup << ", ["; for (i = 1; i <= aLen; i++) { Handle(GEOM_Object) anObj_i = Handle(GEOM_Object)::DownCast(theSubShapes->Value(i)); @@ -526,6 +580,7 @@ void GEOMImpl_IGroupOperations::DifferenceList (Handle(GEOM_Object) theGroup, SetErrorCode(OK); } + //============================================================================= /*! * UnionIDs @@ -537,7 +592,19 @@ void GEOMImpl_IGroupOperations::UnionIDs (Handle(GEOM_Object) theGroup, SetErrorCode(KO); if (theGroup.IsNull()) return; - Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); + if ( theGroup->GetType() != GEOM_GROUP ) { + SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); + return; + } + + Standard_Integer aLen = theSubShapes->Length(); + if (aLen < 1) { + //SetErrorCode("The list is empty"); + SetErrorCode(OK); + return; + } + + Handle(GEOM_Function) aFunction = theGroup->GetLastFunction(); if (aFunction.IsNull()) return; GEOM_ISubShape aSSI (aFunction); @@ -571,13 +638,17 @@ void GEOMImpl_IGroupOperations::UnionIDs (Handle(GEOM_Object) theGroup, TopTools_IndexedMapOfShape mapIndices; TopExp::MapShapes(aMainShape, mapIndices); + // Get group type + TopAbs_ShapeEnum aType = GetType(theGroup); + // Get IDs of sub-shapes to add - Standard_Integer i, new_id, aLen = theSubShapes->Length(); + Standard_Integer i, new_id; for (i = 1; i <= aLen; i++) { new_id = theSubShapes->Value(i); if (0 < new_id && new_id <= mapIndices.Extent()) { - if (mapIDs.Add(new_id)) { + //if (mapIDs.Add(new_id)) { IPAL21297. Why we ignore invalid ids silently? + if (mapIDs.Add(new_id) && mapIndices(new_id).ShapeType()==aType ) { aNewIDs.Append(new_id); } } @@ -590,10 +661,27 @@ void GEOMImpl_IGroupOperations::UnionIDs (Handle(GEOM_Object) theGroup, for (; aNewIDsIter.More(); aNewIDsIter.Next(), k++) { aNewSeq->SetValue(k, aNewIDsIter.Value()); } - - aSSI.SetIndices(aNewSeq); + if ( aFunction->IsLastFuntion() ) { + aSSI.SetIndices(aNewSeq); + } + else { + aFunction = theGroup->AddFunction( GEOM_Object::GetSubShapeID(), 0, true ); + GEOM_ISubShape aSSI2 (aFunction); + aSSI2.SetIndices(aNewSeq); + aSSI2.SetMainShape(aMainShapeFunc); + } + // As we do not recompute here our group, lets mark it as Modified + Standard_Integer aTic = aMainObj->GetTic(); // tic of main shape + theGroup->SetTic(aTic - 1); } + //Make a Python command + GEOM::TPythonDump pd (aFunction, /*append=*/true); + pd << "geompy.UnionIDs(" << theGroup << ", ["; + for (i = 1; i < aLen; i++) + pd << theSubShapes->Value(i) << ", "; + pd << theSubShapes->Value(aLen) << "])"; + SetErrorCode(OK); } @@ -608,7 +696,19 @@ void GEOMImpl_IGroupOperations::DifferenceIDs (Handle(GEOM_Object) theGroup, SetErrorCode(KO); if (theGroup.IsNull()) return; - Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); + if ( theGroup->GetType() != GEOM_GROUP ) { + SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); + return; + } + + Standard_Integer aLen = theSubShapes->Length(); + if (aLen < 1) { + //SetErrorCode("The list is empty"); + SetErrorCode(OK); + return; + } + + Handle(GEOM_Function) aFunction = theGroup->GetLastFunction(); if (aFunction.IsNull()) return; GEOM_ISubShape aSSI (aFunction); @@ -621,8 +721,9 @@ void GEOMImpl_IGroupOperations::DifferenceIDs (Handle(GEOM_Object) theGroup, if (aSeq.IsNull()) return; Standard_Integer aLength = aSeq->Length(); - if (aLength == 1 && aSeq->Value(1) == -1) // empty group - return; + // VSR 28/04/2011 commented to allow operation even for empty group + // if (aLength == 1 && aSeq->Value(1) == -1) // empty group + // return; TColStd_MapOfInteger mapIDsCurrent; Standard_Integer j = 1; @@ -644,29 +745,816 @@ void GEOMImpl_IGroupOperations::DifferenceIDs (Handle(GEOM_Object) theGroup, TopExp::MapShapes(aMainShape, mapIndices); // Get IDs of sub-shapes to be removed - Standard_Integer i, rem_id, aLen = theSubShapes->Length(); + Standard_Integer i, rem_id; for (i = 1; i <= aLen; i++) { rem_id = theSubShapes->Value(i); - if (mapIDsCurrent.Contains(rem_id)) { + if (rem_id > 0 && mapIDsCurrent.Contains(rem_id)) { mapIDsToRemove.Add(rem_id); } } if (mapIDsToRemove.Extent() > 0) { Standard_Integer k = 1, aRemLength = mapIDsToRemove.Extent(); - Handle(TColStd_HArray1OfInteger) aNewSeq = new TColStd_HArray1OfInteger(1, aLength - aRemLength); + Handle(TColStd_HArray1OfInteger) aNewSeq; + if ( aLength - aRemLength > 0 ) { + aNewSeq = new TColStd_HArray1OfInteger(1, aLength - aRemLength); + for (j = 1; j <= aLength; j++) { + if (!mapIDsToRemove.Contains(aSeq->Value(j))) { + aNewSeq->SetValue(k, aSeq->Value(j)); + k++; + } + } + } + else { + aNewSeq = new TColStd_HArray1OfInteger(1,1); + aNewSeq->SetValue(1, -1); + } + if ( aFunction->IsLastFuntion() ) { + aSSI.SetIndices(aNewSeq); + } + else { + aFunction = theGroup->AddFunction( GEOM_Object::GetSubShapeID(), 0, true ); + GEOM_ISubShape aSSI2 (aFunction); + aSSI2.SetIndices(aNewSeq); + aSSI2.SetMainShape(aMainShapeFunc); + } + // As we do not recompute here our group, lets mark it as Modified + Standard_Integer aTic = aMainObj->GetTic(); // tic of main shape + theGroup->SetTic(aTic - 1); + } + + //Make a Python command + GEOM::TPythonDump pd (aFunction, /*append=*/true); + pd << "geompy.DifferenceIDs(" << theGroup << ", ["; + for (i = 1; i < aLen; i++) + pd << theSubShapes->Value(i) << ", "; + pd << theSubShapes->Value(aLen) << "])"; + + SetErrorCode(OK); +} + +//============================================================================= +/*! + * UnionGroups + */ +//============================================================================= +Handle(GEOM_Object) GEOMImpl_IGroupOperations::UnionGroups (Handle(GEOM_Object) theGroup1, + Handle(GEOM_Object) theGroup2) +{ + SetErrorCode(KO); + if (theGroup1.IsNull() || theGroup2.IsNull()) return NULL; + + if ( theGroup1->GetType() != GEOM_GROUP || theGroup2->GetType() != GEOM_GROUP ) { + SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); + return NULL; + } + + // Get group type + TopAbs_ShapeEnum aType1 = GetType(theGroup1); + TopAbs_ShapeEnum aType2 = GetType(theGroup2); + TopAbs_ShapeEnum aType = aType1; + if (aType1 != aType2) { + if (aType1 != TopAbs_SHAPE && aType1 != TopAbs_COMPOUND) { + if (aType2 == TopAbs_SHAPE || aType2 == TopAbs_COMPOUND) + aType = aType2; + else { + SetErrorCode("Error: UnionGroups cannot be performed on groups of different type"); + return NULL; + } + } + } + + // Get Main Shape + Handle(GEOM_Function) aFunction1 = theGroup1->GetLastFunction(); + Handle(GEOM_Function) aFunction2 = theGroup2->GetLastFunction(); + if (aFunction1.IsNull() || aFunction2.IsNull()) return NULL; + + GEOM_ISubShape aSSI1 (aFunction1); + GEOM_ISubShape aSSI2 (aFunction2); + + Handle(GEOM_Function) aMainShapeFunc1 = aSSI1.GetMainShape(); + Handle(GEOM_Function) aMainShapeFunc2 = aSSI2.GetMainShape(); + if (aMainShapeFunc1.IsNull() || aMainShapeFunc2.IsNull()) return NULL; + + TDF_Label aLabel1 = aMainShapeFunc1->GetOwnerEntry(); + TDF_Label aLabel2 = aMainShapeFunc2->GetOwnerEntry(); + if (aLabel1.IsRoot() || aLabel2.IsRoot()) { + SetErrorCode("Error: UnionGroups can be performed only on groups"); + return NULL; + } + + if (aLabel1 != aLabel2) { + SetErrorCode("Error: UnionGroups cannot be performed on groups, built on different main shapes"); + return NULL; + } + + Handle(GEOM_Object) aMainObj = GEOM_Object::GetObject(aLabel1); + if (aMainObj.IsNull()) return NULL; + + // New contents of the group + TColStd_ListOfInteger aNewIDs; + TColStd_MapOfInteger mapIDs; + + Handle(TColStd_HArray1OfInteger) aSeq1 = aSSI1.GetIndices(); + Handle(TColStd_HArray1OfInteger) aSeq2 = aSSI2.GetIndices(); + if (aSeq1.IsNull() || aSeq2.IsNull()) return NULL; + + Standard_Integer j, val_j; + Standard_Integer aLength1 = aSeq1->Length(); + Standard_Integer aLength2 = aSeq2->Length(); + + for (j = 1; j <= aLength1; j++) { + val_j = aSeq1->Value(j); + if (val_j > 0 && mapIDs.Add(val_j)) { + aNewIDs.Append(val_j); + } + } + for (j = 1; j <= aLength2; j++) { + val_j = aSeq2->Value(j); + if (val_j > 0 && mapIDs.Add(val_j)) { + aNewIDs.Append(val_j); + } + } + + if (aNewIDs.Extent() < 1) { + SetErrorCode("Error: UnionGroups cannot be performed on two empty groups"); + return NULL; + } + + // Put new indices from the list into an array + Standard_Integer k = 1; + TColStd_ListIteratorOfListOfInteger aNewIDsIter (aNewIDs); + Handle(TColStd_HArray1OfInteger) aNewArr = new TColStd_HArray1OfInteger (1, aNewIDs.Extent()); + for (; aNewIDsIter.More(); aNewIDsIter.Next(), k++) { + aNewArr->SetValue(k, aNewIDsIter.Value()); + } + + // Create the Group + Handle(GEOM_Object) aGroup = GetEngine()->AddSubShape(aMainObj, aNewArr); + aGroup->SetType(GEOM_GROUP); + TDF_Label aFreeLabel = aGroup->GetFreeLabel(); + TDataStd_Integer::Set(aFreeLabel, (Standard_Integer)aType); + + // Make a Python command + Handle(GEOM_Function) aFunction = aGroup->GetFunction(1); + GEOM::TPythonDump(aFunction) << aGroup << " = geompy.UnionGroups(" + << theGroup1 << ", " << theGroup2 << ")"; + + SetErrorCode(OK); + return aGroup; +} + +//============================================================================= +/*! + * IntersectGroups + */ +//============================================================================= +Handle(GEOM_Object) GEOMImpl_IGroupOperations::IntersectGroups (Handle(GEOM_Object) theGroup1, + Handle(GEOM_Object) theGroup2) +{ + SetErrorCode(KO); + if (theGroup1.IsNull() || theGroup2.IsNull()) return NULL; + + if ( theGroup1->GetType() != GEOM_GROUP || theGroup2->GetType() != GEOM_GROUP ) { + SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); + return NULL; + } + + // Get group type + TopAbs_ShapeEnum aType1 = GetType(theGroup1); + TopAbs_ShapeEnum aType2 = GetType(theGroup2); + TopAbs_ShapeEnum aType = aType1; + if (aType1 != aType2) { + if (aType1 != TopAbs_SHAPE && aType1 != TopAbs_COMPOUND) { + if (aType2 == TopAbs_SHAPE || aType2 == TopAbs_COMPOUND) + aType = aType2; + else { + SetErrorCode("Error: IntersectGroups cannot be performed on groups of different type"); + return NULL; + } + } + } + + // Get Main Shape + Handle(GEOM_Function) aFunction1 = theGroup1->GetLastFunction(); + Handle(GEOM_Function) aFunction2 = theGroup2->GetLastFunction(); + if (aFunction1.IsNull() || aFunction2.IsNull()) return NULL; + + GEOM_ISubShape aSSI1 (aFunction1); + GEOM_ISubShape aSSI2 (aFunction2); + + Handle(GEOM_Function) aMainShapeFunc1 = aSSI1.GetMainShape(); + Handle(GEOM_Function) aMainShapeFunc2 = aSSI2.GetMainShape(); + if (aMainShapeFunc1.IsNull() || aMainShapeFunc2.IsNull()) return NULL; + + TDF_Label aLabel1 = aMainShapeFunc1->GetOwnerEntry(); + TDF_Label aLabel2 = aMainShapeFunc2->GetOwnerEntry(); + if (aLabel1.IsRoot() || aLabel2.IsRoot()) { + SetErrorCode("Error: UnionGroups can be performed only on groups"); + return NULL; + } + + if (aLabel1 != aLabel2) { + SetErrorCode("Error: IntersectGroups cannot be performed on groups, built on different main shapes"); + return NULL; + } + + Handle(GEOM_Object) aMainObj = GEOM_Object::GetObject(aLabel1); + if (aMainObj.IsNull()) return NULL; + + // New contents of the group + TColStd_ListOfInteger aNewIDs; + TColStd_MapOfInteger mapIDs; + + Handle(TColStd_HArray1OfInteger) aSeq1 = aSSI1.GetIndices(); + Handle(TColStd_HArray1OfInteger) aSeq2 = aSSI2.GetIndices(); + if (aSeq1.IsNull() || aSeq2.IsNull()) return NULL; + + Standard_Integer j, val_j; + Standard_Integer aLength1 = aSeq1->Length(); + Standard_Integer aLength2 = aSeq2->Length(); + + for (j = 1; j <= aLength1; j++) { + mapIDs.Add(aSeq1->Value(j)); + } + for (j = 1; j <= aLength2; j++) { + val_j = aSeq2->Value(j); + if (val_j > 0 && !mapIDs.Add(val_j)) { + // add index, if it is in mapIDs (filled from Group_1) + aNewIDs.Append(val_j); + } + } + + Handle(TColStd_HArray1OfInteger) aNewArr; + if (aNewIDs.Extent() < 1) { + aNewArr = new TColStd_HArray1OfInteger (1, 1); + aNewArr->SetValue(1, -1); + } + else { + // Put new indices from the list into an array + Standard_Integer k = 1; + TColStd_ListIteratorOfListOfInteger aNewIDsIter (aNewIDs); + aNewArr = new TColStd_HArray1OfInteger (1, aNewIDs.Extent()); + for (; aNewIDsIter.More(); aNewIDsIter.Next(), k++) { + aNewArr->SetValue(k, aNewIDsIter.Value()); + } + } + + // Create the Group + Handle(GEOM_Object) aGroup = GetEngine()->AddSubShape(aMainObj, aNewArr); + aGroup->SetType(GEOM_GROUP); + TDF_Label aFreeLabel = aGroup->GetFreeLabel(); + TDataStd_Integer::Set(aFreeLabel, (Standard_Integer)aType); + + // Make a Python command + Handle(GEOM_Function) aFunction = aGroup->GetFunction(1); + GEOM::TPythonDump(aFunction) << aGroup << " = geompy.IntersectGroups(" + << theGroup1 << ", " << theGroup2 << ")"; + + SetErrorCode(OK); + return aGroup; +} + +//============================================================================= +/*! + * CutGroups + */ +//============================================================================= +Handle(GEOM_Object) GEOMImpl_IGroupOperations::CutGroups (Handle(GEOM_Object) theGroup1, + Handle(GEOM_Object) theGroup2) +{ + SetErrorCode(KO); + if (theGroup1.IsNull() || theGroup2.IsNull()) return NULL; + + if ( theGroup1->GetType() != GEOM_GROUP || theGroup2->GetType() != GEOM_GROUP ) { + SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); + return NULL; + } + + // Get group type + TopAbs_ShapeEnum aType1 = GetType(theGroup1); + TopAbs_ShapeEnum aType2 = GetType(theGroup2); + TopAbs_ShapeEnum aType = aType1; + if (aType1 != aType2) { + if (aType1 != TopAbs_SHAPE && aType1 != TopAbs_COMPOUND) { + if (aType2 == TopAbs_SHAPE || aType2 == TopAbs_COMPOUND) + aType = aType2; + else { + SetErrorCode("Error: CutGroups cannot be performed on groups of different type"); + return NULL; + } + } + } + + // Get Main Shape + Handle(GEOM_Function) aFunction1 = theGroup1->GetLastFunction(); + Handle(GEOM_Function) aFunction2 = theGroup2->GetLastFunction(); + if (aFunction1.IsNull() || aFunction2.IsNull()) return NULL; + + GEOM_ISubShape aSSI1 (aFunction1); + GEOM_ISubShape aSSI2 (aFunction2); + + Handle(GEOM_Function) aMainShapeFunc1 = aSSI1.GetMainShape(); + Handle(GEOM_Function) aMainShapeFunc2 = aSSI2.GetMainShape(); + if (aMainShapeFunc1.IsNull() || aMainShapeFunc2.IsNull()) return NULL; + + TDF_Label aLabel1 = aMainShapeFunc1->GetOwnerEntry(); + TDF_Label aLabel2 = aMainShapeFunc2->GetOwnerEntry(); + if (aLabel1.IsRoot() || aLabel2.IsRoot()) { + SetErrorCode("Error: UnionGroups can be performed only on groups"); + return NULL; + } + + if (aLabel1 != aLabel2) { + SetErrorCode("Error: CutGroups cannot be performed on groups, built on different main shapes"); + return NULL; + } + + Handle(GEOM_Object) aMainObj = GEOM_Object::GetObject(aLabel1); + if (aMainObj.IsNull()) return NULL; + + // New contents of the group + TColStd_ListOfInteger aNewIDs; + TColStd_MapOfInteger mapIDs; + + Handle(TColStd_HArray1OfInteger) aSeq1 = aSSI1.GetIndices(); + Handle(TColStd_HArray1OfInteger) aSeq2 = aSSI2.GetIndices(); + if (aSeq1.IsNull() || aSeq2.IsNull()) return NULL; + + Standard_Integer j, val_j; + Standard_Integer aLength1 = aSeq1->Length(); + Standard_Integer aLength2 = aSeq2->Length(); + + for (j = 1; j <= aLength2; j++) { + mapIDs.Add(aSeq2->Value(j)); + } + for (j = 1; j <= aLength1; j++) { + val_j = aSeq1->Value(j); + if (val_j > 0 && mapIDs.Add(val_j)) { + // add index, if it is not in mapIDs (filled from Group_2) + aNewIDs.Append(val_j); + } + } + + Handle(TColStd_HArray1OfInteger) aNewArr; + if (aNewIDs.Extent() < 1) { + aNewArr = new TColStd_HArray1OfInteger (1, 1); + aNewArr->SetValue(1, -1); + } + else { + // Put new indices from the list into an array + Standard_Integer k = 1; + TColStd_ListIteratorOfListOfInteger aNewIDsIter (aNewIDs); + aNewArr = new TColStd_HArray1OfInteger (1, aNewIDs.Extent()); + for (; aNewIDsIter.More(); aNewIDsIter.Next(), k++) { + aNewArr->SetValue(k, aNewIDsIter.Value()); + } + } + // Create the Group + Handle(GEOM_Object) aGroup = GetEngine()->AddSubShape(aMainObj, aNewArr); + aGroup->SetType(GEOM_GROUP); + TDF_Label aFreeLabel = aGroup->GetFreeLabel(); + TDataStd_Integer::Set(aFreeLabel, (Standard_Integer)aType); + + // Make a Python command + Handle(GEOM_Function) aFunction = aGroup->GetFunction(1); + GEOM::TPythonDump(aFunction) << aGroup << " = geompy.CutGroups(" + << theGroup1 << ", " << theGroup2 << ")"; + + SetErrorCode(OK); + return aGroup; +} + +//============================================================================= +/*! + * UnionListOfGroups + */ +//============================================================================= +Handle(GEOM_Object) GEOMImpl_IGroupOperations::UnionListOfGroups + (const Handle(TColStd_HSequenceOfTransient)& theGList) +{ + SetErrorCode(KO); + if (theGList.IsNull()) return NULL; + + Standard_Integer i, aLen = theGList->Length(); + if (aLen < 1) { + SetErrorCode("UnionListOfGroups error: the list of groups is empty"); + return NULL; + } + + TopAbs_ShapeEnum aType, aType_i; + TDF_Label aLabel, aLabel_i; + TColStd_ListOfInteger aNewIDs; + TColStd_MapOfInteger mapIDs; + + // Iterate on the initial groups + 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; + } + // Get group type + aType_i = GetType(aGr_i); + if (i == 1) + aType = aType_i; + else { + if (aType_i != aType) { + if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) { + if (aType_i == TopAbs_SHAPE || aType_i == TopAbs_COMPOUND) + aType = aType_i; + else { + SetErrorCode("Error: UnionListOfGroups cannot be performed on groups of different type"); + return NULL; + } + } + } + } + + // Get Main Shape + Handle(GEOM_Function) aFunction_i = aGr_i->GetLastFunction(); + if (aFunction_i.IsNull()) return NULL; + GEOM_ISubShape aSSI (aFunction_i); + Handle(GEOM_Function) aMainShapeFunc = aSSI.GetMainShape(); + if (aMainShapeFunc.IsNull()) return NULL; + aLabel_i = aMainShapeFunc->GetOwnerEntry(); + if (aLabel_i.IsRoot()) { + SetErrorCode("Error: UnionGroups can be performed only on groups"); + return NULL; + } + if (i == 1) + aLabel = aLabel_i; + else { + if (aLabel_i != aLabel) { + SetErrorCode("Error: UnionListOfGroups cannot be performed on groups, built on different main shapes"); + return NULL; + } + } + + // New contents of the group + Handle(TColStd_HArray1OfInteger) aSeq = aSSI.GetIndices(); + if (aSeq.IsNull()) return NULL; + + Standard_Integer j, val_j, aLength = aSeq->Length(); for (j = 1; j <= aLength; j++) { - if (!mapIDsToRemove.Contains(aSeq->Value(j))) { - aNewSeq->SetValue(k, aSeq->Value(j)); - k++; + val_j = aSeq->Value(j); + if (val_j > 0 && mapIDs.Add(val_j)) { + aNewIDs.Append(val_j); } } + } - aSSI.SetIndices(aNewSeq); + // Check the resulting list of indices + if (aNewIDs.Extent() < 1) { + SetErrorCode("Error: UnionListOfGroups cannot be performed on all empty groups"); + return NULL; + } + + Handle(GEOM_Object) aMainObj = GEOM_Object::GetObject(aLabel); + if (aMainObj.IsNull()) return NULL; + + // Put new indices from the list into an array + Standard_Integer k = 1; + TColStd_ListIteratorOfListOfInteger aNewIDsIter (aNewIDs); + Handle(TColStd_HArray1OfInteger) aNewArr = new TColStd_HArray1OfInteger (1, aNewIDs.Extent()); + for (; aNewIDsIter.More(); aNewIDsIter.Next(), k++) { + aNewArr->SetValue(k, aNewIDsIter.Value()); + } + + // Create the Group + Handle(GEOM_Object) aGroup = GetEngine()->AddSubShape(aMainObj, aNewArr); + aGroup->SetType(GEOM_GROUP); + TDF_Label aFreeLabel = aGroup->GetFreeLabel(); + TDataStd_Integer::Set(aFreeLabel, (Standard_Integer)aType); + + //Make a Python command + Handle(GEOM_Function) aFunction = aGroup->GetFunction(1); + GEOM::TPythonDump pd (aFunction); + pd << aGroup << " = geompy.UnionListOfGroups(["; + for (i = 1; i <= aLen; i++) { + Handle(GEOM_Object) aGr_i = Handle(GEOM_Object)::DownCast(theGList->Value(i)); + pd << aGr_i << ((i < aLen) ? ", " : "])"); } SetErrorCode(OK); + return aGroup; +} + +//============================================================================= +/*! + * IntersectListOfGroups + */ +//============================================================================= +Handle(GEOM_Object) GEOMImpl_IGroupOperations::IntersectListOfGroups + (const Handle(TColStd_HSequenceOfTransient)& theGList) +{ + SetErrorCode(KO); + if (theGList.IsNull()) return NULL; + + Standard_Integer i, aLen = theGList->Length(); + if (aLen < 1) { + SetErrorCode("IntersectListOfGroups error: the list of groups is empty"); + return NULL; + } + + TopAbs_ShapeEnum aType, aType_i; + TDF_Label aLabel, aLabel_i; + TColStd_ListOfInteger aNewIDs; + TColStd_MapOfInteger mapIDs; + + // Iterate on the initial groups + 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; + } + // Get group type + aType_i = GetType(aGr_i); + if (i == 1) + aType = aType_i; + else { + if (aType_i != aType) { + if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) { + if (aType_i == TopAbs_SHAPE || aType_i == TopAbs_COMPOUND) + aType = aType_i; + else { + SetErrorCode("Error: IntersectListOfGroups cannot be performed on groups of different type"); + return NULL; + } + } + } + } + + // Get Main Shape + Handle(GEOM_Function) aFunction_i = aGr_i->GetLastFunction(); + if (aFunction_i.IsNull()) return NULL; + GEOM_ISubShape aSSI (aFunction_i); + Handle(GEOM_Function) aMainShapeFunc = aSSI.GetMainShape(); + if (aMainShapeFunc.IsNull()) return NULL; + aLabel_i = aMainShapeFunc->GetOwnerEntry(); + if (aLabel_i.IsRoot()) { + SetErrorCode("Error: UnionGroups can be performed only on groups"); + return NULL; + } + if (i == 1) + aLabel = aLabel_i; + else { + if (aLabel_i != aLabel) { + SetErrorCode("Error: IntersectListOfGroups cannot be performed on groups, built on different main shapes"); + return NULL; + } + } + + // New contents of the group + Handle(TColStd_HArray1OfInteger) aSeq = aSSI.GetIndices(); + if (aSeq.IsNull()) return NULL; + + Standard_Integer j, val_j, aLength = aSeq->Length(); + for (j = 1; j <= aLength; j++) { + val_j = aSeq->Value(j); + if (val_j > 0) { + if (i == 1) { + // get all elements of the first group + if (mapIDs.Add(val_j)) + aNewIDs.Append(val_j); + } + else { + // get only elements, present in all previously processed groups + if (!mapIDs.Add(val_j)) + aNewIDs.Append(val_j); + } + } + } + + // refill the map with only validated elements + if (i > 1) { + mapIDs.Clear(); + TColStd_ListIteratorOfListOfInteger aNewIDsIter (aNewIDs); + for (; aNewIDsIter.More(); aNewIDsIter.Next()) { + mapIDs.Add(aNewIDsIter.Value()); + } + } + // clear the resulting list before starting the next sycle + if (i < aLen) { + aNewIDs.Clear(); + } + } + + Handle(GEOM_Object) aMainObj = GEOM_Object::GetObject(aLabel); + if (aMainObj.IsNull()) return NULL; + + Handle(TColStd_HArray1OfInteger) aNewArr; + if (aNewIDs.Extent() < 1) { + aNewArr = new TColStd_HArray1OfInteger (1, 1); + aNewArr->SetValue(1, -1); + } + else { + // Put new indices from the list into an array + Standard_Integer k = 1; + TColStd_ListIteratorOfListOfInteger aNewIDsIter (aNewIDs); + aNewArr = new TColStd_HArray1OfInteger (1, aNewIDs.Extent()); + for (; aNewIDsIter.More(); aNewIDsIter.Next(), k++) { + aNewArr->SetValue(k, aNewIDsIter.Value()); + } + } + + // Create the Group + Handle(GEOM_Object) aGroup = GetEngine()->AddSubShape(aMainObj, aNewArr); + aGroup->SetType(GEOM_GROUP); + TDF_Label aFreeLabel = aGroup->GetFreeLabel(); + TDataStd_Integer::Set(aFreeLabel, (Standard_Integer)aType); + + //Make a Python command + Handle(GEOM_Function) aFunction = aGroup->GetFunction(1); + GEOM::TPythonDump pd (aFunction); + pd << aGroup << " = geompy.IntersectListOfGroups(["; + for (i = 1; i <= aLen; i++) { + Handle(GEOM_Object) aGr_i = Handle(GEOM_Object)::DownCast(theGList->Value(i)); + pd << aGr_i << ((i < aLen) ? ", " : "])"); + } + + SetErrorCode(OK); + return aGroup; +} + +//============================================================================= +/*! + * CutListOfGroups + */ +//============================================================================= +Handle(GEOM_Object) GEOMImpl_IGroupOperations::CutListOfGroups + (const Handle(TColStd_HSequenceOfTransient)& theGList1, + const Handle(TColStd_HSequenceOfTransient)& theGList2) +{ + SetErrorCode(KO); + if (theGList1.IsNull() || theGList2.IsNull()) return NULL; + + Standard_Integer i; + Standard_Integer aLen1 = theGList1->Length(); + Standard_Integer aLen2 = theGList2->Length(); + if (aLen1 < 1) { + SetErrorCode("CutListOfGroups error: the first list of groups is empty"); + return NULL; + } + + TopAbs_ShapeEnum aType, aType_i; + TDF_Label aLabel, aLabel_i; + TColStd_ListOfInteger aNewIDs; + TColStd_MapOfInteger mapIDs; + + // 1. Collect indices to be excluded (from theGList2) into the mapIDs + for (i = 1; i <= aLen2; i++) { + Handle(GEOM_Object) aGr_i = Handle(GEOM_Object)::DownCast(theGList2->Value(i)); + if ( aGr_i->GetType() != GEOM_GROUP ) { + SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); + return NULL; + } + // Get group type + aType_i = GetType(aGr_i); + if (i == 1) + aType = aType_i; + else { + if (aType_i != aType) { + if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) { + if (aType_i == TopAbs_SHAPE || aType_i == TopAbs_COMPOUND) + aType = aType_i; + else { + SetErrorCode("Error: CutListOfGroups cannot be performed on groups of different type"); + return NULL; + } + } + } + } + + // Get Main Shape + Handle(GEOM_Function) aFunction_i = aGr_i->GetLastFunction(); + if (aFunction_i.IsNull()) return NULL; + GEOM_ISubShape aSSI (aFunction_i); + Handle(GEOM_Function) aMainShapeFunc = aSSI.GetMainShape(); + if (aMainShapeFunc.IsNull()) return NULL; + aLabel_i = aMainShapeFunc->GetOwnerEntry(); + if (aLabel_i.IsRoot()) { + SetErrorCode("Error: UnionGroups can be performed only on groups"); + return NULL; + } + if (i == 1) + aLabel = aLabel_i; + else { + if (aLabel_i != aLabel) { + SetErrorCode("Error: CutListOfGroups cannot be performed on groups, built on different main shapes"); + return NULL; + } + } + + // Indiced to exclude + Handle(TColStd_HArray1OfInteger) aSeq = aSSI.GetIndices(); + if (aSeq.IsNull()) return NULL; + + Standard_Integer j, aLength = aSeq->Length(); + for (j = 1; j <= aLength; j++) { + mapIDs.Add(aSeq->Value(j)); + } + } + + // 2. Collect indices from theGList1, avoiding indices from theGList2 (mapIDs) + for (i = 1; i <= aLen1; i++) { + Handle(GEOM_Object) aGr_i = Handle(GEOM_Object)::DownCast(theGList1->Value(i)); + if ( aGr_i->GetType() != GEOM_GROUP ) { + SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); + return NULL; + } + // Get group type + aType_i = GetType(aGr_i); + if (i == 1 && aLen2 < 1) + aType = aType_i; + else { + if (aType_i != aType) { + if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) { + if (aType_i == TopAbs_SHAPE || aType_i == TopAbs_COMPOUND) + aType = aType_i; + else { + SetErrorCode("Error: CutListOfGroups cannot be performed on groups of different type"); + return NULL; + } + } + } + } + + // Get Main Shape + Handle(GEOM_Function) aFunction_i = aGr_i->GetLastFunction(); + if (aFunction_i.IsNull()) return NULL; + GEOM_ISubShape aSSI (aFunction_i); + Handle(GEOM_Function) aMainShapeFunc = aSSI.GetMainShape(); + if (aMainShapeFunc.IsNull()) return NULL; + aLabel_i = aMainShapeFunc->GetOwnerEntry(); + if (aLabel_i.IsRoot()) { + SetErrorCode("Error: UnionGroups can be performed only on groups"); + return NULL; + } + if (i == 1 && aLen2 < 1) + aLabel = aLabel_i; + else { + if (aLabel_i != aLabel) { + SetErrorCode("Error: CutListOfGroups cannot be performed on groups, built on different main shapes"); + return NULL; + } + } + + // New contents of the group + Handle(TColStd_HArray1OfInteger) aSeq = aSSI.GetIndices(); + if (aSeq.IsNull()) return NULL; + + Standard_Integer j, val_j, aLength = aSeq->Length(); + for (j = 1; j <= aLength; j++) { + val_j = aSeq->Value(j); + if (val_j > 0 && mapIDs.Add(val_j)) { + // get only elements, not present in mapIDs (theGList2) + aNewIDs.Append(val_j); + } + } + } + + Handle(GEOM_Object) aMainObj = GEOM_Object::GetObject(aLabel); + if (aMainObj.IsNull()) return NULL; + + Handle(TColStd_HArray1OfInteger) aNewArr; + if (aNewIDs.Extent() < 1) { + aNewArr = new TColStd_HArray1OfInteger (1, 1); + aNewArr->SetValue(1, -1); + } + else { + // Put new indices from the list into an array + Standard_Integer k = 1; + TColStd_ListIteratorOfListOfInteger aNewIDsIter (aNewIDs); + aNewArr = new TColStd_HArray1OfInteger (1, aNewIDs.Extent()); + for (; aNewIDsIter.More(); aNewIDsIter.Next(), k++) { + aNewArr->SetValue(k, aNewIDsIter.Value()); + } + } + + // Create the Group + Handle(GEOM_Object) aGroup = GetEngine()->AddSubShape(aMainObj, aNewArr); + aGroup->SetType(GEOM_GROUP); + TDF_Label aFreeLabel = aGroup->GetFreeLabel(); + TDataStd_Integer::Set(aFreeLabel, (Standard_Integer)aType); + + //Make a Python command + Handle(GEOM_Function) aFunction = aGroup->GetFunction(1); + GEOM::TPythonDump pd (aFunction); + pd << aGroup << " = geompy.CutListOfGroups(["; + for (i = 1; i <= aLen1; i++) { + Handle(GEOM_Object) aGr_i = Handle(GEOM_Object)::DownCast(theGList1->Value(i)); + pd << aGr_i << ((i < aLen1) ? ", " : "], ["); + } + for (i = 1; i <= aLen2; i++) { + Handle(GEOM_Object) aGr_i = Handle(GEOM_Object)::DownCast(theGList2->Value(i)); + pd << aGr_i << ((i < aLen2) ? ", " : "])"); + } + + SetErrorCode(OK); + return aGroup; } //============================================================================= @@ -681,9 +1569,9 @@ TopAbs_ShapeEnum GEOMImpl_IGroupOperations::GetType(Handle(GEOM_Object) theGroup TDF_Label aFreeLabel = theGroup->GetFreeLabel(); Handle(TDataStd_Integer) anAttrib; if(!aFreeLabel.FindAttribute(TDataStd_Integer::GetID(), anAttrib)) return TopAbs_SHAPE; - + SetErrorCode(OK); - return (TopAbs_ShapeEnum) anAttrib->Get(); + return (TopAbs_ShapeEnum) anAttrib->Get(); } //============================================================================= @@ -695,7 +1583,12 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::GetMainShape (Handle(GEOM_Object) { SetErrorCode(KO); - if(theGroup.IsNull()) return NULL; + 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; @@ -709,13 +1602,11 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::GetMainShape (Handle(GEOM_Object) if (aMainShape.IsNull()) return NULL; //Make a Python command - TCollection_AsciiString anOldDescr = aGroupFunction->GetDescription(); - - GEOM::TPythonDump(aGroupFunction) << anOldDescr.ToCString() << "\n\t" - << aMainShape << " = geompy.GetMainShape(" << theGroup << ")"; + //GEOM::TPythonDump(aGroupFunction, /*append=*/true) + // << aMainShape << " = geompy.GetMainShape(" << theGroup << ")"; SetErrorCode(OK); - return aMainShape; + return aMainShape; } //============================================================================= @@ -726,12 +1617,15 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::GetMainShape (Handle(GEOM_Object) Handle(TColStd_HArray1OfInteger) GEOMImpl_IGroupOperations::GetObjects(Handle(GEOM_Object) theGroup) { SetErrorCode(KO); - - if(theGroup.IsNull()) return NULL; - Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); + if(theGroup.IsNull()) return NULL; + if ( theGroup->GetType() != GEOM_GROUP ) { + SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); + return NULL; + } + Handle(GEOM_Function) aFunction = theGroup->GetLastFunction(); if(aFunction.IsNull()) return NULL; - + GEOM_ISubShape aSSI(aFunction); Handle(TColStd_HArray1OfInteger) aSeq = aSSI.GetIndices(); if(aSeq.IsNull()) return NULL;