From: mnt <mnt@opencascade.com>
Date: Wed, 2 Mar 2016 08:42:36 +0000 (+0300)
Subject: OCCT 7.0.0 porting
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c5f4b97cbdbce6380fcd929bebee9900a7917eca;p=modules%2Fgeom.git

OCCT 7.0.0 porting
---

diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx
index 85af93cb2..30b486e5d 100644
--- a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx
@@ -112,7 +112,7 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(LOGBOOK& log) const
       if (aType == CIRC_ARC_THREE_PNT)
       {
         GC_MakeArcOfCircle arc (aP1, aP2, aP3);
-        aShape = BRepBuilderAPI_MakeEdge(arc).Edge();
+        aShape = BRepBuilderAPI_MakeEdge(arc.Value()).Edge();
       } else if ( aType == CIRC_ARC_CENTER ) { // CIRC_ARC_CENTER
         Standard_Boolean sense = aCI.GetSense();
 
@@ -128,7 +128,7 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(LOGBOOK& log) const
         Handle(Geom_Circle) aGeomCirc = circ.Value();
 
         GC_MakeArcOfCircle arc (aGeomCirc->Circ(), aP2, aP3, Standard_True);
-        aShape = BRepBuilderAPI_MakeEdge(arc).Edge();
+        aShape = BRepBuilderAPI_MakeEdge(arc.Value()).Edge();
       } else if ( aType == ELLIPSE_ARC_CENTER_TWO_PNT ) { // ELLIPSE_ARC_CENTER_TWO_PNT
         if ( aP1.Distance(aP2) <= aP1.Distance(aP3) ) {
           // Standard_ConstructionError::Raise("Arc creation aborted: the distance from Center Point to Point 1 needs to be bigger than the distance from Center Point to Point 2");      
@@ -146,7 +146,7 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(LOGBOOK& log) const
 //         double alpha = fabs(aV1.Angle(aV2));
         
         GC_MakeArcOfEllipse arc (aGeomEllipse->Elips(), aP2, aP3, Standard_True);
-        aShape = BRepBuilderAPI_MakeEdge(arc).Edge();
+        aShape = BRepBuilderAPI_MakeEdge(arc.Value()).Edge();
       }
     }
   }
diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx
index 8c303cd0e..f3a75a4b2 100644
--- a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx
@@ -127,7 +127,8 @@ Standard_Integer GEOMImpl_PlaneDriver::Execute(LOGBOOK& log) const
     if (gp_Vec(aP1, aP2).IsParallel(gp_Vec(aP1, aP3), Precision::Angular()))
       Standard_ConstructionError::Raise("Plane creation aborted: points lay on one line");
     GC_MakePlane aMakePlane (aP1, aP2, aP3);
-    aShape = BRepBuilderAPI_MakeFace(aMakePlane, -aSize, +aSize, -aSize, +aSize,
+    aShape = BRepBuilderAPI_MakeFace(aMakePlane.Value(),
+                                     -aSize, +aSize, -aSize, +aSize,
                                      Precision::Confusion()).Shape();
   } else if (aType == PLANE_FACE) {
     Handle(GEOM_Function) aRef = aPI.GetFace();