X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMImpl%2FGEOMImpl_IGroupOperations.cxx;h=3bc83464cbabe16013a88eeda44d21f794429617;hb=6943eea1c391def14848539900c0705d0e3f66e9;hp=f4bedb504db39c9cfa05fa30d2f269fb5f0de33b;hpb=3866ec3a969f5cc1801d535eab97e4115d9d4564;p=modules%2Fgeom.git diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx index f4bedb504..3bc83464c 100644 --- a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx @@ -1,15 +1,35 @@ -using namespace std; - -#include "GEOMImpl_IGroupOperations.hxx" - -#include "GEOMImpl_Types.hxx" - -#include "GEOM_Function.hxx" -#include "GEOM_ISubShape.hxx" +// Copyright (C) 2005 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 +// 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +#include + +#include + +#include + +#include +#include +#include #include "utilities.h" -#include "OpUtil.hxx" -#include "Utils_ExceptHandlers.hxx" +#include +#include #include #include @@ -18,6 +38,7 @@ using namespace std; #include #include +#include #include #include @@ -54,14 +75,15 @@ GEOMImpl_IGroupOperations::~GEOMImpl_IGroupOperations() * CreateGroup */ //============================================================================= -Handle(GEOM_Object) GEOMImpl_IGroupOperations::CreateGroup(Handle(GEOM_Object) theMainShape, TopAbs_ShapeEnum theShapeType) +Handle(GEOM_Object) GEOMImpl_IGroupOperations::CreateGroup + (Handle(GEOM_Object) theMainShape, TopAbs_ShapeEnum theShapeType) { SetErrorCode(KO); Handle(TColStd_HArray1OfInteger) anArray = new TColStd_HArray1OfInteger(1,1); anArray->SetValue(1, -1); - //Add a new Fillet object + //Add a new Fillet object Handle(GEOM_Object) aGroup = GetEngine()->AddSubShape(theMainShape, anArray); //Set a GROUP type @@ -70,20 +92,15 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::CreateGroup(Handle(GEOM_Object) t //Set a sub shape type TDF_Label aFreeLabel = aGroup->GetFreeLabel(); TDataStd_Integer::Set(aFreeLabel, (Standard_Integer)theShapeType); - - //Make a Python command - TCollection_AsciiString anEntry, aDescr(""); - TDF_Tool::Entry(aGroup->GetEntry(), anEntry); - aDescr = anEntry + " = IGroupOperations.CreateGroup("; - TDF_Tool::Entry(theMainShape->GetEntry(), anEntry); - aDescr += (anEntry+", "); - aDescr += (TCollection_AsciiString((int)theShapeType)+")"); + //Make a Python command Handle(GEOM_Function) aFunction = aGroup->GetFunction(1); - aFunction->SetDescription(aDescr); + + GEOM::TPythonDump(aFunction) << aGroup + << " = geompy.CreateGroup(" << theMainShape << ", " << theShapeType << ")"; SetErrorCode(OK); - return aGroup; + return aGroup; } //============================================================================= @@ -99,7 +116,25 @@ void GEOMImpl_IGroupOperations::AddObject(Handle(GEOM_Object) theGroup, int theS Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); if(aFunction.IsNull()) return; - GEOM_ISubShape aSSI(aFunction); + GEOM_ISubShape aSSI (aFunction); + + // 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(); + if (aMainShape.IsNull()) return; + + TopTools_IndexedMapOfShape aMapOfShapes; + TopExp::MapShapes(aMainShape, aMapOfShapes); + + if (theSubShapeID < 1 || aMapOfShapes.Extent() < theSubShapeID) { + SetErrorCode("Invalid sub-shape index: out of range"); + return; + } + + // Add sub-shape index Handle(TColStd_HArray1OfInteger) aSeq = aSSI.GetIndices(); if(aSeq.IsNull()) return; if(aSeq->Length() == 1 && aSeq->Value(1) == -1) { @@ -119,8 +154,12 @@ void GEOMImpl_IGroupOperations::AddObject(Handle(GEOM_Object) theGroup, int theS aSSI.SetIndices(aNewSeq); } + //Make a Python command + GEOM::TPythonDump(aFunction, /*append=*/true) + << "geompy.AddObject(" << theGroup << ", " << theSubShapeID << ")"; + SetErrorCode(OK); - return; + return; } //============================================================================= @@ -128,7 +167,7 @@ void GEOMImpl_IGroupOperations::AddObject(Handle(GEOM_Object) theGroup, int theS * RemoveObject */ //============================================================================= -void GEOMImpl_IGroupOperations::RemoveObject(Handle(GEOM_Object) theGroup, int theSubShapeID) +void GEOMImpl_IGroupOperations::RemoveObject (Handle(GEOM_Object) theGroup, int theSubShapeID) { SetErrorCode(KO); if(theGroup.IsNull()) return; @@ -179,6 +218,10 @@ void GEOMImpl_IGroupOperations::RemoveObject(Handle(GEOM_Object) theGroup, int t aSSI.SetIndices(aNewSeq); } + //Make a Python command + GEOM::TPythonDump(aFunction, /*append=*/true) + << "geompy.RemoveObject(" << theGroup << ", " << theSubShapeID << ")"; + SetErrorCode(OK); return; } @@ -194,6 +237,12 @@ void GEOMImpl_IGroupOperations::UnionList (Handle(GEOM_Object) theGroup, SetErrorCode(KO); if (theGroup.IsNull()) return; + Standard_Integer aLen = theSubShapes->Length(); + if (aLen < 1) { + SetErrorCode("The list is empty"); + return; + } + Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); if (aFunction.IsNull()) return; @@ -228,80 +277,68 @@ 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(); + 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) { @@ -315,6 +352,19 @@ void GEOMImpl_IGroupOperations::UnionList (Handle(GEOM_Object) theGroup, aSSI.SetIndices(aNewSeq); } + //Make a Python command + Handle(GEOM_Object) aLatest = GEOM::GetCreatedLast(theSubShapes); + aLatest = GEOM::GetCreatedLast(aLatest, theGroup); + Handle(GEOM_Function) aLastFunc = aLatest->GetLastFunction(); + + GEOM::TPythonDump pd (aLastFunc, /*append=*/true); + pd << "geompy.UnionList(" << theGroup << ", ["; + + for (i = 1; i <= aLen; i++) { + Handle(GEOM_Object) anObj_i = Handle(GEOM_Object)::DownCast(theSubShapes->Value(i)); + pd << anObj_i << (( i < aLen ) ? ", " : "])"); + } + SetErrorCode(OK); } @@ -329,6 +379,12 @@ void GEOMImpl_IGroupOperations::DifferenceList (Handle(GEOM_Object) theGroup, SetErrorCode(KO); if (theGroup.IsNull()) return; + Standard_Integer aLen = theSubShapes->Length(); + if (aLen < 1) { + SetErrorCode("The list is empty"); + return; + } + Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); if (aFunction.IsNull()) return; @@ -364,80 +420,227 @@ 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 (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 (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 (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++; } } + + aSSI.SetIndices(aNewSeq); + } + + //Make a Python command + Handle(GEOM_Object) aLatest = GEOM::GetCreatedLast(theSubShapes); + aLatest = GEOM::GetCreatedLast(aLatest, theGroup); + Handle(GEOM_Function) aLastFunc = aLatest->GetLastFunction(); + + GEOM::TPythonDump pd (aLastFunc, /*append=*/true); + pd << "geompy.DifferenceList(" << theGroup << ", ["; + + for (i = 1; i <= aLen; i++) { + Handle(GEOM_Object) anObj_i = Handle(GEOM_Object)::DownCast(theSubShapes->Value(i)); + pd << anObj_i << (( i < aLen ) ? ", " : "])"); + } + + SetErrorCode(OK); +} + +//============================================================================= +/*! + * UnionIDs + */ +//============================================================================= +void GEOMImpl_IGroupOperations::UnionIDs (Handle(GEOM_Object) theGroup, + const Handle(TColStd_HSequenceOfInteger)& theSubShapes) +{ + SetErrorCode(KO); + if (theGroup.IsNull()) return; + + Standard_Integer aLen = theSubShapes->Length(); + if (aLen < 1) { + SetErrorCode("The list is empty"); + return; + } + + Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); + if (aFunction.IsNull()) return; + + GEOM_ISubShape aSSI (aFunction); + + // New contents of the group + TColStd_ListOfInteger aNewIDs; + TColStd_MapOfInteger mapIDs; + + // Add current IDs to the list + Handle(TColStd_HArray1OfInteger) aSeq = aSSI.GetIndices(); + if (aSeq.IsNull()) return; + Standard_Integer val_j, aLength = aSeq->Length(); + + for (Standard_Integer j = 1; j <= aLength; j++) { + val_j = aSeq->Value(j); + if (val_j > 0 && mapIDs.Add(val_j)) { + aNewIDs.Append(val_j); + } + } + + // Get Main Shape + Handle(GEOM_Function) aMainShapeFunc = aSSI.GetMainShape(); + if (aMainShapeFunc.IsNull()) return; + TDF_Label aLabel = aMainShapeFunc->GetOwnerEntry(); + if (aLabel.IsRoot()) return; + Handle(GEOM_Object) aMainObj = GEOM_Object::GetObject(aLabel); + if (aMainObj.IsNull()) return; + TopoDS_Shape aMainShape = aMainObj->GetValue(); + if (aMainShape.IsNull()) return; + + TopTools_IndexedMapOfShape mapIndices; + TopExp::MapShapes(aMainShape, mapIndices); + + // Get IDs of sub-shapes to add + 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)) { + aNewIDs.Append(new_id); + } + } + } + + if (aNewIDs.Extent() > 0) { + Standard_Integer k = 1; + TColStd_ListIteratorOfListOfInteger aNewIDsIter (aNewIDs); + Handle(TColStd_HArray1OfInteger) aNewSeq = new TColStd_HArray1OfInteger(1, aNewIDs.Extent()); + for (; aNewIDsIter.More(); aNewIDsIter.Next(), k++) { + aNewSeq->SetValue(k, aNewIDsIter.Value()); + } + + aSSI.SetIndices(aNewSeq); + } + + //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); +} + +//============================================================================= +/*! + * DifferenceIDs + */ +//============================================================================= +void GEOMImpl_IGroupOperations::DifferenceIDs (Handle(GEOM_Object) theGroup, + const Handle(TColStd_HSequenceOfInteger)& theSubShapes) +{ + SetErrorCode(KO); + if (theGroup.IsNull()) return; + + Standard_Integer aLen = theSubShapes->Length(); + if (aLen < 1) { + SetErrorCode("The list is empty"); + return; + } + + Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); + if (aFunction.IsNull()) return; + + GEOM_ISubShape aSSI (aFunction); + + // Map of IDs to be removed + TColStd_MapOfInteger mapIDsToRemove; + + // Map of current IDs + Handle(TColStd_HArray1OfInteger) aSeq = aSSI.GetIndices(); + if (aSeq.IsNull()) return; + Standard_Integer aLength = aSeq->Length(); + + if (aLength == 1 && aSeq->Value(1) == -1) // empty group + return; + + TColStd_MapOfInteger mapIDsCurrent; + Standard_Integer j = 1; + for (; j <= aLength; j++) { + mapIDsCurrent.Add(aSeq->Value(j)); + } + + // Get Main Shape + Handle(GEOM_Function) aMainShapeFunc = aSSI.GetMainShape(); + if (aMainShapeFunc.IsNull()) return; + TDF_Label aLabel = aMainShapeFunc->GetOwnerEntry(); + if (aLabel.IsRoot()) return; + Handle(GEOM_Object) aMainObj = GEOM_Object::GetObject(aLabel); + if (aMainObj.IsNull()) return; + TopoDS_Shape aMainShape = aMainObj->GetValue(); + if (aMainShape.IsNull()) return; + + TopTools_IndexedMapOfShape mapIndices; + TopExp::MapShapes(aMainShape, mapIndices); + + // Get IDs of sub-shapes to be removed + Standard_Integer i, rem_id; + for (i = 1; i <= aLen; i++) { + rem_id = theSubShapes->Value(i); + if (mapIDsCurrent.Contains(rem_id)) { + mapIDsToRemove.Add(rem_id); + } } if (mapIDsToRemove.Extent() > 0) { @@ -454,6 +657,13 @@ void GEOMImpl_IGroupOperations::DifferenceList (Handle(GEOM_Object) theGroup, aSSI.SetIndices(aNewSeq); } + //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); } @@ -469,7 +679,7 @@ 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(); } @@ -479,23 +689,27 @@ TopAbs_ShapeEnum GEOMImpl_IGroupOperations::GetType(Handle(GEOM_Object) theGroup * GetMainShape */ //============================================================================= -Handle(GEOM_Object) GEOMImpl_IGroupOperations::GetMainShape(Handle(GEOM_Object) theGroup) +Handle(GEOM_Object) GEOMImpl_IGroupOperations::GetMainShape (Handle(GEOM_Object) theGroup) { SetErrorCode(KO); if(theGroup.IsNull()) return NULL; - Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); - if(aFunction.IsNull()) return NULL; - - GEOM_ISubShape aSSI(aFunction); - aFunction = aSSI.GetMainShape(); - if(aFunction.IsNull()) return NULL; + Handle(GEOM_Function) aGroupFunction = theGroup->GetFunction(1); + if (aGroupFunction.IsNull()) return NULL; - TDF_Label aLabel = aFunction->GetOwnerEntry(); + GEOM_ISubShape aSSI (aGroupFunction); + Handle(GEOM_Function) aMainShapeFunction = aSSI.GetMainShape(); + if (aMainShapeFunction.IsNull()) return NULL; + + TDF_Label aLabel = aMainShapeFunction->GetOwnerEntry(); Handle(GEOM_Object) aMainShape = GEOM_Object::GetObject(aLabel); - if(aMainShape.IsNull()) return NULL; - + if (aMainShape.IsNull()) return NULL; + + //Make a Python command + GEOM::TPythonDump(aGroupFunction, /*append=*/true) + << aMainShape << " = geompy.GetMainShape(" << theGroup << ")"; + SetErrorCode(OK); return aMainShape; } @@ -508,12 +722,12 @@ 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; + + if(theGroup.IsNull()) return NULL; Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); if(aFunction.IsNull()) return NULL; - + GEOM_ISubShape aSSI(aFunction); Handle(TColStd_HArray1OfInteger) aSeq = aSSI.GetIndices(); if(aSeq.IsNull()) return NULL;