-using namespace std;
-
-#include "GEOMImpl_IGroupOperations.hxx"
-
-#include "GEOMImpl_Types.hxx"
-
-#include "GEOM_Function.hxx"
-#include "GEOM_ISubShape.hxx"
-#include "GEOM_PythonDump.hxx"
+// Copyright (C) 2007-2008 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 <Standard_Stream.hxx>
+
+#include <GEOMImpl_IGroupOperations.hxx>
+
+#include <GEOMImpl_Types.hxx>
+
+#include <GEOM_Function.hxx>
+#include <GEOM_ISubShape.hxx>
+#include <GEOM_PythonDump.hxx>
#include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <OpUtil.hxx>
+#include <Utils_ExceptHandlers.hxx>
#include <TFunction_DriverTable.hxx>
#include <TFunction_Driver.hxx>
#include <TDataStd_Integer.hxx>
#include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
#include <TColStd_HArray1OfInteger.hxx>
#include <TColStd_ListOfInteger.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx>
-#include <Standard_ErrorHandler.hxx> // 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");
*/
//=============================================================================
Handle(GEOM_Object) GEOMImpl_IGroupOperations::CreateGroup
- (Handle(GEOM_Object) theMainShape, TopAbs_ShapeEnum theShapeType)
+ (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
//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;
}
//=============================================================================
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) {
aSSI.SetIndices(aNewSeq);
}
- //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);
- return;
+ 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 <aNewSeq> 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;
}
-
- aSSI.SetIndices(aNewSeq);
}
- //Make a Python command
- TCollection_AsciiString anOldDescr = aFunction->GetDescription();
+ aSSI.SetIndices(aNewSeq);
- GEOM::TPythonDump(aFunction) << anOldDescr.ToCString() << "\n\t"
+ // 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;
+ return;
}
//=============================================================================
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;
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) {
}
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
- TCollection_AsciiString anOldDescr = aFunction->GetDescription();
+ //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 (aFunction);
- pd << anOldDescr.ToCString() << "\n\t" << "geompy.UnionList(" << theGroup << ", [";
+ 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));
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;
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;
}
}
}
}
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
- TCollection_AsciiString anOldDescr = aFunction->GetDescription();
+ Handle(GEOM_Object) aLatest = GEOM::GetCreatedLast(theSubShapes);
+ aLatest = GEOM::GetCreatedLast(aLatest, theGroup);
+ Handle(GEOM_Function) aLastFunc = aLatest->GetLastFunction();
- GEOM::TPythonDump pd (aFunction);
- pd << anOldDescr.ToCString() << "\n\t" << "geompy.DifferenceList(" << theGroup << ", [";
+ 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));
SetErrorCode(OK);
}
+
//=============================================================================
/*!
* UnionIDs
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;
TopExp::MapShapes(aMainShape, mapIndices);
// 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);
}
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);
}
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;
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)) {
}
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);
}
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();
}
//=============================================================================
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;
}
//=============================================================================
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;
