OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0025112: Undo of modification of the attribute TDataStd_IntPackedMap works wrong

Browse Source 
Test case for issue #25112
This commit is contained in:
msv 2014-08-07 14:21:52 +04:00 committed by apv
parent 5402ccdda6
commit 6d1dc3e82c
3 changed files with 68 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/TColStd/TColStd_PackedMapOfInteger.cxx
View File

@ -1215,6 +1215,8 @@ Standard_Boolean TColStd_PackedMapOfInteger::IsSubset (const TColStd_PackedMapOf
// Find the corresponding block in the 2nd map // Find the corresponding block in the 2nd map
const TColStd_intMapNode * p2 = const TColStd_intMapNode * p2 =
aData2 [HashCode (aKeyInt, nBuckets2)]; aData2 [HashCode (aKeyInt, nBuckets2)];
if (!p2)
return Standard_False;
while (p2) { while (p2) {
if ( p2->IsEqual(aKeyInt) ) { if ( p2->IsEqual(aKeyInt) ) {
if ( p1->Data() & ~p2->Data() ) // at least one bit set in p1 is not set in p2 if ( p1->Data() & ~p2->Data() ) // at least one bit set in p1 is not set in p2

84
src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx
View File

@ -34,42 +34,38 @@ TDataStd_DeltaOnModificationOfIntPackedMap::TDataStd_DeltaOnModificationOfIntPac
: TDF_DeltaOnModification(OldAtt) : TDF_DeltaOnModification(OldAtt)
{ {
Handle(TDataStd_IntPackedMap) CurrAtt; Handle(TDataStd_IntPackedMap) CurrAtt;
if (Label().FindAttribute(OldAtt->ID(),CurrAtt)) { if (Label().FindAttribute(OldAtt->ID(), CurrAtt))
{ {
Handle(TColStd_HPackedMapOfInteger) aMap1, aMap2; Handle(TColStd_HPackedMapOfInteger) aMap1, aMap2;
aMap1 = OldAtt->GetHMap(); aMap1 = OldAtt->GetHMap();
aMap2 = CurrAtt->GetHMap(); aMap2 = CurrAtt->GetHMap();
#ifdef DEB #ifdef DEB_disable
if(aMap1.IsNull()) if (aMap1.IsNull())
cout <<"DeltaOnModificationOfIntPackedMap:: Old Map is Null" <<endl; cout <<"DeltaOnModificationOfIntPackedMap:: Old Map is Null" <<endl;
if(aMap2.IsNull()) if (aMap2.IsNull())
cout <<"DeltaOnModificationOfIntPackedMap:: Current Map is Null" <<endl; cout <<"DeltaOnModificationOfIntPackedMap:: Current Map is Null" <<endl;
#endif #endif
if(aMap1.IsNull() || aMap2.IsNull()) return; if (aMap1.IsNull() || aMap2.IsNull()) return;
if(aMap1 != aMap2) { if (aMap1 != aMap2) {
if(!aMap1->Map().HasIntersection(aMap2->Map())) const TColStd_PackedMapOfInteger& map1 = aMap1->Map();
return; // no intersection: use full-scale backup const TColStd_PackedMapOfInteger& map2 = aMap2->Map();
if (map1.IsSubset(map2)) {
if(aMap1->Map().IsSubset(aMap2->Map())) { myDeletion = new TColStd_HPackedMapOfInteger();
myDeletion = new TColStd_HPackedMapOfInteger(); myDeletion->ChangeMap().Subtraction(map2, map1);
myDeletion->ChangeMap().Subtraction(aMap2->Map(), aMap1->Map()); } else if (map2.IsSubset(map1)) {
} else if(aMap2->Map().IsSubset(aMap1->Map())) { myAddition = new TColStd_HPackedMapOfInteger();
myAddition = new TColStd_HPackedMapOfInteger(); myAddition->ChangeMap().Subtraction(map1, map2);
myAddition->ChangeMap().Subtraction(aMap1->Map(), aMap2->Map()); } else if (map1.HasIntersection(map2)) {
} else { myAddition = new TColStd_HPackedMapOfInteger();
myAddition = new TColStd_HPackedMapOfInteger(); myAddition->ChangeMap().Subtraction(map1, map2);
myAddition->ChangeMap().Subtraction(aMap1->Map(), aMap2->Map()); myDeletion = new TColStd_HPackedMapOfInteger();
myDeletion = new TColStd_HPackedMapOfInteger(); myDeletion->ChangeMap().Subtraction(map2, map1);
myDeletion->ChangeMap().Subtraction(aMap2->Map(), aMap1->Map()); } else {
} myAddition = new TColStd_HPackedMapOfInteger(map1);
myDeletion = new TColStd_HPackedMapOfInteger(map2);
} }
} }
OldAtt->RemoveMap();
#ifdef DEB
if(OldAtt->GetHMap().IsNull())
cout << "BackUp Arr is Nullified" << endl;
#endif
} }
} }
@ -109,23 +105,21 @@ void TDataStd_DeltaOnModificationOfIntPackedMap::Apply()
Handle(TColStd_HPackedMapOfInteger) IntMap = aCurAtt->GetHMap(); Handle(TColStd_HPackedMapOfInteger) IntMap = aCurAtt->GetHMap();
if(IntMap.IsNull()) return; if (IntMap.IsNull()) return;
if(myDeletion.IsNull() && myAddition.IsNull()) if (myDeletion.IsNull() && myAddition.IsNull())
return; return;
else {
if(!myDeletion.IsNull()) {
if(myDeletion->Map().Extent()) if (!myDeletion.IsNull()) {
IntMap->ChangeMap().Subtract(myDeletion->Map()); if (myDeletion->Map().Extent())
} IntMap->ChangeMap().Subtract(myDeletion->Map());
if(!myAddition.IsNull()) { }
if(myAddition->Map().Extent()) if (!myAddition.IsNull()) {
IntMap->ChangeMap().Unite(myAddition->Map()); if (myAddition->Map().Extent())
} IntMap->ChangeMap().Unite(myAddition->Map());
} }
#ifdef DEB #ifdef DEB_disable
cout << " << Map Dump after Delta Apply >>" <<endl; cout << " << Map Dump after Delta Apply >>" <<endl;
Handle(TColStd_HPackedMapOfInteger) aIntMap = aCurAtt->GetHMap(); Handle(TColStd_HPackedMapOfInteger) aIntMap = aCurAtt->GetHMap();
TColStd_MapIteratorOfPackedMapOfInteger it(aIntMap->Map()); TColStd_MapIteratorOfPackedMapOfInteger it(aIntMap->Map());
@ -134,5 +128,3 @@ void TDataStd_DeltaOnModificationOfIntPackedMap::Apply()
cout <<endl; cout <<endl;
#endif #endif
} }

27
tests/bugs/caf/bug25112 Normal file
View File

@ -0,0 +1,27 @@
puts "==========="
puts "OCC25112"
puts "==========="
puts ""
###########################################################################
# Undo of modification of the attribute TDataStd_IntPackedMap works wrong
###########################################################################
NewDocument D
UndoLimit D 10
SetIntPackedMap D 0:1 1 319
puts "initial: [GetIntPackedMap D 0:1]"
OpenCommand D
ChangeIntPackedMap_Add D 0:1 344
ChangeIntPackedMap_Rem D 0:1 319
CommitCommand D
puts "after changes: [GetIntPackedMap D 0:1]"
Undo D
set map [GetIntPackedMap D 0:1]
puts "after undo: $map"
if {$map != "319"} {
puts "ERROR: OCC25112 is reproduced. Expected map content is 319"
}