0030926: Data Exchange - Change of the number of GDT points of a View may lead to...

diff --git a/src/XCAFDoc/XCAFDoc_View.cxx b/src/XCAFDoc/XCAFDoc_View.cxx
index fefff545176bf3c6296985f8bbc433ba2a8430fa..7c896d60138ba63b8f8e689f2788bd42b9262653 100644 (file)
--- a/src/XCAFDoc/XCAFDoc_View.cxx
+++ b/src/XCAFDoc/XCAFDoc_View.cxx
@@ -280,15 +280,30 @@ Handle(XCAFView_Object) XCAFDoc_View::GetObject()  const
   // GDT Points
   if (!Label().FindChild(ChildLab_GDTPoints, Standard_False).IsNull()) {
     TDF_Label aPointsLabel = Label().FindChild(ChildLab_GDTPoints);
-    anObj->CreateGDTPoints(aPointsLabel.NbChildren());
-    for (Standard_Integer i = 1; i <= aPointsLabel.NbChildren(); i++) {
-      gp_Pnt aPoint;
-      Handle(TDataXtd_Point) aGDTPointAttr;
-      aPointsLabel.FindChild(i).FindAttribute(TDataXtd_Point::GetID(), aGDTPointAttr);
-      TDataXtd_Geometry::Point(aGDTPointAttr->Label(), aPoint);
-      anObj->SetGDTPoint(i, aPoint);
+
+    // Find out the number of stored GDT-points in Ocaf tree.
+    Standard_Integer nbGDTPoints(0);
+    Handle(TDataXtd_Point) aGDTPointAttr;
+    TDF_ChildIterator itrpnts(aPointsLabel, Standard_False);
+    for (; itrpnts.More(); itrpnts.Next()) {
+      if (itrpnts.Value().FindAttribute(TDataXtd_Point::GetID(), aGDTPointAttr))
+        nbGDTPoints++;
+    }
+
+    // Allocate the GDT-points and fill them in from Ocaf tree.
+    if (nbGDTPoints) {
+      anObj->CreateGDTPoints(nbGDTPoints);
+      const Standard_Integer nbChildren = aPointsLabel.NbChildren();
+      for (Standard_Integer i = 1, j = 1; i <= nbChildren; i++) {
+        gp_Pnt aPoint;
+        if (aPointsLabel.FindChild(i).FindAttribute(TDataXtd_Point::GetID(), aGDTPointAttr)) {
+          TDataXtd_Geometry::Point(aGDTPointAttr->Label(), aPoint);
+          anObj->SetGDTPoint(j++, aPoint);
+        }
+      }
     }
   }
+
   //Image
   Handle(TDataStd_ByteArray) anArr;
   if (Label().FindChild(ChildLab_Image).FindAttribute(TDataStd_ByteArray::GetID(), anArr)) {
@@ -298,26 +313,50 @@ Handle(XCAFView_Object) XCAFDoc_View::GetObject()  const
   // Shapes transparency
   if (!Label().FindChild(ChildLab_EnabledShapes, Standard_False).IsNull()) {
     TDF_Label aShapesTranspLabel = Label().FindChild(ChildLab_EnabledShapes);
-    anObj->CreateEnabledShapes(aShapesTranspLabel.NbChildren());
-    for (Standard_Integer i = 1; i <= aShapesTranspLabel.NbChildren(); i++) {
+
+    // Find out the number of stored shape-transparencies in Ocaf tree.
+    Standard_Integer nbShapeTransparencies(0);
+    Handle(TDataStd_Integer) aTranspAttr;
+    TDF_ChildIterator itrtrans(aShapesTranspLabel, Standard_False);
+    for (; itrtrans.More(); itrtrans.Next()) {
+      if (itrtrans.Value().FindAttribute(TDataStd_Integer::GetID(), aTranspAttr))
+        nbShapeTransparencies++;
+    }
+
+    // Allocate the shape-transparencies and fill them in from Ocaf tree.
+    const Standard_Integer nbChildren = aShapesTranspLabel.NbChildren();
+    anObj->CreateEnabledShapes(nbChildren);
+    for (Standard_Integer i = 1, j = 1; i <= nbChildren; i++) {
       gp_Pnt aPoint;
-      Handle(TDataStd_Integer) aTranspAttr;
-      aShapesTranspLabel.FindChild(i).FindAttribute(TDataStd_Integer::GetID(), aTranspAttr);
-      Standard_Boolean aValue = (aTranspAttr->Get() == 1);
-      anObj->SetEnabledShape(i, aValue);
+      if (aShapesTranspLabel.FindChild(i).FindAttribute(TDataStd_Integer::GetID(), aTranspAttr)) {
+        Standard_Boolean aValue = (aTranspAttr->Get() == 1);
+        anObj->SetEnabledShape(j++, aValue);
+      }
     }
   }
 
   // Note Points
   if (!Label().FindChild(ChildLab_NotePoints, Standard_False).IsNull()) {
     TDF_Label aPointsLabel = Label().FindChild(ChildLab_NotePoints);
-    anObj->CreateNotePoints(aPointsLabel.NbChildren());
-    for (Standard_Integer i = 1; i <= aPointsLabel.NbChildren(); i++) {
+
+    // Find out the number of stored note-points in Ocaf tree.
+    Standard_Integer nbNotePoints(0);
+    Handle(TDataXtd_Point) aPointAttr;
+    TDF_ChildIterator itrpnts(aPointsLabel, Standard_False);
+    for (; itrpnts.More(); itrpnts.Next()) {
+      if (itrpnts.Value().FindAttribute(TDataXtd_Point::GetID(), aPointAttr))
+        nbNotePoints++;
+    }
+
+    // Allocate the note-points and fill them in from Ocaf tree.
+    const Standard_Integer nbChildren = aPointsLabel.NbChildren();
+    anObj->CreateNotePoints(nbChildren);
+    for (Standard_Integer i = 1, j = 1; i <= nbChildren; i++) {
       gp_Pnt aPoint;
-      Handle(TDataXtd_Point) aPointAttr;
-      aPointsLabel.FindChild(i).FindAttribute(TDataXtd_Point::GetID(), aPointAttr);
-      TDataXtd_Geometry::Point(aPointAttr->Label(), aPoint);
-      anObj->SetNotePoint(i, aPoint);
+      if (aPointsLabel.FindChild(i).FindAttribute(TDataXtd_Point::GetID(), aPointAttr)) {
+        TDataXtd_Geometry::Point(aPointAttr->Label(), aPoint);
+        anObj->SetNotePoint(j++, aPoint);
+      }
     }
   }
   return anObj;