X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FGEOMImpl%2FGEOMImpl_IGroupOperations.cxx;h=5c6619e41c896166847741cbadead8fea3404269;hb=cb32f89e648187ff92eacc3addecc551b25b25df;hp=ce66c20d6e0c609b31c033c211bafe7395f68e66;hpb=d3dd282390888d7dc091ba2c2ffe7923bd7458e6;p=modules%2Fgeom.git diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx index ce66c20d6..5c6619e41 100644 --- a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx @@ -1,10 +1,37 @@ -using namespace std; - -#include "GEOMImpl_IGroupOperations.hxx" +// Copyright (C) 2007-2011 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 +// 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 @@ -12,22 +39,21 @@ using namespace std; #include #include -#include "GEOM_Function.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_ISubShape.hxx" - #include +#include #include -#include -#include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC +#include +#include +#include +#include //============================================================================= /*! * 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"); @@ -49,36 +75,32 @@ 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 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 - 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; } //============================================================================= @@ -89,12 +111,30 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::CreateGroup(Handle(GEOM_Object) t void GEOMImpl_IGroupOperations::AddObject(Handle(GEOM_Object) theGroup, int theSubShapeID) { SetErrorCode(KO); - if(theGroup.IsNull()) return; + if(theGroup.IsNull()) return; 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) 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); + + 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) { @@ -106,16 +146,24 @@ 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); } + // 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(aFunction, /*append=*/true) + << "geompy.AddObject(" << theGroup << ", " << theSubShapeID << ")"; + SetErrorCode(OK); - return; + return; } //============================================================================= @@ -123,62 +171,549 @@ 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; - + if(theGroup.IsNull()) return; - Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); + Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); 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 { + 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++; + } + } + } + + if (!isFound) { + SetErrorCode(NOT_EXISTS); + return; + } + } + + aSSI.SetIndices(aNewSeq); + + // 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); + + //Make a Python command + GEOM::TPythonDump(aFunction, /*append=*/true) + << "geompy.RemoveObject(" << theGroup << ", " << theSubShapeID << ")"; + + SetErrorCode(OK); + return; +} + +//============================================================================= +/*! + * UnionList + */ +//============================================================================= +void GEOMImpl_IGroupOperations::UnionList (Handle(GEOM_Object) theGroup, + const Handle(TColStd_HSequenceOfTransient)& theSubShapes) +{ + SetErrorCode(KO); + if (theGroup.IsNull()) return; + + Standard_Integer aLen = theSubShapes->Length(); + if (aLen < 1) { + //SetErrorCode("The list is empty"); + SetErrorCode(OK); + 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 group type + TopAbs_ShapeEnum aType = GetType(theGroup); + + // Get IDs of sub-shapes to add + 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()) { + if (aType_i != aType && aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) { + SetErrorCode("Operation aborted: one of given objects has a wrong type"); + return; + } + 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); + } + } + } + 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) { + 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); + + // 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 + 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); +} + +//============================================================================= +/*! + * DifferenceList + */ +//============================================================================= +void GEOMImpl_IGroupOperations::DifferenceList (Handle(GEOM_Object) theGroup, + const Handle(TColStd_HSequenceOfTransient)& theSubShapes) +{ + SetErrorCode(KO); + if (theGroup.IsNull()) return; + + Standard_Integer aLen = theSubShapes->Length(); + if (aLen < 1) { + //SetErrorCode("The list is empty"); + SetErrorCode(OK); + 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(); + + // 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; + 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 group type + TopAbs_ShapeEnum aType = GetType(theGroup); + + // Get IDs of sub-shapes to be removed + Standard_Integer i, rem_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(); + + // 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); + } + } + // 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); + } + } + } + } + // 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); + } + } + } + } + } + + if (mapIDsToRemove.Extent() > 0) { + Standard_Integer k = 1, aRemLength = mapIDsToRemove.Extent(); Handle(TColStd_HArray1OfInteger) aNewSeq; - Standard_Integer aLength = aSeq->Length(); - if(aLength == 1) { - if(aSeq->Value(1) != theSubShapeID) { - SetErrorCode(NOT_EXISTS); - return; + 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); } - 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++; + + aSSI.SetIndices(aNewSeq); + + // 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 + 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"); + SetErrorCode(OK); + 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 group type + TopAbs_ShapeEnum aType = GetType(theGroup); + + // 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)) { IPAL21297. Why we ignore invalid ids silently? + if (mapIDs.Add(new_id) && mapIndices(new_id).ShapeType()==aType ) { + 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); + + // 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); +} + +//============================================================================= +/*! + * 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"); + SetErrorCode(OK); + 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(); + + // 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; + 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 (rem_id > 0 && mapIDsCurrent.Contains(rem_id)) { + mapIDsToRemove.Add(rem_id); + } + } - if(!isFound) { - SetErrorCode(NOT_EXISTS); - return; + if (mapIDsToRemove.Extent() > 0) { + Standard_Integer k = 1, aRemLength = mapIDsToRemove.Extent(); + 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); + + // 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); - return; } //============================================================================= @@ -193,9 +728,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(); } //============================================================================= @@ -203,25 +738,29 @@ 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; + return aMainShape; } //============================================================================= @@ -232,12 +771,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;