0025112: Undo of modification of the attribute TDataStd_IntPackedMap works wrong

[occt.git] / src / TDataStd / TDataStd_DeltaOnModificationOfIntPackedMap.cxx

diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx b/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 878b2cd..5bff5f7
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx
@@ -1,22 +1,17 @@
 // Created on: 2008-01-23
 // Created by: Sergey ZARITCHNY
-// Copyright (c) 2008-2012 OPEN CASCADE SAS
+// Copyright (c) 2008-2014 OPEN CASCADE SAS
 //
-// The content of this file is subject to the Open CASCADE Technology Public
-// License Version 6.5 (the "License"). You may not use the content of this file
-// except in compliance with the License. Please obtain a copy of the License
-// at http://www.opencascade.org and read it completely before using this file.
+// This file is part of Open CASCADE Technology software library.
 //
-// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
-// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
 //
-// The Original Code and all software distributed under the License is
-// distributed on an "AS IS" basis, without warranty of any kind, and the
-// Initial Developer hereby disclaims all such warranties, including without
-// limitation, any warranties of merchantability, fitness for a particular
-// purpose or non-infringement. Please see the License for the specific terms
-// and conditions governing the rights and limitations under the License.
-
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
 
 #include <TDataStd_DeltaOnModificationOfIntPackedMap.ixx>
 #include <TDF_DeltaOnModification.hxx>
@@ -39,42 +34,38 @@ TDataStd_DeltaOnModificationOfIntPackedMap::TDataStd_DeltaOnModificationOfIntPac
 : TDF_DeltaOnModification(OldAtt)
 {
   Handle(TDataStd_IntPackedMap) CurrAtt;
-  if (Label().FindAttribute(OldAtt->ID(),CurrAtt)) {
-    {
-      Handle(TColStd_HPackedMapOfInteger) aMap1, aMap2;
-      aMap1 = OldAtt->GetHMap();
-      aMap2 = CurrAtt->GetHMap();
-#ifdef DEB
-      if(aMap1.IsNull())
-       cout <<"DeltaOnModificationOfIntPackedMap:: Old Map is Null" <<endl;
-      if(aMap2.IsNull())
-       cout <<"DeltaOnModificationOfIntPackedMap:: Current Map is Null" <<endl;
+  if (Label().FindAttribute(OldAtt->ID(), CurrAtt))
+  {
+    Handle(TColStd_HPackedMapOfInteger) aMap1, aMap2;
+    aMap1 = OldAtt->GetHMap();
+    aMap2 = CurrAtt->GetHMap();
+#ifdef DEB_disable
+    if (aMap1.IsNull())
+      cout <<"DeltaOnModificationOfIntPackedMap:: Old Map is Null" <<endl;
+    if (aMap2.IsNull())
+      cout <<"DeltaOnModificationOfIntPackedMap:: Current Map is Null" <<endl;
 #endif
       
-      if(aMap1.IsNull() || aMap2.IsNull()) return;
-      if(aMap1 != aMap2) {
-       if(!aMap1->Map().HasIntersection(aMap2->Map()))
-         return; // no intersection: use full-scale backup
-
-       if(aMap1->Map().IsSubset(aMap2->Map())) { 
-         myDeletion = new TColStd_HPackedMapOfInteger();
-         myDeletion->ChangeMap().Subtraction(aMap2->Map(), aMap1->Map());
-       } else if(aMap2->Map().IsSubset(aMap1->Map())) { 
-         myAddition = new TColStd_HPackedMapOfInteger();
-         myAddition->ChangeMap().Subtraction(aMap1->Map(), aMap2->Map());
-       } else {
-         myAddition = new TColStd_HPackedMapOfInteger();
-         myAddition->ChangeMap().Subtraction(aMap1->Map(), aMap2->Map());
-         myDeletion = new TColStd_HPackedMapOfInteger();
-         myDeletion->ChangeMap().Subtraction(aMap2->Map(), aMap1->Map());
-       }
+    if (aMap1.IsNull() || aMap2.IsNull()) return;
+    if (aMap1 != aMap2) {
+      const TColStd_PackedMapOfInteger& map1 = aMap1->Map();
+      const TColStd_PackedMapOfInteger& map2 = aMap2->Map();
+      if (map1.IsSubset(map2)) {
+        myDeletion = new TColStd_HPackedMapOfInteger();
+        myDeletion->ChangeMap().Subtraction(map2, map1);
+      } else if (map2.IsSubset(map1)) { 
+        myAddition = new TColStd_HPackedMapOfInteger();
+        myAddition->ChangeMap().Subtraction(map1, map2);
+      } else if (map1.HasIntersection(map2)) {
+        myAddition = new TColStd_HPackedMapOfInteger();
+        myAddition->ChangeMap().Subtraction(map1, map2);
+        myDeletion = new TColStd_HPackedMapOfInteger();
+        myDeletion->ChangeMap().Subtraction(map2, map1);
+      } 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
   }
 }
 
@@ -114,23 +105,21 @@ void TDataStd_DeltaOnModificationOfIntPackedMap::Apply()
   
   
   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;
-  else {
-    if(!myDeletion.IsNull()) {
-  
-      if(myDeletion->Map().Extent())
-       IntMap->ChangeMap().Subtract(myDeletion->Map());
-    } 
-    if(!myAddition.IsNull()) {
-      if(myAddition->Map().Extent())
-       IntMap->ChangeMap().Unite(myAddition->Map());
-    }
+
+  if (!myDeletion.IsNull()) {
+    if (myDeletion->Map().Extent())
+      IntMap->ChangeMap().Subtract(myDeletion->Map());
+  }
+  if (!myAddition.IsNull()) {
+    if (myAddition->Map().Extent())
+      IntMap->ChangeMap().Unite(myAddition->Map());
   }
   
-#ifdef DEB    
+#ifdef DEB_disable
   cout << " << Map Dump after Delta Apply >>" <<endl;
   Handle(TColStd_HPackedMapOfInteger) aIntMap = aCurAtt->GetHMap();
   TColStd_MapIteratorOfPackedMapOfInteger it(aIntMap->Map());
@@ -139,5 +128,3 @@ void TDataStd_DeltaOnModificationOfIntPackedMap::Apply()
   cout <<endl;
 #endif
 }
-
-