From 9f6ca231c7ccf05632b9eba16c48f27263496910 Mon Sep 17 00:00:00 2001
From: Clarisse Genrault <clarisse.genrault@cea.fr>
Date: Fri, 1 Jul 2016 12:09:49 +0200
Subject: [PATCH] Renaming the direct API high level.

---
 src/GeomAlgoAPI/CMakeLists.txt                         |  4 ++--
 src/GeomAlgoAPI/GeomAlgoAPI.i                          |  2 +-
 ...mAlgoAPI_DirectAPI.cpp => GeomAlgoAPI_ShapeAPI.cpp} | 10 +++++-----
 ...{GeomAlgoAPI_DirectAPI.h => GeomAlgoAPI_ShapeAPI.h} |  8 ++++----
 src/GeomAlgoAPI/GeomAlgoAPI_swig.h                     |  2 +-
 src/PrimitivesPlugin/Test/APIDirectTestBox.py          |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename src/GeomAlgoAPI/{GeomAlgoAPI_DirectAPI.cpp => GeomAlgoAPI_ShapeAPI.cpp} (83%)
 rename src/GeomAlgoAPI/{GeomAlgoAPI_DirectAPI.h => GeomAlgoAPI_ShapeAPI.h} (88%)

diff --git a/src/GeomAlgoAPI/CMakeLists.txt b/src/GeomAlgoAPI/CMakeLists.txt
index ee42e2a90..bb0ce3fe4 100644
--- 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 9391a720c..762d6b44f 100644
--- 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_ShapeAPI.cpp
similarity index 83%
rename from src/GeomAlgoAPI/GeomAlgoAPI_DirectAPI.cpp
rename to src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp
index f621478fd..6945ee370 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_DirectAPI.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp
@@ -1,10 +1,10 @@
 // Copyright (C) 2014-2016 CEA/DEN, EDF R&D
 
-// File:        GeomAlgoAPI_DirectAPI.cpp
+// File:        GeomAlgoAPI_ShapeAPI.cpp
 // Created:     17 Mar 2016
 // Author:      Clarisse Genrault (CEA)
 
-#include "GeomAlgoAPI_DirectAPI.h"
+#include "GeomAlgoAPI_ShapeAPI.h"
 #include <GeomAlgoAPI_Box.h>
 #include <GeomAlgoAPI_BoxPoints.h>
 
@@ -14,10 +14,10 @@
 
 #include <iostream>
 
-namespace GeomAlgoAPI_DirectAPI
+namespace GeomAlgoAPI_ShapeAPI
 {
   //=========================================================================================================
-  std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_DirectAPI::makeBox(const double theDx, const double theDy, 
+  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);
@@ -38,7 +38,7 @@ namespace GeomAlgoAPI_DirectAPI
   }
   
   //=========================================================================================================
-  std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_DirectAPI::makeBox(std::shared_ptr<GeomAPI_Pnt> theFirstPoint,
+  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);
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_DirectAPI.h b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.h
similarity index 88%
rename from src/GeomAlgoAPI/GeomAlgoAPI_DirectAPI.h
rename to src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.h
index ef804ed78..4f626e577 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_DirectAPI.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.h
@@ -1,6 +1,6 @@
 // Copyright (C) 2014-2016 CEA/DEN, EDF R&D
 
-// File:        GeomAlgoAPI_DirectAPI.h
+// File:        GeomAlgoAPI_ShapeAPI.h
 // Created:     17 Mar 2016
 // Author:      Clarisse Genrault (CEA)
 
@@ -13,13 +13,13 @@
 
 #include <GeomAlgoAPI_Exception.h>
 
-namespace GeomAlgoAPI_DirectAPI
+namespace GeomAlgoAPI_ShapeAPI
 {
-/**\class GeomAlgoAPI_DirectAPI
+/**\class GeomAlgoAPI_ShapeAPI
  * \ingroup DataAlgo
  * \brief Allows to access the direct API
  */
-class GEOMALGOAPI_EXPORT GeomAlgoAPI_DirectAPI
+class GEOMALGOAPI_EXPORT GeomAlgoAPI_ShapeAPI
 {
 public:
   /// Creates a box using the dimensions.
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_swig.h b/src/GeomAlgoAPI/GeomAlgoAPI_swig.h
index b742d88e8..668a5d1b0 100644
--- 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 247a3f82e..57927ac00 100644
--- 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
 
-- 
2.39.2