Renaming the direct API high level.

diff --git a/src/GeomAlgoAPI/CMakeLists.txt b/src/GeomAlgoAPI/CMakeLists.txt
index ee42e2a906aef1da311a173475944453dd51c973..bb0ce3fe485bb768a3a989537ec6824a7fca197f 100644 (file)
--- a/src/GeomAlgoAPI/CMakeLists.txt
+++ b/src/GeomAlgoAPI/CMakeLists.txt
@@ -39,7 +39,7 @@ SET(PROJECT_HEADERS
     GeomAlgoAPI_WireBuilder.h
     GeomAlgoAPI_Sewing.h
     GeomAlgoAPI_ShapeBuilder.h
-    GeomAlgoAPI_DirectAPI.h
+    GeomAlgoAPI_ShapeAPI.h
     GeomAlgoAPI_Exception.h
     GeomAlgoAPI_Box.h
     GeomAlgoAPI_BoxPoints.h
@@ -80,7 +80,7 @@ SET(PROJECT_SOURCES
     GeomAlgoAPI_WireBuilder.cpp
     GeomAlgoAPI_Sewing.cpp
     GeomAlgoAPI_ShapeBuilder.cpp
-    GeomAlgoAPI_DirectAPI.cpp
+    GeomAlgoAPI_ShapeAPI.cpp
     GeomAlgoAPI_Exception.cpp
     GeomAlgoAPI_Box.cpp
     GeomAlgoAPI_BoxPoints.cpp

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI.i b/src/GeomAlgoAPI/GeomAlgoAPI.i
index 9391a720c5d82a79fd04bb5c46ab98bca7572371..762d6b44f97f561078f1fb0f29efc92b65d58d0f 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI.i
+++ b/src/GeomAlgoAPI/GeomAlgoAPI.i
@@ -69,7 +69,7 @@
 %include "GeomAlgoAPI_Sewing.h"
 %include "GeomAlgoAPI_ShapeBuilder.h"
 %include "GeomAlgoAPI_Exception.h"
-%include "GeomAlgoAPI_DirectAPI.h"
+%include "GeomAlgoAPI_ShapeAPI.h"
 
 %typemap(out) std::list< std::shared_ptr< GeomAPI_Shape > >::value_type & {
   $result = SWIG_NewPointerObj(SWIG_as_voidptr(new std::shared_ptr<GeomAPI_Shape>(*$1)), $descriptor(std::shared_ptr<GeomAPI_Shape> *), SWIG_POINTER_OWN | 0 );

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_DirectAPI.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_DirectAPI.cpp
deleted file mode 100644 (file)
index f621478..0000000
--- a/src/GeomAlgoAPI/GeomAlgoAPI_DirectAPI.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (C) 2014-2016 CEA/DEN, EDF R&D
-
-// File:        GeomAlgoAPI_DirectAPI.cpp
-// Created:     17 Mar 2016
-// Author:      Clarisse Genrault (CEA)
-
-#include "GeomAlgoAPI_DirectAPI.h"
-#include <GeomAlgoAPI_Box.h>
-#include <GeomAlgoAPI_BoxPoints.h>
-
-#include <GeomAPI_Pnt.h>
-#include <GeomAPI_Edge.h>
-#include <GeomAlgoAPI_EdgeBuilder.h>
-
-#include <iostream>
-
-namespace GeomAlgoAPI_DirectAPI
-{
-  //=========================================================================================================
-  std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_DirectAPI::makeBox(const double theDx, const double theDy, 
-                                                                const double theDz) throw (GeomAlgoAPI_Exception)
-  {
-    GeomAlgoAPI_Box aBoxAlgo(theDx,theDy,theDz);
-    
-    if (!aBoxAlgo.check()) {
-      throw GeomAlgoAPI_Exception(aBoxAlgo.getError());
-    }
-    
-    aBoxAlgo.build();
-    
-    if(!aBoxAlgo.isDone()) {
-      throw GeomAlgoAPI_Exception(aBoxAlgo.getError());
-    }
-    if (!aBoxAlgo.checkValid("Box builder with dimensions")) {
-      throw GeomAlgoAPI_Exception(aBoxAlgo.getError());
-    }
-    return aBoxAlgo.shape();
-  }
-  
-  //=========================================================================================================
-  std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_DirectAPI::makeBox(std::shared_ptr<GeomAPI_Pnt> theFirstPoint,
-                                                                std::shared_ptr<GeomAPI_Pnt> theSecondPoint) throw (GeomAlgoAPI_Exception)
-  {
-    GeomAlgoAPI_BoxPoints aBoxAlgo(theFirstPoint, theSecondPoint);
-    
-    if (!aBoxAlgo.check()) {
-      throw GeomAlgoAPI_Exception(aBoxAlgo.getError());
-    }
-    
-    aBoxAlgo.build();
-    
-    if(!aBoxAlgo.isDone()) {
-      throw GeomAlgoAPI_Exception(aBoxAlgo.getError());
-    }
-    if (!aBoxAlgo.checkValid("Box builder with two points")) {
-      throw GeomAlgoAPI_Exception(aBoxAlgo.getError());
-    }
-    return aBoxAlgo.shape();
-  }
-}

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_DirectAPI.h b/src/GeomAlgoAPI/GeomAlgoAPI_DirectAPI.h
deleted file mode 100644 (file)
index ef804ed..0000000
--- a/src/GeomAlgoAPI/GeomAlgoAPI_DirectAPI.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (C) 2014-2016 CEA/DEN, EDF R&D
-
-// File:        GeomAlgoAPI_DirectAPI.h
-// Created:     17 Mar 2016
-// Author:      Clarisse Genrault (CEA)
-
-#ifndef GEOMALGOAPI_DIRECTAPI_H
-#define GEOMALGOAPI_DIRECTAPI_H
-
-#include <GeomAPI_Shape.h>
-#include <GeomAPI_Pnt.h>
-#include <GeomAPI_Edge.h>
-
-#include <GeomAlgoAPI_Exception.h>
-
-namespace GeomAlgoAPI_DirectAPI
-{
-/**\class GeomAlgoAPI_DirectAPI
- * \ingroup DataAlgo
- * \brief Allows to access the direct API
- */
-class GEOMALGOAPI_EXPORT GeomAlgoAPI_DirectAPI
-{
-public:
-  /// Creates a box using the dimensions.
-  /// \param theDx The dimension on X
-  /// \param theDy The dimension on Y
-  /// \param theDz The dimension on Z
-  /// \return a shape
-  static std::shared_ptr<GeomAPI_Shape> makeBox(const double theDx, const double theDy, const double theDz) throw (GeomAlgoAPI_Exception);
-  
-  /// Creates a box using the two points that defined a diagonal.
-  /// \param theFirstPoint One extermity of the diagonal
-  /// \param theSecondPoint The other extremity of the diagonal
-  /// \return a shape
-  static std::shared_ptr<GeomAPI_Shape> makeBox(std::shared_ptr<GeomAPI_Pnt> theFirstPoint,
-                                                std::shared_ptr<GeomAPI_Pnt> theSecondPoint) throw (GeomAlgoAPI_Exception);
-};
-}
-#endif

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp
new file mode 100644 (file)
index 0000000..6945ee3
--- /dev/null
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp
@@ -0,0 +1,60 @@
+// Copyright (C) 2014-2016 CEA/DEN, EDF R&D
+
+// File:        GeomAlgoAPI_ShapeAPI.cpp
+// Created:     17 Mar 2016
+// Author:      Clarisse Genrault (CEA)
+
+#include "GeomAlgoAPI_ShapeAPI.h"
+#include <GeomAlgoAPI_Box.h>
+#include <GeomAlgoAPI_BoxPoints.h>
+
+#include <GeomAPI_Pnt.h>
+#include <GeomAPI_Edge.h>
+#include <GeomAlgoAPI_EdgeBuilder.h>
+
+#include <iostream>
+
+namespace GeomAlgoAPI_ShapeAPI
+{
+  //=========================================================================================================
+  std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeBox(const double theDx, const double theDy, 
+                                                                const double theDz) throw (GeomAlgoAPI_Exception)
+  {
+    GeomAlgoAPI_Box aBoxAlgo(theDx,theDy,theDz);
+    
+    if (!aBoxAlgo.check()) {
+      throw GeomAlgoAPI_Exception(aBoxAlgo.getError());
+    }
+    
+    aBoxAlgo.build();
+    
+    if(!aBoxAlgo.isDone()) {
+      throw GeomAlgoAPI_Exception(aBoxAlgo.getError());
+    }
+    if (!aBoxAlgo.checkValid("Box builder with dimensions")) {
+      throw GeomAlgoAPI_Exception(aBoxAlgo.getError());
+    }
+    return aBoxAlgo.shape();
+  }
+  
+  //=========================================================================================================
+  std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeBox(std::shared_ptr<GeomAPI_Pnt> theFirstPoint,
+                                                                std::shared_ptr<GeomAPI_Pnt> theSecondPoint) throw (GeomAlgoAPI_Exception)
+  {
+    GeomAlgoAPI_BoxPoints aBoxAlgo(theFirstPoint, theSecondPoint);
+    
+    if (!aBoxAlgo.check()) {
+      throw GeomAlgoAPI_Exception(aBoxAlgo.getError());
+    }
+    
+    aBoxAlgo.build();
+    
+    if(!aBoxAlgo.isDone()) {
+      throw GeomAlgoAPI_Exception(aBoxAlgo.getError());
+    }
+    if (!aBoxAlgo.checkValid("Box builder with two points")) {
+      throw GeomAlgoAPI_Exception(aBoxAlgo.getError());
+    }
+    return aBoxAlgo.shape();
+  }
+}

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.h b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.h
new file mode 100644 (file)
index 0000000..4f626e5
--- /dev/null
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.h
@@ -0,0 +1,40 @@
+// Copyright (C) 2014-2016 CEA/DEN, EDF R&D
+
+// File:        GeomAlgoAPI_ShapeAPI.h
+// Created:     17 Mar 2016
+// Author:      Clarisse Genrault (CEA)
+
+#ifndef GEOMALGOAPI_DIRECTAPI_H
+#define GEOMALGOAPI_DIRECTAPI_H
+
+#include <GeomAPI_Shape.h>
+#include <GeomAPI_Pnt.h>
+#include <GeomAPI_Edge.h>
+
+#include <GeomAlgoAPI_Exception.h>
+
+namespace GeomAlgoAPI_ShapeAPI
+{
+/**\class GeomAlgoAPI_ShapeAPI
+ * \ingroup DataAlgo
+ * \brief Allows to access the direct API
+ */
+class GEOMALGOAPI_EXPORT GeomAlgoAPI_ShapeAPI
+{
+public:
+  /// Creates a box using the dimensions.
+  /// \param theDx The dimension on X
+  /// \param theDy The dimension on Y
+  /// \param theDz The dimension on Z
+  /// \return a shape
+  static std::shared_ptr<GeomAPI_Shape> makeBox(const double theDx, const double theDy, const double theDz) throw (GeomAlgoAPI_Exception);
+  
+  /// Creates a box using the two points that defined a diagonal.
+  /// \param theFirstPoint One extermity of the diagonal
+  /// \param theSecondPoint The other extremity of the diagonal
+  /// \return a shape
+  static std::shared_ptr<GeomAPI_Shape> makeBox(std::shared_ptr<GeomAPI_Pnt> theFirstPoint,
+                                                std::shared_ptr<GeomAPI_Pnt> theSecondPoint) throw (GeomAlgoAPI_Exception);
+};
+}
+#endif

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_swig.h b/src/GeomAlgoAPI/GeomAlgoAPI_swig.h
index b742d88e82dcd86b29191541a4091e02eb7901f8..668a5d1b04e2189c87ebd064cffd1f2733c5e583 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_swig.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_swig.h
@@ -42,7 +42,7 @@
   #include "GeomAlgoAPI_Sewing.h"
   #include "GeomAlgoAPI_ShapeBuilder.h"  
   #include "GeomAlgoAPI_Exception.h"
-  #include "GeomAlgoAPI_DirectAPI.h"
+  #include "GeomAlgoAPI_ShapeAPI.h"
   #include "GeomAlgoAPI_Box.h"
   #include "GeomAlgoAPI_BoxPoints.h"
 

diff --git a/src/PrimitivesPlugin/Test/APIDirectTestBox.py b/src/PrimitivesPlugin/Test/APIDirectTestBox.py
index 247a3f82ea101f84ff660a5c768812523a68cc0c..57927ac00d3bc435dd6fb1f78876da935b5937ec 100644 (file)
--- a/src/PrimitivesPlugin/Test/APIDirectTestBox.py
+++ b/src/PrimitivesPlugin/Test/APIDirectTestBox.py
@@ -1,4 +1,4 @@
-from GeomAlgoAPI import GeomAlgoAPI_DirectAPI as shaperpy
+from GeomAlgoAPI import GeomAlgoAPI_ShapeAPI as shaperpy
 from GeomAlgoAPI import GeomAlgoAPI_Exception as myExcept
 from GeomAPI import GeomAPI_Pnt as pnt