0027241: Create a complete test case to verify reading of all attribute types from...

[occt.git] / src / ShapePersistent / ShapePersistent_BRep.hxx

diff --git a/src/ShapePersistent/ShapePersistent_BRep.hxx b/src/ShapePersistent/ShapePersistent_BRep.hxx
index 6a660ac..3ef0f6d 100644 (file)
--- a/src/ShapePersistent/ShapePersistent_BRep.hxx
+++ b/src/ShapePersistent/ShapePersistent_BRep.hxx
@@ -20,14 +20,13 @@
 #include <ShapePersistent_Geom2d.hxx>
 #include <ShapePersistent_Poly.hxx>
 #include <StdObject_Location.hxx>
-#include <StdObject_gp.hxx>
+#include <StdObject_gp_Vectors.hxx>
 
 #include <BRep_ListOfPointRepresentation.hxx>
 #include <BRep_ListOfCurveRepresentation.hxx>
 
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
-#include <GeomAbs_Shape.hxx>
 
 class BRep_PointRepresentation;
 class BRep_CurveRepresentation;
@@ -50,11 +49,11 @@ public:
     virtual Handle(BRep_PointRepresentation) import() const;
 
   protected:
-    Object <StdObject_Location> myLocation;
-    Value  <Standard_Real>      myParameter;
+    StdObject_Location myLocation;
+    Standard_Real      myParameter;
 
   private:
-    Reference<PointRepresentation> myNext;
+    Handle(PointRepresentation) myNext;
   };
 
   class PointOnCurve : public PointRepresentation
@@ -64,7 +63,7 @@ public:
     virtual Handle(BRep_PointRepresentation) import() const;
 
   private:
-    Reference<ShapePersistent_Geom::Curve> myCurve;
+    Handle(ShapePersistent_Geom::Curve) myCurve;
   };
 
   class PointsOnSurface : public PointRepresentation
@@ -73,7 +72,7 @@ public:
     virtual void Read (StdObjMgt_ReadData& theReadData);
 
   protected:
-    Reference<ShapePersistent_Geom::Surface> mySurface;
+    Handle(ShapePersistent_Geom::Surface) mySurface;
   };
 
   class PointOnCurveOnSurface : public PointsOnSurface
@@ -83,7 +82,7 @@ public:
     virtual Handle(BRep_PointRepresentation) import() const;
 
   private:
-    Reference<ShapePersistent_Geom2d::Curve> myPCurve;
+    Handle(ShapePersistent_Geom2d::Curve) myPCurve;
   };
 
   class PointOnSurface : public PointsOnSurface
@@ -93,7 +92,7 @@ public:
     virtual Handle(BRep_PointRepresentation) import() const;
 
   private:
-    Value<Standard_Real> myParameter2;
+    Standard_Real myParameter2;
   };
 
   class CurveRepresentation : public StdObjMgt_Persistent
@@ -110,10 +109,10 @@ public:
     virtual Handle(BRep_CurveRepresentation) import() const;
 
   protected:
-    Object<StdObject_Location> myLocation;
+    StdObject_Location myLocation;
 
   private:
-    Reference<CurveRepresentation> myNext;
+    Handle(CurveRepresentation) myNext;
   };
 
   class GCurve : public CurveRepresentation
@@ -122,8 +121,8 @@ public:
     virtual void Read (StdObjMgt_ReadData& theReadData);
 
   protected:
-    Value<Standard_Real> myFirst;
-    Value<Standard_Real> myLast;
+    Standard_Real myFirst;
+    Standard_Real myLast;
   };
 
   class Curve3D : public GCurve
@@ -133,7 +132,7 @@ public:
     virtual Handle(BRep_CurveRepresentation) import() const;
 
   private:
-    Reference<ShapePersistent_Geom::Curve> myCurve3D;
+    Handle(ShapePersistent_Geom::Curve) myCurve3D;
   };
 
   class CurveOnSurface : public GCurve
@@ -143,10 +142,10 @@ public:
     virtual Handle(BRep_CurveRepresentation) import() const;
 
   protected:
-    Reference<ShapePersistent_Geom2d::Curve> myPCurve;
-    Reference<ShapePersistent_Geom::Surface> mySurface;
-    StdObject_gp::Object<gp_Pnt2d>           myUV1;
-    StdObject_gp::Object<gp_Pnt2d>           myUV2;
+    Handle(ShapePersistent_Geom2d::Curve) myPCurve;
+    Handle(ShapePersistent_Geom::Surface) mySurface;
+    gp_Pnt2d                              myUV1;
+    gp_Pnt2d                              myUV2;
   };
 
   class CurveOnClosedSurface : public CurveOnSurface
@@ -156,10 +155,10 @@ public:
     virtual Handle(BRep_CurveRepresentation) import() const;
 
   private:
