From 285715917ca39b3a323a0898bb81ee9159440625 Mon Sep 17 00:00:00 2001 From: fps Date: Fri, 6 Sep 2013 12:39:33 +0000 Subject: [PATCH] rename files XAO_* to follow SALOME standard --- src/XAO/Makefile.am | 68 +++++++++---------- ...{BooleanField.cxx => XAO_BooleanField.cxx} | 8 +-- ...{BooleanField.hxx => XAO_BooleanField.hxx} | 8 +-- .../{BooleanStep.cxx => XAO_BooleanStep.cxx} | 5 +- .../{BooleanStep.hxx => XAO_BooleanStep.hxx} | 5 +- ...{BrepGeometry.cxx => XAO_BrepGeometry.cxx} | 7 +- ...{BrepGeometry.hxx => XAO_BrepGeometry.hxx} | 4 +- .../{DoubleField.cxx => XAO_DoubleField.cxx} | 8 +-- .../{DoubleField.hxx => XAO_DoubleField.hxx} | 9 +-- .../{DoubleStep.cxx => XAO_DoubleStep.cxx} | 5 +- .../{DoubleStep.hxx => XAO_DoubleStep.hxx} | 4 +- src/XAO/{Field.cxx => XAO_Field.cxx} | 14 ++-- src/XAO/{Field.hxx => XAO_Field.hxx} | 6 +- ...icElement.cxx => XAO_GeometricElement.cxx} | 4 +- ...icElement.hxx => XAO_GeometricElement.hxx} | 0 src/XAO/{Geometry.cxx => XAO_Geometry.cxx} | 6 +- src/XAO/{Geometry.hxx => XAO_Geometry.hxx} | 4 +- src/XAO/{Group.cxx => XAO_Group.cxx} | 4 +- src/XAO/{Group.hxx => XAO_Group.hxx} | 3 +- ...{IntegerField.cxx => XAO_IntegerField.cxx} | 8 +-- ...{IntegerField.hxx => XAO_IntegerField.hxx} | 9 +-- .../{IntegerStep.cxx => XAO_IntegerStep.cxx} | 5 +- .../{IntegerStep.hxx => XAO_IntegerStep.hxx} | 4 +- src/XAO/{Step.cxx => XAO_Step.cxx} | 14 ++-- src/XAO/{Step.hxx => XAO_Step.hxx} | 2 +- .../{StringField.cxx => XAO_StringField.cxx} | 8 +-- .../{StringField.hxx => XAO_StringField.hxx} | 9 +-- .../{StringStep.cxx => XAO_StringStep.cxx} | 3 +- .../{StringStep.hxx => XAO_StringStep.hxx} | 4 +- src/XAO/{Xao.cxx => XAO_Xao.cxx} | 15 ++-- src/XAO/{Xao.hxx => XAO_Xao.hxx} | 1 - .../{XaoExporter.cxx => XAO_XaoExporter.cxx} | 18 ++--- .../{XaoExporter.hxx => XAO_XaoExporter.hxx} | 8 +-- src/XAO/{XaoUtils.cxx => XAO_XaoUtils.cxx} | 4 +- src/XAO/{XaoUtils.hxx => XAO_XaoUtils.hxx} | 4 +- src/XAO/tests/BrepGeometryTest.cxx | 4 +- src/XAO/tests/BrepGeometryTest.hxx | 2 - src/XAO/tests/FieldTest.cxx | 16 ++--- src/XAO/tests/FieldTest.hxx | 3 +- src/XAO/tests/GeometryTest.cxx | 2 +- src/XAO/tests/GeometryTest.hxx | 2 - src/XAO/tests/GroupTest.cxx | 4 +- src/XAO/tests/GroupTest.hxx | 2 - src/XAO/tests/ImportExportTest.cxx | 10 +-- src/XAO/tests/ImportExportTest.hxx | 2 +- src/XAO/tests/TestUtils.hxx | 2 +- src/XAO/tests/XaoUtilsTest.cxx | 4 +- src/XAO/tests/XaoUtilsTest.hxx | 2 - src/XAO/tests/coverage_report.sh | 65 ++++++++++++++++++ 49 files changed, 223 insertions(+), 185 deletions(-) rename src/XAO/{BooleanField.cxx => XAO_BooleanField.cxx} (95%) rename src/XAO/{BooleanField.hxx => XAO_BooleanField.hxx} (93%) rename src/XAO/{BooleanStep.cxx => XAO_BooleanStep.cxx} (98%) rename src/XAO/{BooleanStep.hxx => XAO_BooleanStep.hxx} (98%) rename src/XAO/{BrepGeometry.cxx => XAO_BrepGeometry.cxx} (98%) rename src/XAO/{BrepGeometry.hxx => XAO_BrepGeometry.hxx} (99%) rename src/XAO/{DoubleField.cxx => XAO_DoubleField.cxx} (95%) rename src/XAO/{DoubleField.hxx => XAO_DoubleField.hxx} (92%) rename src/XAO/{DoubleStep.cxx => XAO_DoubleStep.cxx} (98%) rename src/XAO/{DoubleStep.hxx => XAO_DoubleStep.hxx} (97%) rename src/XAO/{Field.cxx => XAO_Field.cxx} (94%) rename src/XAO/{Field.hxx => XAO_Field.hxx} (98%) rename src/XAO/{GeometricElement.cxx => XAO_GeometricElement.cxx} (98%) rename src/XAO/{GeometricElement.hxx => XAO_GeometricElement.hxx} (100%) rename src/XAO/{Geometry.cxx => XAO_Geometry.cxx} (97%) rename src/XAO/{Geometry.hxx => XAO_Geometry.hxx} (99%) rename src/XAO/{Group.cxx => XAO_Group.cxx} (97%) rename src/XAO/{Group.hxx => XAO_Group.hxx} (99%) rename src/XAO/{IntegerField.cxx => XAO_IntegerField.cxx} (95%) rename src/XAO/{IntegerField.hxx => XAO_IntegerField.hxx} (92%) rename src/XAO/{IntegerStep.cxx => XAO_IntegerStep.cxx} (98%) rename src/XAO/{IntegerStep.hxx => XAO_IntegerStep.hxx} (97%) rename src/XAO/{Step.cxx => XAO_Step.cxx} (93%) rename src/XAO/{Step.hxx => XAO_Step.hxx} (99%) rename src/XAO/{StringField.cxx => XAO_StringField.cxx} (95%) rename src/XAO/{StringField.hxx => XAO_StringField.hxx} (92%) rename src/XAO/{StringStep.cxx => XAO_StringStep.cxx} (99%) rename src/XAO/{StringStep.hxx => XAO_StringStep.hxx} (97%) rename src/XAO/{Xao.cxx => XAO_Xao.cxx} (95%) rename src/XAO/{Xao.hxx => XAO_Xao.hxx} (99%) rename src/XAO/{XaoExporter.cxx => XAO_XaoExporter.cxx} (98%) rename src/XAO/{XaoExporter.hxx => XAO_XaoExporter.hxx} (96%) rename src/XAO/{XaoUtils.cxx => XAO_XaoUtils.cxx} (98%) rename src/XAO/{XaoUtils.hxx => XAO_XaoUtils.hxx} (98%) create mode 100755 src/XAO/tests/coverage_report.sh diff --git a/src/XAO/Makefile.am b/src/XAO/Makefile.am index 9cda11665..8dbb40e4d 100644 --- a/src/XAO/Makefile.am +++ b/src/XAO/Makefile.am @@ -27,43 +27,43 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am # # header files salomeinclude_HEADERS = \ - XaoUtils.hxx \ - GeometricElement.hxx \ - Xao.hxx \ - Geometry.hxx \ - BrepGeometry.hxx \ - Group.hxx \ - Field.hxx \ - BooleanField.hxx \ - IntegerField.hxx \ - DoubleField.hxx \ - StringField.hxx \ - Step.hxx \ - BooleanStep.hxx \ - IntegerStep.hxx \ - DoubleStep.hxx \ - StringStep.hxx \ - XaoExporter.hxx + XAO_XaoUtils.hxx \ + XAO_GeometricElement.hxx \ + XAO_Xao.hxx \ + XAO_Geometry.hxx \ + XAO_BrepGeometry.hxx \ + XAO_Group.hxx \ + XAO_Field.hxx \ + XAO_BooleanField.hxx \ + XAO_IntegerField.hxx \ + XAO_DoubleField.hxx \ + XAO_StringField.hxx \ + XAO_Step.hxx \ + XAO_BooleanStep.hxx \ + XAO_IntegerStep.hxx \ + XAO_DoubleStep.hxx \ + XAO_StringStep.hxx \ + XAO_XaoExporter.hxx lib_LTLIBRARIES = libXAO.la dist_libXAO_la_SOURCES = \ - XaoUtils.cxx \ - GeometricElement.cxx \ - Xao.cxx \ - Geometry.cxx \ - BrepGeometry.cxx \ - Group.cxx \ - Field.cxx \ - BooleanField.cxx \ - IntegerField.cxx \ - DoubleField.cxx \ - StringField.cxx \ - Step.cxx \ - BooleanStep.cxx \ - IntegerStep.cxx \ - DoubleStep.cxx \ - StringStep.cxx \ - XaoExporter.cxx + XAO_XaoUtils.cxx \ + XAO_GeometricElement.cxx \ + XAO_Xao.cxx \ + XAO_Geometry.cxx \ + XAO_BrepGeometry.cxx \ + XAO_Group.cxx \ + XAO_Field.cxx \ + XAO_BooleanField.cxx \ + XAO_IntegerField.cxx \ + XAO_DoubleField.cxx \ + XAO_StringField.cxx \ + XAO_Step.cxx \ + XAO_BooleanStep.cxx \ + XAO_IntegerStep.cxx \ + XAO_DoubleStep.cxx \ + XAO_StringStep.cxx \ + XAO_XaoExporter.cxx libXAO_la_CPPFLAGS = \ $(GEOM_CXXFLAGS) \ diff --git a/src/XAO/BooleanField.cxx b/src/XAO/XAO_BooleanField.cxx similarity index 95% rename from src/XAO/BooleanField.cxx rename to src/XAO/XAO_BooleanField.cxx index 7a91d00b5..26b8cb5d0 100644 --- a/src/XAO/BooleanField.cxx +++ b/src/XAO/XAO_BooleanField.cxx @@ -18,12 +18,12 @@ // // Author : Frederic Pons (OpenCascade) -#include "BooleanField.hxx" -#include "BooleanStep.hxx" -#include "XaoUtils.hxx" - #include +#include "XAO_BooleanField.hxx" +#include "XAO_BooleanStep.hxx" +#include "XAO_XaoUtils.hxx" + using namespace XAO; BooleanField::BooleanField(const std::string& name, const XAO::Dimension& dimension, diff --git a/src/XAO/BooleanField.hxx b/src/XAO/XAO_BooleanField.hxx similarity index 93% rename from src/XAO/BooleanField.hxx rename to src/XAO/XAO_BooleanField.hxx index 2a240db79..eefb49234 100644 --- a/src/XAO/BooleanField.hxx +++ b/src/XAO/XAO_BooleanField.hxx @@ -21,13 +21,11 @@ #ifndef __XAO_BOOLEANFIELD_HXX__ #define __XAO_BOOLEANFIELD_HXX__ -#include #include -#include -#include "Xao.hxx" -#include "Field.hxx" -#include "BooleanStep.hxx" +#include "XAO_Xao.hxx" +#include "XAO_Field.hxx" +#include "XAO_BooleanStep.hxx" namespace XAO { diff --git a/src/XAO/BooleanStep.cxx b/src/XAO/XAO_BooleanStep.cxx similarity index 98% rename from src/XAO/BooleanStep.cxx rename to src/XAO/XAO_BooleanStep.cxx index 3fab963bc..d6c03d1e3 100644 --- a/src/XAO/BooleanStep.cxx +++ b/src/XAO/XAO_BooleanStep.cxx @@ -19,8 +19,9 @@ // Author : Frederic Pons (OpenCascade) #include -#include "BooleanStep.hxx" -#include "XaoUtils.hxx" + +#include "XAO_BooleanStep.hxx" +#include "XAO_XaoUtils.hxx" using namespace XAO; diff --git a/src/XAO/BooleanStep.hxx b/src/XAO/XAO_BooleanStep.hxx similarity index 98% rename from src/XAO/BooleanStep.hxx rename to src/XAO/XAO_BooleanStep.hxx index d82ee4a38..4f514407a 100644 --- a/src/XAO/BooleanStep.hxx +++ b/src/XAO/XAO_BooleanStep.hxx @@ -22,11 +22,10 @@ #ifndef __XAO_BOOLEANSTEP_HXX__ #define __XAO_BOOLEANSTEP_HXX__ -#include #include -#include "Xao.hxx" -#include "Step.hxx" +#include "XAO_Xao.hxx" +#include "XAO_Step.hxx" namespace XAO { diff --git a/src/XAO/BrepGeometry.cxx b/src/XAO/XAO_BrepGeometry.cxx similarity index 98% rename from src/XAO/BrepGeometry.cxx rename to src/XAO/XAO_BrepGeometry.cxx index 25e8ab2b0..29cbd514b 100644 --- a/src/XAO/BrepGeometry.cxx +++ b/src/XAO/XAO_BrepGeometry.cxx @@ -31,9 +31,6 @@ #include #include #include -//#include -//#include -//#include #include #include #include @@ -41,8 +38,8 @@ #include -#include "BrepGeometry.hxx" -#include "XaoUtils.hxx" +#include "XAO_BrepGeometry.hxx" +#include "XAO_XaoUtils.hxx" using namespace XAO; diff --git a/src/XAO/BrepGeometry.hxx b/src/XAO/XAO_BrepGeometry.hxx similarity index 99% rename from src/XAO/BrepGeometry.hxx rename to src/XAO/XAO_BrepGeometry.hxx index 82724bf85..923520cf3 100644 --- a/src/XAO/BrepGeometry.hxx +++ b/src/XAO/XAO_BrepGeometry.hxx @@ -26,8 +26,8 @@ #include -#include "Xao.hxx" -#include "Geometry.hxx" +#include "XAO_Xao.hxx" +#include "XAO_Geometry.hxx" namespace XAO { diff --git a/src/XAO/DoubleField.cxx b/src/XAO/XAO_DoubleField.cxx similarity index 95% rename from src/XAO/DoubleField.cxx rename to src/XAO/XAO_DoubleField.cxx index 35adcfeca..6bb6fbed1 100644 --- a/src/XAO/DoubleField.cxx +++ b/src/XAO/XAO_DoubleField.cxx @@ -18,12 +18,12 @@ // // Author : Frederic Pons (OpenCascade) -#include "DoubleField.hxx" -#include "DoubleStep.hxx" -#include "XaoUtils.hxx" - #include +#include "XAO_DoubleField.hxx" +#include "XAO_DoubleStep.hxx" +#include "XAO_XaoUtils.hxx" + using namespace XAO; DoubleField::DoubleField(const std::string& name, const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents) diff --git a/src/XAO/DoubleField.hxx b/src/XAO/XAO_DoubleField.hxx similarity index 92% rename from src/XAO/DoubleField.hxx rename to src/XAO/XAO_DoubleField.hxx index 152efbd5b..383ff0ca8 100644 --- a/src/XAO/DoubleField.hxx +++ b/src/XAO/XAO_DoubleField.hxx @@ -21,14 +21,11 @@ #ifndef __XAO_DOUBLEFIELD_HXX__ #define __XAO_DOUBLEFIELD_HXX__ -#include #include -#include -#include -#include "Xao.hxx" -#include "Field.hxx" -#include "DoubleStep.hxx" +#include "XAO_Xao.hxx" +#include "XAO_Field.hxx" +#include "XAO_DoubleStep.hxx" namespace XAO { diff --git a/src/XAO/DoubleStep.cxx b/src/XAO/XAO_DoubleStep.cxx similarity index 98% rename from src/XAO/DoubleStep.cxx rename to src/XAO/XAO_DoubleStep.cxx index 10cb30fcf..3f2bb6e1f 100644 --- a/src/XAO/DoubleStep.cxx +++ b/src/XAO/XAO_DoubleStep.cxx @@ -18,9 +18,10 @@ // // Author : Frederic Pons (OpenCascade) -#include "DoubleStep.hxx" #include -#include "XaoUtils.hxx" + +#include "XAO_DoubleStep.hxx" +#include "XAO_XaoUtils.hxx" using namespace XAO; diff --git a/src/XAO/DoubleStep.hxx b/src/XAO/XAO_DoubleStep.hxx similarity index 97% rename from src/XAO/DoubleStep.hxx rename to src/XAO/XAO_DoubleStep.hxx index ccf25ada3..d5301aafe 100644 --- a/src/XAO/DoubleStep.hxx +++ b/src/XAO/XAO_DoubleStep.hxx @@ -24,8 +24,8 @@ #include -#include "Xao.hxx" -#include "Step.hxx" +#include "XAO_Xao.hxx" +#include "XAO_Step.hxx" namespace XAO { diff --git a/src/XAO/Field.cxx b/src/XAO/XAO_Field.cxx similarity index 94% rename from src/XAO/Field.cxx rename to src/XAO/XAO_Field.cxx index 12289f14a..fb3773bad 100644 --- a/src/XAO/Field.cxx +++ b/src/XAO/XAO_Field.cxx @@ -22,13 +22,13 @@ #include #include -#include "Xao.hxx" -#include "Field.hxx" -#include "BooleanField.hxx" -#include "IntegerField.hxx" -#include "DoubleField.hxx" -#include "StringField.hxx" -#include "XaoUtils.hxx" +#include "XAO_Xao.hxx" +#include "XAO_Field.hxx" +#include "XAO_BooleanField.hxx" +#include "XAO_IntegerField.hxx" +#include "XAO_DoubleField.hxx" +#include "XAO_StringField.hxx" +#include "XAO_XaoUtils.hxx" using namespace XAO; diff --git a/src/XAO/Field.hxx b/src/XAO/XAO_Field.hxx similarity index 98% rename from src/XAO/Field.hxx rename to src/XAO/XAO_Field.hxx index 5e7c65e04..7e9bf8305 100644 --- a/src/XAO/Field.hxx +++ b/src/XAO/XAO_Field.hxx @@ -21,13 +21,11 @@ #ifndef __XAO_FIELD_HXX__ #define __XAO_FIELD_HXX__ -#include #include #include -#include -#include "Xao.hxx" -#include "Step.hxx" +#include "XAO_Xao.hxx" +#include "XAO_Step.hxx" namespace XAO { diff --git a/src/XAO/GeometricElement.cxx b/src/XAO/XAO_GeometricElement.cxx similarity index 98% rename from src/XAO/GeometricElement.cxx rename to src/XAO/XAO_GeometricElement.cxx index a2cf99dd1..a0f39600b 100644 --- a/src/XAO/GeometricElement.cxx +++ b/src/XAO/XAO_GeometricElement.cxx @@ -20,8 +20,8 @@ #include -#include "GeometricElement.hxx" -#include "XaoUtils.hxx" +#include "XAO_GeometricElement.hxx" +#include "XAO_XaoUtils.hxx" using namespace XAO; diff --git a/src/XAO/GeometricElement.hxx b/src/XAO/XAO_GeometricElement.hxx similarity index 100% rename from src/XAO/GeometricElement.hxx rename to src/XAO/XAO_GeometricElement.hxx diff --git a/src/XAO/Geometry.cxx b/src/XAO/XAO_Geometry.cxx similarity index 97% rename from src/XAO/Geometry.cxx rename to src/XAO/XAO_Geometry.cxx index 151849cf7..c44800d36 100644 --- a/src/XAO/Geometry.cxx +++ b/src/XAO/XAO_Geometry.cxx @@ -20,9 +20,9 @@ #include -#include "XaoUtils.hxx" -#include "Geometry.hxx" -#include "BrepGeometry.hxx" +#include "XAO_XaoUtils.hxx" +#include "XAO_Geometry.hxx" +#include "XAO_BrepGeometry.hxx" using namespace XAO; diff --git a/src/XAO/Geometry.hxx b/src/XAO/XAO_Geometry.hxx similarity index 99% rename from src/XAO/Geometry.hxx rename to src/XAO/XAO_Geometry.hxx index 61cbd2825..9f20fbcaa 100644 --- a/src/XAO/Geometry.hxx +++ b/src/XAO/XAO_Geometry.hxx @@ -23,8 +23,8 @@ #include -#include "Xao.hxx" -#include "GeometricElement.hxx" +#include "XAO_Xao.hxx" +#include "XAO_GeometricElement.hxx" namespace XAO { diff --git a/src/XAO/Group.cxx b/src/XAO/XAO_Group.cxx similarity index 97% rename from src/XAO/Group.cxx rename to src/XAO/XAO_Group.cxx index 30ac938bc..dd755f6d5 100644 --- a/src/XAO/Group.cxx +++ b/src/XAO/XAO_Group.cxx @@ -20,8 +20,8 @@ #include -#include "XaoUtils.hxx" -#include "Group.hxx" +#include "XAO_XaoUtils.hxx" +#include "XAO_Group.hxx" using namespace XAO; diff --git a/src/XAO/Group.hxx b/src/XAO/XAO_Group.hxx similarity index 99% rename from src/XAO/Group.hxx rename to src/XAO/XAO_Group.hxx index cb55ca8b4..ec85ef326 100644 --- a/src/XAO/Group.hxx +++ b/src/XAO/XAO_Group.hxx @@ -21,11 +21,10 @@ #ifndef __XAO_GROUP_HXX__ #define __XAO_GROUP_HXX__ -# include #include #include -#include "Xao.hxx" +#include "XAO_Xao.hxx" namespace XAO { diff --git a/src/XAO/IntegerField.cxx b/src/XAO/XAO_IntegerField.cxx similarity index 95% rename from src/XAO/IntegerField.cxx rename to src/XAO/XAO_IntegerField.cxx index 75d9ca0a9..4416fbf7e 100644 --- a/src/XAO/IntegerField.cxx +++ b/src/XAO/XAO_IntegerField.cxx @@ -18,12 +18,12 @@ // // Author : Frederic Pons (OpenCascade) -#include "IntegerField.hxx" -#include "IntegerStep.hxx" -#include "XaoUtils.hxx" - #include +#include "XAO_IntegerField.hxx" +#include "XAO_IntegerStep.hxx" +#include "XAO_XaoUtils.hxx" + using namespace XAO; IntegerField::IntegerField(const std::string& name, const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents) diff --git a/src/XAO/IntegerField.hxx b/src/XAO/XAO_IntegerField.hxx similarity index 92% rename from src/XAO/IntegerField.hxx rename to src/XAO/XAO_IntegerField.hxx index bc8ff1d27..807592e7f 100644 --- a/src/XAO/IntegerField.hxx +++ b/src/XAO/XAO_IntegerField.hxx @@ -21,14 +21,11 @@ #ifndef __XAO_INTEGERFIELD_HXX__ #define __XAO_INTEGERFIELD_HXX__ -#include #include -#include -#include -#include "Xao.hxx" -#include "Field.hxx" -#include "IntegerStep.hxx" +#include "XAO_Xao.hxx" +#include "XAO_Field.hxx" +#include "XAO_IntegerStep.hxx" namespace XAO { diff --git a/src/XAO/IntegerStep.cxx b/src/XAO/XAO_IntegerStep.cxx similarity index 98% rename from src/XAO/IntegerStep.cxx rename to src/XAO/XAO_IntegerStep.cxx index f1e4a3ca1..95472fa03 100644 --- a/src/XAO/IntegerStep.cxx +++ b/src/XAO/XAO_IntegerStep.cxx @@ -18,9 +18,10 @@ // // Author : Frederic Pons (OpenCascade) -#include "IntegerStep.hxx" #include -#include "XaoUtils.hxx" + +#include "XAO_IntegerStep.hxx" +#include "XAO_XaoUtils.hxx" using namespace XAO; diff --git a/src/XAO/IntegerStep.hxx b/src/XAO/XAO_IntegerStep.hxx similarity index 97% rename from src/XAO/IntegerStep.hxx rename to src/XAO/XAO_IntegerStep.hxx index b1ad9ce21..8c3f65939 100644 --- a/src/XAO/IntegerStep.hxx +++ b/src/XAO/XAO_IntegerStep.hxx @@ -24,8 +24,8 @@ #include -#include "Xao.hxx" -#include "Step.hxx" +#include "XAO_Xao.hxx" +#include "XAO_Step.hxx" namespace XAO { diff --git a/src/XAO/Step.cxx b/src/XAO/XAO_Step.cxx similarity index 93% rename from src/XAO/Step.cxx rename to src/XAO/XAO_Step.cxx index bbc2decd9..e14eb7004 100644 --- a/src/XAO/Step.cxx +++ b/src/XAO/XAO_Step.cxx @@ -20,13 +20,13 @@ #include -#include "Xao.hxx" -#include "XaoUtils.hxx" -#include "Step.hxx" -#include "BooleanStep.hxx" -#include "IntegerStep.hxx" -#include "DoubleStep.hxx" -#include "StringStep.hxx" +#include "XAO_Xao.hxx" +#include "XAO_XaoUtils.hxx" +#include "XAO_Step.hxx" +#include "XAO_BooleanStep.hxx" +#include "XAO_IntegerStep.hxx" +#include "XAO_DoubleStep.hxx" +#include "XAO_StringStep.hxx" using namespace XAO; diff --git a/src/XAO/Step.hxx b/src/XAO/XAO_Step.hxx similarity index 99% rename from src/XAO/Step.hxx rename to src/XAO/XAO_Step.hxx index d0f32653f..c588d164a 100644 --- a/src/XAO/Step.hxx +++ b/src/XAO/XAO_Step.hxx @@ -22,7 +22,7 @@ #ifndef __XAO_STEP_HXX__ #define __XAO_STEP_HXX__ -#include "Xao.hxx" +#include "XAO_Xao.hxx" namespace XAO { diff --git a/src/XAO/StringField.cxx b/src/XAO/XAO_StringField.cxx similarity index 95% rename from src/XAO/StringField.cxx rename to src/XAO/XAO_StringField.cxx index 57e48fad4..95fa814c2 100644 --- a/src/XAO/StringField.cxx +++ b/src/XAO/XAO_StringField.cxx @@ -18,12 +18,12 @@ // // Author : Frederic Pons (OpenCascade) -#include "StringField.hxx" -#include "StringStep.hxx" -#include "XaoUtils.hxx" - #include +#include "XAO_StringField.hxx" +#include "XAO_StringStep.hxx" +#include "XAO_XaoUtils.hxx" + using namespace XAO; StringField::StringField(const std::string& name, const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents) diff --git a/src/XAO/StringField.hxx b/src/XAO/XAO_StringField.hxx similarity index 92% rename from src/XAO/StringField.hxx rename to src/XAO/XAO_StringField.hxx index d7855cb33..7257f8df6 100644 --- a/src/XAO/StringField.hxx +++ b/src/XAO/XAO_StringField.hxx @@ -21,14 +21,11 @@ #ifndef __XAO_STRINGFIELD_HXX__ #define __XAO_STRINGFIELD_HXX__ -#include #include -#include -#include -#include "Xao.hxx" -#include "Field.hxx" -#include "StringStep.hxx" +#include "XAO_Xao.hxx" +#include "XAO_Field.hxx" +#include "XAO_StringStep.hxx" namespace XAO { diff --git a/src/XAO/StringStep.cxx b/src/XAO/XAO_StringStep.cxx similarity index 99% rename from src/XAO/StringStep.cxx rename to src/XAO/XAO_StringStep.cxx index f4611013c..9b72ad809 100644 --- a/src/XAO/StringStep.cxx +++ b/src/XAO/XAO_StringStep.cxx @@ -18,9 +18,10 @@ // // Author : Frederic Pons (OpenCascade) -#include "StringStep.hxx" #include +#include "XAO_StringStep.hxx" + using namespace XAO; StringStep::StringStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents) diff --git a/src/XAO/StringStep.hxx b/src/XAO/XAO_StringStep.hxx similarity index 97% rename from src/XAO/StringStep.hxx rename to src/XAO/XAO_StringStep.hxx index bbd43592d..cce7271b5 100644 --- a/src/XAO/StringStep.hxx +++ b/src/XAO/XAO_StringStep.hxx @@ -25,8 +25,8 @@ #include #include -#include "Xao.hxx" -#include "Step.hxx" +#include "XAO_Xao.hxx" +#include "XAO_Step.hxx" namespace XAO { diff --git a/src/XAO/Xao.cxx b/src/XAO/XAO_Xao.cxx similarity index 95% rename from src/XAO/Xao.cxx rename to src/XAO/XAO_Xao.cxx index b6e2da70f..95923aa67 100644 --- a/src/XAO/Xao.cxx +++ b/src/XAO/XAO_Xao.cxx @@ -18,16 +18,15 @@ // // Author : Nathalie Gore (OpenCascade), Frederic Pons (OpenCascade) -#include - -#include "XaoUtils.hxx" -#include "Xao.hxx" -#include "Geometry.hxx" -#include "Group.hxx" -#include "Field.hxx" -#include "XaoExporter.hxx" #include +#include "XAO_XaoUtils.hxx" +#include "XAO_Xao.hxx" +#include "XAO_Geometry.hxx" +#include "XAO_Group.hxx" +#include "XAO_Field.hxx" +#include "XAO_XaoExporter.hxx" + using namespace XAO; const xmlChar* C_XAO_VERSION = (xmlChar*)"1.0"; diff --git a/src/XAO/Xao.hxx b/src/XAO/XAO_Xao.hxx similarity index 99% rename from src/XAO/Xao.hxx rename to src/XAO/XAO_Xao.hxx index f02f50c2c..7c092be2a 100644 --- a/src/XAO/Xao.hxx +++ b/src/XAO/XAO_Xao.hxx @@ -23,7 +23,6 @@ #include #include -#include namespace XAO { diff --git a/src/XAO/XaoExporter.cxx b/src/XAO/XAO_XaoExporter.cxx similarity index 98% rename from src/XAO/XaoExporter.cxx rename to src/XAO/XAO_XaoExporter.cxx index 7109510c8..65e84247b 100644 --- a/src/XAO/XaoExporter.cxx +++ b/src/XAO/XAO_XaoExporter.cxx @@ -2,17 +2,13 @@ #include #include -#include "XaoExporter.hxx" -#include "Xao.hxx" -#include "Geometry.hxx" -#include "Group.hxx" -#include "Field.hxx" -#include "Step.hxx" -#include "BooleanStep.hxx" -#include "IntegerStep.hxx" -#include "DoubleStep.hxx" -#include "StringStep.hxx" -#include "XaoUtils.hxx" +#include "XAO_XaoExporter.hxx" +#include "XAO_Xao.hxx" +#include "XAO_Geometry.hxx" +#include "XAO_Group.hxx" +#include "XAO_Field.hxx" +#include "XAO_Step.hxx" +#include "XAO_XaoUtils.hxx" namespace XAO { diff --git a/src/XAO/XaoExporter.hxx b/src/XAO/XAO_XaoExporter.hxx similarity index 96% rename from src/XAO/XaoExporter.hxx rename to src/XAO/XAO_XaoExporter.hxx index ef8245228..510572d09 100644 --- a/src/XAO/XaoExporter.hxx +++ b/src/XAO/XAO_XaoExporter.hxx @@ -4,10 +4,10 @@ #include -#include "Xao.hxx" -#include "Geometry.hxx" -#include "Group.hxx" -#include "Field.hxx" +#include "XAO_Xao.hxx" +#include "XAO_Geometry.hxx" +#include "XAO_Group.hxx" +#include "XAO_Field.hxx" namespace XAO { diff --git a/src/XAO/XaoUtils.cxx b/src/XAO/XAO_XaoUtils.cxx similarity index 98% rename from src/XAO/XaoUtils.cxx rename to src/XAO/XAO_XaoUtils.cxx index c61d6980c..922536e8d 100644 --- a/src/XAO/XaoUtils.cxx +++ b/src/XAO/XAO_XaoUtils.cxx @@ -23,8 +23,8 @@ #include #include -#include "Xao.hxx" -#include "XaoUtils.hxx" +#include "XAO_Xao.hxx" +#include "XAO_XaoUtils.hxx" using namespace XAO; diff --git a/src/XAO/XaoUtils.hxx b/src/XAO/XAO_XaoUtils.hxx similarity index 98% rename from src/XAO/XaoUtils.hxx rename to src/XAO/XAO_XaoUtils.hxx index a626c5a1b..06e43f629 100644 --- a/src/XAO/XaoUtils.hxx +++ b/src/XAO/XAO_XaoUtils.hxx @@ -24,8 +24,8 @@ #include #include -#include "Xao.hxx" -#include "Field.hxx" +#include "XAO_Xao.hxx" +#include "XAO_Field.hxx" namespace XAO { diff --git a/src/XAO/tests/BrepGeometryTest.cxx b/src/XAO/tests/BrepGeometryTest.cxx index aefc7c713..ef8a524aa 100644 --- a/src/XAO/tests/BrepGeometryTest.cxx +++ b/src/XAO/tests/BrepGeometryTest.cxx @@ -3,8 +3,8 @@ #include "TestUtils.hxx" #include "BrepGeometryTest.hxx" -#include "../Xao.hxx" -#include "../BrepGeometry.hxx" +#include "../XAO_Xao.hxx" +#include "../XAO_BrepGeometry.hxx" using namespace XAO; diff --git a/src/XAO/tests/BrepGeometryTest.hxx b/src/XAO/tests/BrepGeometryTest.hxx index dda6b0b09..bb4b057a3 100644 --- a/src/XAO/tests/BrepGeometryTest.hxx +++ b/src/XAO/tests/BrepGeometryTest.hxx @@ -3,8 +3,6 @@ #include -#include "../Xao.hxx" - namespace XAO { class BrepGeometryTest: public CppUnit::TestFixture diff --git a/src/XAO/tests/FieldTest.cxx b/src/XAO/tests/FieldTest.cxx index 2a1664c39..caf2b38ee 100644 --- a/src/XAO/tests/FieldTest.cxx +++ b/src/XAO/tests/FieldTest.cxx @@ -2,14 +2,14 @@ #include #include "FieldTest.hxx" -#include "../Xao.hxx" -#include "../XaoUtils.hxx" -#include "../Field.hxx" -#include "../Step.hxx" -#include "../BooleanField.hxx" -#include "../IntegerField.hxx" -#include "../DoubleField.hxx" -#include "../StringField.hxx" +#include "../XAO_Xao.hxx" +#include "../XAO_XaoUtils.hxx" +#include "../XAO_Field.hxx" +#include "../XAO_Step.hxx" +#include "../XAO_BooleanField.hxx" +#include "../XAO_IntegerField.hxx" +#include "../XAO_DoubleField.hxx" +#include "../XAO_StringField.hxx" using namespace XAO; diff --git a/src/XAO/tests/FieldTest.hxx b/src/XAO/tests/FieldTest.hxx index e7b19bcc9..babf12df1 100644 --- a/src/XAO/tests/FieldTest.hxx +++ b/src/XAO/tests/FieldTest.hxx @@ -3,7 +3,8 @@ #include -#include "../Xao.hxx" +#include "../XAO_Xao.hxx" +#include "../XAO_Field.hxx" namespace XAO { diff --git a/src/XAO/tests/GeometryTest.cxx b/src/XAO/tests/GeometryTest.cxx index 501f29993..cae08b67c 100644 --- a/src/XAO/tests/GeometryTest.cxx +++ b/src/XAO/tests/GeometryTest.cxx @@ -3,7 +3,7 @@ #include "TestUtils.hxx" #include "GeometryTest.hxx" -#include "../Geometry.hxx" +#include "../XAO_Geometry.hxx" using namespace XAO; diff --git a/src/XAO/tests/GeometryTest.hxx b/src/XAO/tests/GeometryTest.hxx index 6a11d240e..4cac2c91c 100644 --- a/src/XAO/tests/GeometryTest.hxx +++ b/src/XAO/tests/GeometryTest.hxx @@ -3,8 +3,6 @@ #include -#include "../Xao.hxx" - namespace XAO { class GeometryTest: public CppUnit::TestFixture diff --git a/src/XAO/tests/GroupTest.cxx b/src/XAO/tests/GroupTest.cxx index dde372cc4..ef93a388c 100644 --- a/src/XAO/tests/GroupTest.cxx +++ b/src/XAO/tests/GroupTest.cxx @@ -3,8 +3,8 @@ #include "TestUtils.hxx" #include "GroupTest.hxx" -#include "../Xao.hxx" -#include "../Group.hxx" +#include "../XAO_Xao.hxx" +#include "../XAO_Group.hxx" using namespace XAO; diff --git a/src/XAO/tests/GroupTest.hxx b/src/XAO/tests/GroupTest.hxx index 8cab813cf..ad54e0773 100644 --- a/src/XAO/tests/GroupTest.hxx +++ b/src/XAO/tests/GroupTest.hxx @@ -3,8 +3,6 @@ #include -#include "../Xao.hxx" - namespace XAO { class GroupTest: public CppUnit::TestFixture diff --git a/src/XAO/tests/ImportExportTest.cxx b/src/XAO/tests/ImportExportTest.cxx index ed66029af..a7a30727f 100644 --- a/src/XAO/tests/ImportExportTest.cxx +++ b/src/XAO/tests/ImportExportTest.cxx @@ -22,11 +22,11 @@ #include "TestUtils.hxx" #include "ImportExportTest.hxx" -#include "../Geometry.hxx" -#include "../Group.hxx" -#include "../Field.hxx" -#include "../IntegerField.hxx" -#include "../IntegerStep.hxx" +#include "../XAO_Geometry.hxx" +#include "../XAO_Group.hxx" +#include "../XAO_Field.hxx" +#include "../XAO_IntegerField.hxx" +#include "../XAO_IntegerStep.hxx" using namespace XAO; diff --git a/src/XAO/tests/ImportExportTest.hxx b/src/XAO/tests/ImportExportTest.hxx index 317760cab..2756b2ea8 100644 --- a/src/XAO/tests/ImportExportTest.hxx +++ b/src/XAO/tests/ImportExportTest.hxx @@ -3,7 +3,7 @@ #include -#include "../Xao.hxx" +#include "../XAO_Xao.hxx" namespace XAO { diff --git a/src/XAO/tests/TestUtils.hxx b/src/XAO/tests/TestUtils.hxx index c720b1dad..f754db107 100644 --- a/src/XAO/tests/TestUtils.hxx +++ b/src/XAO/tests/TestUtils.hxx @@ -2,7 +2,7 @@ #define __XAO_TESTUTILS_HXX__ #include -#include "../Xao.hxx" +#include namespace XAO { diff --git a/src/XAO/tests/XaoUtilsTest.cxx b/src/XAO/tests/XaoUtilsTest.cxx index 37d12ce2a..4781c5fbb 100644 --- a/src/XAO/tests/XaoUtilsTest.cxx +++ b/src/XAO/tests/XaoUtilsTest.cxx @@ -1,8 +1,8 @@ #include #include "XaoUtilsTest.hxx" -#include "../Xao.hxx" -#include "../XaoUtils.hxx" +#include "../XAO_Xao.hxx" +#include "../XAO_XaoUtils.hxx" using namespace XAO; diff --git a/src/XAO/tests/XaoUtilsTest.hxx b/src/XAO/tests/XaoUtilsTest.hxx index b69c66cc0..28860d80d 100644 --- a/src/XAO/tests/XaoUtilsTest.hxx +++ b/src/XAO/tests/XaoUtilsTest.hxx @@ -3,8 +3,6 @@ #include -#include "../Xao.hxx" - namespace XAO { class XaoUtilsTest: public CppUnit::TestFixture diff --git a/src/XAO/tests/coverage_report.sh b/src/XAO/tests/coverage_report.sh new file mode 100755 index 000000000..4bec866da --- /dev/null +++ b/src/XAO/tests/coverage_report.sh @@ -0,0 +1,65 @@ +#!/bin/bash + +# This script can be used to generate the code coverage report. +# Important: the library needs to be compiled in debug mode and with coverage option +# add to configure options: +# CXXFLAGS="-fprofile-arcs -ftest-coverage" +# CFLAGS="-fprofile-arcs -ftest-coverage" + +# to run the script: +# > cd BUILD/GEOM/src/XAO +# > make +# > cd tests +# > make +# > cp ../.libs/*.gcno . +# > ./TestXAO +# > cp ../.libs/*.gcda . +# > ./coverage_report XAO + +QUIET=--quiet +# report directory +REPORT_PATH=report +# browser to open the report +BROWSER=firefox +# name for the info file +TITLE=$1 + +# initialize +if [[ $TITLE == "--reset" ]] +then + lcov --base-directory . --directory . --zerocounters -q + echo "Reset counters" + exit 0 +fi + + +if [ -z $TITLE ] +then + echo $TITLE "name is required" + exit 1 +fi + +INFO_FILE=${TITLE}.info +if [ -f $INFO_FILE ] +then + rm -f $INFO_FILE +fi + +# collecte des données +lcov --directory . --capture --output-file $INFO_FILE + +# suppression des symboles externes +lcov --remove $INFO_FILE "/usr*" -o $INFO_FILE $QUIET +# prerequisites +lcov --remove $INFO_FILE "/home2/*" -o $INFO_FILE $QUIET + +# suppression des tests +lcov --remove $INFO_FILE "*/tests/*" -o $INFO_FILE $QUIET + +# génération du rapport +genhtml --output-directory $REPORT_PATH --title $TITLE --num-spaces 4 $INFO_FILE + +if [ ! -z $BROWSER ] +then + $BROWSER $REPORT_PATH/index.html & +fi \ No newline at end of file -- 2.39.2