From 9a942445013f9330fe356967e9cc3ba99aa6fd39 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me?= <jerome.lucas@cesgenslab.fr>
Date: Tue, 8 Dec 2020 10:12:25 +0100
Subject: [PATCH] Fixed coding issues

---
 ...Box_widget.xml => Bounding_Box_widget.xml} |  0
 src/FeaturesPlugin/CMakeLists.txt             |  5 ++--
 ...get.xml => Create_Bounding_Box_widget.xml} |  0
 .../FeaturesPlugin_BoundingBox.cpp            | 12 ++++----
 .../FeaturesPlugin_CommonBoundingBox.cpp      | 29 +++++++++----------
 .../FeaturesPlugin_CommonBoundingBox.h        |  3 +-
 .../FeaturesPlugin_CreateBoundingBox.cpp      |  7 ++---
 src/FeaturesPlugin/plugin-Features.xml        |  4 +--
 8 files changed, 27 insertions(+), 33 deletions(-)
 rename src/FeaturesPlugin/{BoundingBox_widget.xml => Bounding_Box_widget.xml} (100%)
 rename src/FeaturesPlugin/{CreateBoundingBox_widget.xml => Create_Bounding_Box_widget.xml} (100%)

diff --git a/src/FeaturesPlugin/BoundingBox_widget.xml b/src/FeaturesPlugin/Bounding_Box_widget.xml
similarity index 100%
rename from src/FeaturesPlugin/BoundingBox_widget.xml
rename to src/FeaturesPlugin/Bounding_Box_widget.xml
diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index ec8382c3e..446b32b9d 100644
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
 # additional include directories
 INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/GeomDataAPI
                      ${PROJECT_SOURCE_DIR}/src/Locale
-                     ${PROJECT_SOURCE_DIR}/src/PrimitivesPlugin
                      ${QT_INCLUDES})
 
 # additional preprocessor / compiler flags