-    Reference<ShapePersistent_Geom2d::Curve> myPCurve2;
-    Enum<GeomAbs_Shape>                      myContinuity;
-    StdObject_gp::Object<gp_Pnt2d>           myUV21;
-    StdObject_gp::Object<gp_Pnt2d>           myUV22;
+    Handle(ShapePersistent_Geom2d::Curve) myPCurve2;
+    Standard_Integer                      myContinuity;
+    gp_Pnt2d                              myUV21;
+    gp_Pnt2d                              myUV22;
   };
 
   class Polygon3D : public CurveRepresentation
@@ -169,7 +168,7 @@ public:
     virtual Handle(BRep_CurveRepresentation) import() const;
 
   private:
-    Reference<ShapePersistent_Poly::Polygon3D> myPolygon3D;
+    Handle(ShapePersistent_Poly::Polygon3D) myPolygon3D;
   };
 
   class PolygonOnTriangulation : public CurveRepresentation
@@ -179,8 +178,8 @@ public:
     virtual Handle(BRep_CurveRepresentation) import() const;
 
   protected:
-    Reference<ShapePersistent_Poly::PolygonOnTriangulation> myPolygon;
-    Reference<ShapePersistent_Poly::Triangulation>          myTriangulation;
+    Handle(ShapePersistent_Poly::PolygonOnTriangulation) myPolygon;
+    Handle(ShapePersistent_Poly::Triangulation)          myTriangulation;
   };
 
   class PolygonOnClosedTriangulation : public PolygonOnTriangulation
@@ -190,7 +189,7 @@ public:
     virtual Handle(BRep_CurveRepresentation) import() const;
 
   private:
-    Reference<ShapePersistent_Poly::PolygonOnTriangulation> myPolygon2;
+    Handle(ShapePersistent_Poly::PolygonOnTriangulation) myPolygon2;
   };
 
   class PolygonOnSurface : public CurveRepresentation
@@ -200,8 +199,8 @@ public:
     virtual Handle(BRep_CurveRepresentation) import() const;
 
   protected:
-    Reference<ShapePersistent_Poly::Polygon2D> myPolygon2D;
-    Reference<ShapePersistent_Geom::Surface>   mySurface;
+    Handle(ShapePersistent_Poly::Polygon2D) myPolygon2D;
+    Handle(ShapePersistent_Geom::Surface)   mySurface;
   };
 
   class PolygonOnClosedSurface : public PolygonOnSurface
@@ -211,7 +210,7 @@ public:
     virtual Handle(BRep_CurveRepresentation) import() const;
 
   private:
-    Reference<ShapePersistent_Poly::Polygon2D> myPolygon2;
+    Handle(ShapePersistent_Poly::Polygon2D) myPolygon2;
   };
 
   class CurveOn2Surfaces : public CurveRepresentation
@@ -221,10 +220,10 @@ public:
     virtual Handle(BRep_CurveRepresentation) import() const;
 
   private:
-    Reference <ShapePersistent_Geom::Surface> mySurface;
-    Reference <ShapePersistent_Geom::Surface> mySurface2;
-    Object    <StdObject_Location>            myLocation2;
-    Enum      <GeomAbs_Shape>                 myContinuity;
+    Handle(ShapePersistent_Geom::Surface) mySurface;
+    Handle(ShapePersistent_Geom::Surface) mySurface2;
+    StdObject_Location                    myLocation2;
+    Standard_Integer                      myContinuity;
   };
 
 private:
@@ -241,9 +240,9 @@ private:
     virtual Handle(TopoDS_TShape) createTShape() const;
 
   private:
-    Value<Standard_Real>           myTolerance;
-    StdObject_gp::Object<gp_Pnt>   myPnt;
-    Reference<PointRepresentation> myPoints;
+    Standard_Real               myTolerance;
+    gp_Pnt                      myPnt;
+    Handle(PointRepresentation) myPoints;
   };
 
   class pTEdge : public pTBase
@@ -259,9 +258,9 @@ private:
     virtual Handle(TopoDS_TShape) createTShape() const;
 
   private:
-    Value     <Standard_Real>       myTolerance;
-    Value     <Standard_Integer>    myFlags;
-    Reference <CurveRepresentation> myCurves;
+    Standard_Real               myTolerance;
+    Standard_Integer            myFlags;
+    Handle(CurveRepresentation) myCurves;
   };
 
   class pTFace : public pTBase
@@ -278,11 +277,11 @@ private:
     virtual Handle(TopoDS_TShape) createTShape() const;
 
   private:
-    Reference <ShapePersistent_Geom::Surface>       mySurface;
-    Reference <ShapePersistent_Poly::Triangulation> myTriangulation;
-    Object    <StdObject_Location>                  myLocation;
-    Value     <Standard_Real>                       myTolerance;
-    Value     <Standard_Boolean>                    myNaturalRestriction;
+    Handle(ShapePersistent_Geom::Surface)       mySurface;
+    Handle(ShapePersistent_Poly::Triangulation) myTriangulation;
+    StdObject_Location                          myLocation;
+    Standard_Real                               myTolerance;
+    Standard_Boolean                            myNaturalRestriction;
   };
 
 public: