mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-05-15 09:40:48 +05:00
PAL14122: GetInPlace failure. Provide correct treatment of compounds, shells and wires.
This commit is contained in:
jfa
parent
e33d834b6e
commit
0cdd1a8a7f
@ -17,6 +17,7 @@
|
|||||||
//
|
//
|
||||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <Standard_Stream.hxx>
|
#include <Standard_Stream.hxx>
|
||||||
|
|
||||||
#include "GEOMImpl_IShapesOperations.hxx"
|
#include "GEOMImpl_IShapesOperations.hxx"
|
||||||
@ -2226,85 +2227,123 @@ Handle(TColStd_HSequenceOfInteger)
|
|||||||
* GetInPlace
|
* GetInPlace
|
||||||
*/
|
*/
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
static void SimplifyWhat (TopoDS_Shape& theWhat,
|
static bool GetInPlaceOfShape (const Handle(GEOM_Function)& theWhereFunction,
|
||||||
TopTools_IndexedMapOfShape& theArgumentIndices,
|
const TopTools_IndexedMapOfShape& theWhereIndices,
|
||||||
TColStd_ListOfInteger& theSimpleSubWhat)
|
const TopoDS_Shape& theWhat,
|
||||||
|
TColStd_ListOfInteger& theModifiedList)
|
||||||
{
|
{
|
||||||
TopTools_MapOfShape mapShape;
|
if (theWhereFunction.IsNull() || theWhat.IsNull()) return false;
|
||||||
TopoDS_Iterator It (theWhat, Standard_True, Standard_True);
|
|
||||||
for (; It.More(); It.Next()) {
|
if (theWhereIndices.Contains(theWhat)) {
|
||||||
if (mapShape.Add(It.Value())) {
|
// entity was not changed by the operation
|
||||||
TopoDS_Shape curSh = It.Value();
|
Standard_Integer aWhatIndex = theWhereIndices.FindIndex(theWhat);
|
||||||
if (curSh.ShapeType() == TopAbs_COMPOUND ||
|
theModifiedList.Append(aWhatIndex);
|
||||||
curSh.ShapeType() == TopAbs_COMPSOLID) {
|
return true;
|
||||||
SimplifyWhat(curSh, theArgumentIndices, theSimpleSubWhat);
|
|
||||||
} else {
|
|
||||||
theSimpleSubWhat.Append(theArgumentIndices.FindIndex(curSh));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
static bool GetInPlaceOfCompound (Handle(GEOM_Function)& theWhereFunction,
|
// try to find in history
|
||||||
TopoDS_Shape& theWhat,
|
TDF_Label aHistoryLabel = theWhereFunction->GetHistoryEntry(Standard_False);
|
||||||
TColStd_ListOfInteger& theModifiedArray)
|
|
||||||
{
|
|
||||||
bool isFoundAny = false;
|
|
||||||
TopTools_MapOfShape mapShape;
|
|
||||||
TopoDS_Iterator It (theWhat, Standard_True, Standard_True);
|
|
||||||
for (; It.More(); It.Next()) {
|
|
||||||
if (mapShape.Add(It.Value())) {
|
|
||||||
TopoDS_Shape curWhat = It.Value();
|
|
||||||
if (curWhat.ShapeType() == TopAbs_COMPOUND ||
|
|
||||||
curWhat.ShapeType() == TopAbs_COMPSOLID) {
|
|
||||||
// Recursive call for compound or compsolid
|
|
||||||
if (GetInPlaceOfCompound(theWhereFunction, curWhat, theModifiedArray))
|
|
||||||
isFoundAny = true;
|
|
||||||
} else {
|
|
||||||
// Try to find for "simple" shape
|
|
||||||
bool isFound = false;
|
|
||||||
|
|
||||||
TDF_LabelSequence aLabelSeq;
|
// search in history for all argument shapes
|
||||||
theWhereFunction->GetDependency(aLabelSeq);
|
Standard_Boolean isFound = Standard_False;
|
||||||
Standard_Integer nbArg = aLabelSeq.Length();
|
Standard_Boolean isGood = Standard_False;
|
||||||
|
|
||||||
for (Standard_Integer iarg = 1; iarg <= nbArg && !isFound; iarg++) {
|
TDF_LabelSequence aLabelSeq;
|
||||||
|
theWhereFunction->GetDependency(aLabelSeq);
|
||||||
|
Standard_Integer nbArg = aLabelSeq.Length();
|
||||||
|
|
||||||
TDF_Label anArgumentRefLabel = aLabelSeq.Value(iarg);
|
for (Standard_Integer iarg = 1; iarg <= nbArg && !isFound; iarg++) {
|
||||||
|
|
||||||
Handle(GEOM_Object) anArgumentObject = GEOM_Object::GetReferencedObject(anArgumentRefLabel);
|
TDF_Label anArgumentRefLabel = aLabelSeq.Value(iarg);
|
||||||
TopoDS_Shape anArgumentShape = anArgumentObject->GetValue();
|
|
||||||
|
|
||||||
TopTools_IndexedMapOfShape anArgumentIndices;
|
Handle(GEOM_Object) anArgumentObject = GEOM_Object::GetReferencedObject(anArgumentRefLabel);
|
||||||
TopExp::MapShapes(anArgumentShape, anArgumentIndices);
|
TopoDS_Shape anArgumentShape = anArgumentObject->GetValue();
|
||||||
|
|
||||||
if (anArgumentIndices.Contains(curWhat)) {
|
TopTools_IndexedMapOfShape anArgumentIndices;
|
||||||
isFound = Standard_True;
|
TopExp::MapShapes(anArgumentShape, anArgumentIndices);
|
||||||
Standard_Integer aWhatIndex = anArgumentIndices.FindIndex(curWhat);
|
|
||||||
|
|
||||||
// Find corresponding label in history
|
if (anArgumentIndices.Contains(theWhat)) {
|
||||||
TDF_Label anArgumentHistoryLabel =
|
isFound = Standard_True;
|
||||||
theWhereFunction->GetArgumentHistoryEntry(anArgumentRefLabel, Standard_False);
|
Standard_Integer aWhatIndex = anArgumentIndices.FindIndex(theWhat);
|
||||||
if (!anArgumentHistoryLabel.IsNull()) {
|
|
||||||
TDF_Label aWhatHistoryLabel = anArgumentHistoryLabel.FindChild(aWhatIndex, Standard_False);
|
// Find corresponding label in history
|
||||||
if (!aWhatHistoryLabel.IsNull()) {
|
TDF_Label anArgumentHistoryLabel =
|
||||||
Handle(TDataStd_IntegerArray) anIntegerArray;
|
theWhereFunction->GetArgumentHistoryEntry(anArgumentRefLabel, Standard_False);
|
||||||
if (aWhatHistoryLabel.FindAttribute(TDataStd_IntegerArray::GetID(), anIntegerArray)) {
|
if (anArgumentHistoryLabel.IsNull()) {
|
||||||
Standard_Integer imod, aModifLen = anIntegerArray->Array()->Length();
|
// Lost History of operation argument. Possibly, all its entities was removed.
|
||||||
for (imod = 1; imod <= aModifLen; imod++) {
|
isGood = Standard_True;
|
||||||
theModifiedArray.Append(anIntegerArray->Array()->Value(imod));
|
}
|
||||||
}
|
else {
|
||||||
}
|
TDF_Label aWhatHistoryLabel = anArgumentHistoryLabel.FindChild(aWhatIndex, Standard_False);
|
||||||
}
|
|
||||||
|
if (aWhatHistoryLabel.IsNull()) {
|
||||||
|
// Removed entity ? Compound ? Compsolid ? Shell ? Wire
|
||||||
|
isGood = Standard_False;
|
||||||
|
} else {
|
||||||
|
Handle(TDataStd_IntegerArray) anIntegerArray;
|
||||||
|
if (!aWhatHistoryLabel.FindAttribute(TDataStd_IntegerArray::GetID(), anIntegerArray)) {
|
||||||
|
//Error: Empty modifications history for the sought shape.
|
||||||
|
isGood = Standard_False;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
isGood = Standard_True;
|
||||||
|
Standard_Integer imod, aModifLen = anIntegerArray->Array()->Length();
|
||||||
|
for (imod = 1; imod <= aModifLen; imod++) {
|
||||||
|
theModifiedList.Append(anIntegerArray->Array()->Value(imod));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (isFound)
|
|
||||||
isFoundAny = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return isFoundAny;
|
|
||||||
|
isFound = isGood;
|
||||||
|
|
||||||
|
if (!isFound) {
|
||||||
|
// try compound/compsolid/shell/wire element by element
|
||||||
|
bool isFoundAny = false;
|
||||||
|
TopTools_MapOfShape mapShape;
|
||||||
|
|
||||||
|
if (theWhat.ShapeType() == TopAbs_COMPOUND ||
|
||||||
|
theWhat.ShapeType() == TopAbs_COMPSOLID) {
|
||||||
|
// recursive processing of compound/compsolid
|
||||||
|
TopoDS_Iterator anIt (theWhat, Standard_True, Standard_True);
|
||||||
|
for (; anIt.More(); anIt.Next()) {
|
||||||
|
if (mapShape.Add(anIt.Value())) {
|
||||||
|
TopoDS_Shape curWhat = anIt.Value();
|
||||||
|
isFoundAny = GetInPlaceOfShape(theWhereFunction, theWhereIndices, curWhat, theModifiedList);
|
||||||
|
if (isFoundAny) isFound = Standard_True;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (theWhat.ShapeType() == TopAbs_SHELL) {
|
||||||
|
// try to replace a shell by its faces images
|
||||||
|
TopExp_Explorer anExp (theWhat, TopAbs_FACE);
|
||||||
|
for (; anExp.More(); anExp.Next()) {
|
||||||
|
if (mapShape.Add(anExp.Current())) {
|
||||||
|
TopoDS_Shape curWhat = anExp.Current();
|
||||||
|
isFoundAny = GetInPlaceOfShape(theWhereFunction, theWhereIndices, curWhat, theModifiedList);
|
||||||
|
if (isFoundAny) isFound = Standard_True;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (theWhat.ShapeType() == TopAbs_WIRE) {
|
||||||
|
// try to replace a wire by its edges images
|
||||||
|
TopExp_Explorer anExp (theWhat, TopAbs_EDGE);
|
||||||
|
for (; anExp.More(); anExp.Next()) {
|
||||||
|
if (mapShape.Add(anExp.Current())) {
|
||||||
|
TopoDS_Shape curWhat = anExp.Current();
|
||||||
|
isFoundAny = GetInPlaceOfShape(theWhereFunction, theWhereIndices, curWhat, theModifiedList);
|
||||||
|
if (isFoundAny) isFound = Standard_True;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// Removed entity
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return isFound;
|
||||||
}
|
}
|
||||||
|
|
||||||
Handle(GEOM_Object) GEOMImpl_IShapesOperations::GetInPlace
|
Handle(GEOM_Object) GEOMImpl_IShapesOperations::GetInPlace
|
||||||
@ -2320,138 +2359,27 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::GetInPlace
|
|||||||
|
|
||||||
if (aWhere.IsNull() || aWhat.IsNull()) return NULL;
|
if (aWhere.IsNull() || aWhat.IsNull()) return NULL;
|
||||||
|
|
||||||
//Fill array of indices
|
|
||||||
Handle(TColStd_HArray1OfInteger) aModifiedArray;
|
|
||||||
|
|
||||||
Handle(GEOM_Function) aWhereFunction = theShapeWhere->GetLastFunction();
|
Handle(GEOM_Function) aWhereFunction = theShapeWhere->GetLastFunction();
|
||||||
|
if (aWhereFunction.IsNull()) return NULL;
|
||||||
|
|
||||||
|
//Fill array of indices
|
||||||
TopTools_IndexedMapOfShape aWhereIndices;
|
TopTools_IndexedMapOfShape aWhereIndices;
|
||||||
TopExp::MapShapes(aWhere, aWhereIndices);
|
TopExp::MapShapes(aWhere, aWhereIndices);
|
||||||
|
|
||||||
if (aWhereIndices.Contains(aWhat)) {
|
// process shape
|
||||||
|
TColStd_ListOfInteger aModifiedList;
|
||||||
|
bool isFound = GetInPlaceOfShape(aWhereFunction, aWhereIndices, aWhat, aModifiedList);
|
||||||
|
|
||||||
// entity was not changed by the operation
|
if (!isFound || aModifiedList.Extent() < 1) {
|
||||||
Standard_Integer aWhatIndex = aWhereIndices.FindIndex(aWhat);
|
SetErrorCode("Error: No history found for the sought shape or its sub-shapes.");
|
||||||
aModifiedArray = new TColStd_HArray1OfInteger(1,1);
|
return NULL;
|
||||||
aModifiedArray->SetValue(1, aWhatIndex);
|
}
|
||||||
|
|
||||||
} else {
|
Handle(TColStd_HArray1OfInteger) aModifiedArray =
|
||||||
|
new TColStd_HArray1OfInteger (1, aModifiedList.Extent());
|
||||||
TDF_Label aHistoryLabel = aWhereFunction->GetHistoryEntry(Standard_False);
|
TColStd_ListIteratorOfListOfInteger anIterModif (aModifiedList);
|
||||||
if (aHistoryLabel.IsNull()) {
|
for (Standard_Integer imod = 1; anIterModif.More(); anIterModif.Next(), imod++) {
|
||||||
SetErrorCode("Modifications history does not exist for the shape under consideration.");
|
aModifiedArray->SetValue(imod, anIterModif.Value());
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// search in history for all argument shapes
|
|
||||||
Standard_Boolean isFound = Standard_False;
|
|
||||||
|
|
||||||
TDF_LabelSequence aLabelSeq;
|
|
||||||
aWhereFunction->GetDependency(aLabelSeq);
|
|
||||||
Standard_Integer nbArg = aLabelSeq.Length();
|
|
||||||
|
|
||||||
for (Standard_Integer iarg = 1; iarg <= nbArg && !isFound; iarg++) {
|
|
||||||
|
|
||||||
TDF_Label anArgumentRefLabel = aLabelSeq.Value(iarg);
|
|
||||||
|
|
||||||
Handle(GEOM_Object) anArgumentObject = GEOM_Object::GetReferencedObject(anArgumentRefLabel);
|
|
||||||
TopoDS_Shape anArgumentShape = anArgumentObject->GetValue();
|
|
||||||
|
|
||||||
TopTools_IndexedMapOfShape anArgumentIndices;
|
|
||||||
TopExp::MapShapes(anArgumentShape, anArgumentIndices);
|
|
||||||
|
|
||||||
if (anArgumentIndices.Contains(aWhat)) {
|
|
||||||
isFound = Standard_True;
|
|
||||||
Standard_Integer aWhatIndex = anArgumentIndices.FindIndex(aWhat);
|
|
||||||
|
|
||||||
// Find corresponding label in history
|
|
||||||
TDF_Label anArgumentHistoryLabel =
|
|
||||||
aWhereFunction->GetArgumentHistoryEntry(anArgumentRefLabel, Standard_False);
|
|
||||||
if (anArgumentHistoryLabel.IsNull()) {
|
|
||||||
// Lost History of operation argument. Possibly, all its entities was removed.
|
|
||||||
SetErrorCode(OK);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
TDF_Label aWhatHistoryLabel = anArgumentHistoryLabel.FindChild(aWhatIndex, Standard_False);
|
|
||||||
if (aWhatHistoryLabel.IsNull()) {
|
|
||||||
// Check, if the sought shape is Compound or Compsolid.
|
|
||||||
// In that case we will try to find history for its sub-shapes
|
|
||||||
if (aWhat.ShapeType() == TopAbs_COMPOUND ||
|
|
||||||
aWhat.ShapeType() == TopAbs_COMPSOLID) {
|
|
||||||
TColStd_ListOfInteger aSimpleSubWhat, aModifiedList;
|
|
||||||
SimplifyWhat(aWhat, anArgumentIndices, aSimpleSubWhat);
|
|
||||||
TColStd_ListIteratorOfListOfInteger anIterSub (aSimpleSubWhat);
|
|
||||||
for (; anIterSub.More(); anIterSub.Next()) {
|
|
||||||
Standard_Integer aSubWhatIndex = anIterSub.Value();
|
|
||||||
TDF_Label aSubWhatHistoryLabel =
|
|
||||||
anArgumentHistoryLabel.FindChild(aSubWhatIndex, Standard_False);
|
|
||||||
if (!aSubWhatHistoryLabel.IsNull()) {
|
|
||||||
Handle(TDataStd_IntegerArray) anIntegerArray;
|
|
||||||
if (aSubWhatHistoryLabel.FindAttribute(TDataStd_IntegerArray::GetID(), anIntegerArray)) {
|
|
||||||
for (Standard_Integer isub = 1; isub <= anIntegerArray->Length(); isub++) {
|
|
||||||
aModifiedList.Append(anIntegerArray->Value(isub));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (aModifiedList.Extent() > 0) {
|
|
||||||
Handle(TColStd_HArray1OfInteger) aModifiedArraySub =
|
|
||||||
new TColStd_HArray1OfInteger (1, aModifiedList.Extent());
|
|
||||||
TColStd_ListIteratorOfListOfInteger anIterModif (aModifiedList);
|
|
||||||
for (Standard_Integer imod = 1; anIterModif.More(); anIterModif.Next(), imod++) {
|
|
||||||
aModifiedArraySub->SetValue(imod, anIterModif.Value());
|
|
||||||
}
|
|
||||||
aModifiedArray = aModifiedArraySub;
|
|
||||||
} else {
|
|
||||||
// Removed entity
|
|
||||||
SetErrorCode(OK);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Removed entity
|
|
||||||
SetErrorCode(OK);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Handle(TDataStd_IntegerArray) anIntegerArray;
|
|
||||||
if (!aWhatHistoryLabel.FindAttribute(TDataStd_IntegerArray::GetID(), anIntegerArray)) {
|
|
||||||
SetErrorCode("Error: Empty modifications history for the sought shape.");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
aModifiedArray = anIntegerArray->Array();
|
|
||||||
if (aModifiedArray->Length() == 0) {
|
|
||||||
SetErrorCode("Error: Empty modifications history for the sought shape.");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isFound) {
|
|
||||||
// try compound element by element
|
|
||||||
if (aWhat.ShapeType() == TopAbs_COMPOUND ||
|
|
||||||
aWhat.ShapeType() == TopAbs_COMPSOLID) {
|
|
||||||
TColStd_ListOfInteger aModifiedList;
|
|
||||||
isFound = GetInPlaceOfCompound(aWhereFunction, aWhat, aModifiedList);
|
|
||||||
if (isFound) {
|
|
||||||
if (aModifiedList.Extent() < 1) {
|
|
||||||
SetErrorCode("Error: Empty modifications history for all sub-shapes of the sought shape.");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
aModifiedArray = new TColStd_HArray1OfInteger (1, aModifiedList.Extent());
|
|
||||||
TColStd_ListIteratorOfListOfInteger anIterModif (aModifiedList);
|
|
||||||
for (Standard_Integer imod = 1; anIterModif.More(); anIterModif.Next(), imod++) {
|
|
||||||
aModifiedArray->SetValue(imod, anIterModif.Value());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!isFound) {
|
|
||||||
SetErrorCode("The sought shape does not belong to any operation argument.");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//Add a new object
|
//Add a new object
|
||||||
@ -2466,8 +2394,10 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::GetInPlace
|
|||||||
aResult->SetType(GEOM_GROUP);
|
aResult->SetType(GEOM_GROUP);
|
||||||
|
|
||||||
//Set a sub shape type
|
//Set a sub shape type
|
||||||
|
TopoDS_Shape aFirstFound = aWhereIndices.FindKey(aModifiedArray->Value(1));
|
||||||
|
TopAbs_ShapeEnum aShapeType = aFirstFound.ShapeType();
|
||||||
|
|
||||||
TDF_Label aFreeLabel = aResult->GetFreeLabel();
|
TDF_Label aFreeLabel = aResult->GetFreeLabel();
|
||||||
TopAbs_ShapeEnum aShapeType = aWhat.ShapeType();
|
|
||||||
TDataStd_Integer::Set(aFreeLabel, (Standard_Integer)aShapeType);
|
TDataStd_Integer::Set(aFreeLabel, (Standard_Integer)aShapeType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user