@@ -164,8 +163,8 @@ SET(XML_RESOURCES
   fillet1d_widget.xml
   measurement_widget.xml
   GeometryCalculation_widget.xml
-  BoundingBox_widget.xml
-  CreateBoundingBox_widget.xml
+  Bounding_Box_widget.xml
+  Create_Bounding_Box_widget.xml
   fusion_faces_widget.xml
   chamfer_widget.xml
   copy_widget.xml
diff --git a/src/FeaturesPlugin/CreateBoundingBox_widget.xml b/src/FeaturesPlugin/Create_Bounding_Box_widget.xml
similarity index 100%
rename from src/FeaturesPlugin/CreateBoundingBox_widget.xml
rename to src/FeaturesPlugin/Create_Bounding_Box_widget.xml
diff --git a/src/FeaturesPlugin/FeaturesPlugin_BoundingBox.cpp b/src/FeaturesPlugin/FeaturesPlugin_BoundingBox.cpp
index 0b92fcea4..e105a419c 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_BoundingBox.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_BoundingBox.cpp
@@ -19,19 +19,19 @@
 
 #include "FeaturesPlugin_BoundingBox.h"
 
+#include <Config_PropManager.h>
+
+#include <FeaturesPlugin_CreateBoundingBox.h>
+
+#include <GeomAlgoAPI_BoundingBox.h>
+
 #include <ModelAPI_AttributeSelection.h>
 #include <ModelAPI_AttributeDoubleArray.h>
 #include <ModelAPI_AttributeBoolean.h>
 #include <ModelAPI_AttributeString.h>
-
-#include <GeomAlgoAPI_BoundingBox.h>
-
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_Validator.h>
-#include <Config_PropManager.h>
-
-#include <FeaturesPlugin_CreateBoundingBox.h>
 
 #include <iomanip>
 #include <sstream>
diff --git a/src/FeaturesPlugin/FeaturesPlugin_CommonBoundingBox.cpp b/src/FeaturesPlugin/FeaturesPlugin_CommonBoundingBox.cpp
index 6edc82590..63047c5b8 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_CommonBoundingBox.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_CommonBoundingBox.cpp
@@ -19,26 +19,23 @@
 
 #include "FeaturesPlugin_CommonBoundingBox.h"
 
-#include <ModelAPI_AttributeSelection.h>
 #include <ModelAPI_AttributeDoubleArray.h>
-#include <ModelAPI_AttributeBoolean.h>
-#include <ModelAPI_AttributeDouble.h>
-#include <GeomAlgoAPI_BoundingBox.h>
-#include <ModelAPI_AttributeString.h>
+
 #include <ModelAPI_Data.h>
+#include <ModelAPI_ResultBody.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_Validator.h>
-#include <GeomAlgoAPI_PointBuilder.h>
 #include <GeomAPI_Vertex.h>
-#include <Config_PropManager.h>
-#include <ModelAPI_ResultBody.h>
+
+#include <GeomAlgoAPI_BoundingBox.h>
+#include <GeomAlgoAPI_PointBuilder.h>
 #include <GeomAlgoAPI_ShapeTools.h>
 
-#include <PrimitivesPlugin_Box.h>
+#include <Config_PropManager.h>
 
 #include <iomanip>
 #include <sstream>
-#include <iostream>
+
 
 
 //=================================================================================================
@@ -52,14 +49,14 @@ void FeaturesPlugin_CommonBoundingBox::createBoxByTwoPoints()
   DocumentPtr aDoc =  aSession->activeDocument();
 
   GeomVertexPtr vertexFirst =
-          GeomAlgoAPI_PointBuilder::vertex( aValues->value(0),
-                                            aValues->value(2),
-                                            aValues->value(4));
+          GeomAlgoAPI_PointBuilder::vertex(aValues->value(0),
+                                           aValues->value(2),
+                                           aValues->value(4));
 
   GeomVertexPtr  vertexSecond =
-          GeomAlgoAPI_PointBuilder::vertex( aValues->value(1),
-                                            aValues->value(3),
-                                            aValues->value(5));
+          GeomAlgoAPI_PointBuilder::vertex(aValues->value(1),
+                                           aValues->value(3),
+                                           aValues->value(5));
 
 
   std::shared_ptr<GeomAlgoAPI_Box> aBoxAlgo;
diff --git a/src/FeaturesPlugin/FeaturesPlugin_CommonBoundingBox.h b/src/FeaturesPlugin/FeaturesPlugin_CommonBoundingBox.h
index 18ba75972..dc6e7b125 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_CommonBoundingBox.h
+++ b/src/FeaturesPlugin/FeaturesPlugin_CommonBoundingBox.h
@@ -23,9 +23,10 @@
 #include "FeaturesPlugin.h"
 #include <ModelAPI_Feature.h>
 
+#include <GeomAlgoAPI_Box.h>
+
 #include <GeomAPI_IPresentable.h>
 #include <GeomAPI_IScreenParams.h>
-#include <GeomAlgoAPI_Box.h>
 
 #include <ModelAPI_Attribute.h>
 
diff --git a/src/FeaturesPlugin/FeaturesPlugin_CreateBoundingBox.cpp b/src/FeaturesPlugin/FeaturesPlugin_CreateBoundingBox.cpp
index df636ce89..5a4b8ba46 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_CreateBoundingBox.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_CreateBoundingBox.cpp
@@ -21,7 +21,6 @@
 
 #include <ModelAPI_AttributeSelection.h>
 #include <ModelAPI_AttributeDoubleArray.h>
-#include <ModelAPI_AttributeBoolean.h>
 #include <ModelAPI_AttributeString.h>
 
 #include <ModelAPI_Data.h>
@@ -33,8 +32,6 @@
 #include <Config_PropManager.h>
 #include <ModelAPI_ResultBody.h>
 
-#include <PrimitivesPlugin_Box.h>
-
 #include <iomanip>
 #include <sstream>
 
@@ -103,10 +100,10 @@ void FeaturesPlugin_CreateBoundingBox::updateValues()
     if (!aShape && aSelection->context())
       aShape = aSelection->context()->shape();
   }
-  if (aShape){
+  if (aShape) {
     double aXmin, aXmax, aYmin,aYmax,aZmin,aZmax;
           std::string aError;
-    if( !GetBoundingBox(aShape,
+    if (!GetBoundingBox(aShape,
                         true,
                         aXmin, aXmax,
                         aYmin,aYmax,
diff --git a/src/FeaturesPlugin/plugin-Features.xml b/src/FeaturesPlugin/plugin-Features.xml
index cc9dbccc3..5de92e7cd 100644
--- a/src/FeaturesPlugin/plugin-Features.xml
+++ b/src/FeaturesPlugin/plugin-Features.xml
@@ -179,11 +179,11 @@
       </feature>
       <feature id="BoundingBoxMacro" title="Bounding box" tooltip="Calculate the bounding box" auto_preview="true"
                icon="icons/Features/bounding.png" helpfile="boundingBoxFeature.html"> 
-        <source path="BoundingBox_widget.xml"/>
+        <source path="Bounding_Box_widget.xml"/>
       </feature>
       <feature id="BoundingBox" title="Bounding box" tooltip="Calculate the bounding box" auto_preview="true"
                icon="icons/Features/bounding.png" helpfile="boundingBoxFeature.html" internal="1"> 
-        <source path="CreateBoundingBox_widget.xml"/>
+        <source path="Create_Bounding_Box_widget.xml"/>
       </feature>
       <feature id="Measurement" title="Measurement" tooltip="Calculate properties of objects"
                icon="icons/Features/measurement.png" helpfile="measurementFeature.html" abort_confirmation="false">
-- 
2.39.2