rename files XAO_* to follow SALOME standard

This commit is contained in:
fps 2013-09-06 12:39:33 +00:00
parent 53f4fa8d2f
commit 285715917c
49 changed files with 223 additions and 185 deletions

View File

@ -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) \

View File

@ -18,12 +18,12 @@
//
// Author : Frederic Pons (OpenCascade)
#include "BooleanField.hxx"
#include "BooleanStep.hxx"
#include "XaoUtils.hxx"
#include <Utils_SALOME_Exception.hxx>
#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,

View File

@ -21,13 +21,11 @@
#ifndef __XAO_BOOLEANFIELD_HXX__
#define __XAO_BOOLEANFIELD_HXX__
#include <iostream>
#include <string>
#include <vector>
#include "Xao.hxx"
#include "Field.hxx"
#include "BooleanStep.hxx"
#include "XAO_Xao.hxx"
#include "XAO_Field.hxx"
#include "XAO_BooleanStep.hxx"
namespace XAO
{

View File

@ -19,8 +19,9 @@
// Author : Frederic Pons (OpenCascade)
#include <Utils_SALOME_Exception.hxx>
#include "BooleanStep.hxx"
#include "XaoUtils.hxx"
#include "XAO_BooleanStep.hxx"
#include "XAO_XaoUtils.hxx"
using namespace XAO;

View File

@ -22,11 +22,10 @@
#ifndef __XAO_BOOLEANSTEP_HXX__
#define __XAO_BOOLEANSTEP_HXX__
#include <map>
#include <vector>
#include "Xao.hxx"
#include "Step.hxx"
#include "XAO_Xao.hxx"
#include "XAO_Step.hxx"
namespace XAO
{

View File

@ -31,9 +31,6 @@
#include <TopTools_IndexedMapOfShape.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
//#include <TColStd_ListIteratorOfListOfInteger.hxx>
//#include <TColStd_HArray1OfInteger.hxx>
//#include <TColStd_HSequenceOfInteger.hxx>
#include <GProp_GProps.hxx>
#include <BRepGProp.hxx>
#include <TopoDS.hxx>
@ -41,8 +38,8 @@
#include <Utils_SALOME_Exception.hxx>
#include "BrepGeometry.hxx"
#include "XaoUtils.hxx"
#include "XAO_BrepGeometry.hxx"
#include "XAO_XaoUtils.hxx"
using namespace XAO;

View File

@ -26,8 +26,8 @@
#include <TopoDS_Shape.hxx>
#include "Xao.hxx"
#include "Geometry.hxx"
#include "XAO_Xao.hxx"
#include "XAO_Geometry.hxx"
namespace XAO
{

View File

@ -18,12 +18,12 @@
//
// Author : Frederic Pons (OpenCascade)
#include "DoubleField.hxx"
#include "DoubleStep.hxx"
#include "XaoUtils.hxx"
#include <Utils_SALOME_Exception.hxx>
#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)

View File

@ -21,14 +21,11 @@
#ifndef __XAO_DOUBLEFIELD_HXX__
#define __XAO_DOUBLEFIELD_HXX__
#include <iostream>
#include <string>
#include <vector>
#include <map>
#include "Xao.hxx"
#include "Field.hxx"
#include "DoubleStep.hxx"
#include "XAO_Xao.hxx"
#include "XAO_Field.hxx"
#include "XAO_DoubleStep.hxx"
namespace XAO
{

View File

@ -18,9 +18,10 @@
//
// Author : Frederic Pons (OpenCascade)
#include "DoubleStep.hxx"
#include <Utils_SALOME_Exception.hxx>
#include "XaoUtils.hxx"
#include "XAO_DoubleStep.hxx"
#include "XAO_XaoUtils.hxx"
using namespace XAO;

View File

@ -24,8 +24,8 @@
#include <vector>
#include "Xao.hxx"
#include "Step.hxx"
#include "XAO_Xao.hxx"
#include "XAO_Step.hxx"
namespace XAO
{

View File

@ -22,13 +22,13 @@
#include <iostream>
#include <Utils_SALOME_Exception.hxx>
#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;

View File

@ -21,13 +21,11 @@
#ifndef __XAO_FIELD_HXX__
#define __XAO_FIELD_HXX__
#include <iostream>
#include <string>
#include <vector>
#include <map>
#include "Xao.hxx"
#include "Step.hxx"
#include "XAO_Xao.hxx"
#include "XAO_Step.hxx"
namespace XAO
{

View File

@ -20,8 +20,8 @@
#include <Utils_SALOME_Exception.hxx>
#include "GeometricElement.hxx"
#include "XaoUtils.hxx"
#include "XAO_GeometricElement.hxx"
#include "XAO_XaoUtils.hxx"
using namespace XAO;

View File

@ -20,9 +20,9 @@
#include <Utils_SALOME_Exception.hxx>
#include "XaoUtils.hxx"
#include "Geometry.hxx"
#include "BrepGeometry.hxx"
#include "XAO_XaoUtils.hxx"
#include "XAO_Geometry.hxx"
#include "XAO_BrepGeometry.hxx"
using namespace XAO;

View File

@ -23,8 +23,8 @@
#include <string>
#include "Xao.hxx"
#include "GeometricElement.hxx"
#include "XAO_Xao.hxx"
#include "XAO_GeometricElement.hxx"
namespace XAO
{

View File

@ -20,8 +20,8 @@
#include <Utils_SALOME_Exception.hxx>
#include "XaoUtils.hxx"
#include "Group.hxx"
#include "XAO_XaoUtils.hxx"
#include "XAO_Group.hxx"
using namespace XAO;

View File

@ -21,11 +21,10 @@
#ifndef __XAO_GROUP_HXX__
#define __XAO_GROUP_HXX__
# include <iostream>
#include <string>
#include <set>
#include "Xao.hxx"
#include "XAO_Xao.hxx"
namespace XAO
{

View File

@ -18,12 +18,12 @@
//
// Author : Frederic Pons (OpenCascade)
#include "IntegerField.hxx"
#include "IntegerStep.hxx"
#include "XaoUtils.hxx"
#include <Utils_SALOME_Exception.hxx>
#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)

View File

@ -21,14 +21,11 @@
#ifndef __XAO_INTEGERFIELD_HXX__
#define __XAO_INTEGERFIELD_HXX__
#include <iostream>
#include <string>
#include <vector>
#include <map>
#include "Xao.hxx"
#include "Field.hxx"
#include "IntegerStep.hxx"
#include "XAO_Xao.hxx"
#include "XAO_Field.hxx"
#include "XAO_IntegerStep.hxx"
namespace XAO
{

View File

@ -18,9 +18,10 @@
//
// Author : Frederic Pons (OpenCascade)
#include "IntegerStep.hxx"
#include <Utils_SALOME_Exception.hxx>
#include "XaoUtils.hxx"
#include "XAO_IntegerStep.hxx"
#include "XAO_XaoUtils.hxx"
using namespace XAO;

View File

@ -24,8 +24,8 @@
#include <vector>
#include "Xao.hxx"
#include "Step.hxx"
#include "XAO_Xao.hxx"
#include "XAO_Step.hxx"
namespace XAO
{

View File

@ -20,13 +20,13 @@
#include <Utils_SALOME_Exception.hxx>
#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;

View File

@ -22,7 +22,7 @@
#ifndef __XAO_STEP_HXX__
#define __XAO_STEP_HXX__
#include "Xao.hxx"
#include "XAO_Xao.hxx"
namespace XAO
{

View File

@ -18,12 +18,12 @@
//
// Author : Frederic Pons (OpenCascade)
#include "StringField.hxx"
#include "StringStep.hxx"
#include "XaoUtils.hxx"
#include <Utils_SALOME_Exception.hxx>
#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)

View File

@ -21,14 +21,11 @@
#ifndef __XAO_STRINGFIELD_HXX__
#define __XAO_STRINGFIELD_HXX__
#include <iostream>
#include <string>
#include <vector>
#include <map>
#include "Xao.hxx"
#include "Field.hxx"
#include "StringStep.hxx"
#include "XAO_Xao.hxx"
#include "XAO_Field.hxx"
#include "XAO_StringStep.hxx"
namespace XAO
{

View File

@ -18,9 +18,10 @@
//
// Author : Frederic Pons (OpenCascade)
#include "StringStep.hxx"
#include <Utils_SALOME_Exception.hxx>
#include "XAO_StringStep.hxx"
using namespace XAO;
StringStep::StringStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents)

View File

@ -25,8 +25,8 @@
#include <string>
#include <vector>
#include "Xao.hxx"
#include "Step.hxx"
#include "XAO_Xao.hxx"
#include "XAO_Step.hxx"
namespace XAO
{

View File

@ -18,16 +18,15 @@
//
// Author : Nathalie Gore (OpenCascade), Frederic Pons (OpenCascade)
#include <libxml/parser.h>
#include "XaoUtils.hxx"
#include "Xao.hxx"
#include "Geometry.hxx"
#include "Group.hxx"
#include "Field.hxx"
#include "XaoExporter.hxx"
#include <Utils_SALOME_Exception.hxx>
#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";

View File

@ -23,7 +23,6 @@
#include <string>
#include <list>
#include <libxml/parser.h>
namespace XAO
{

View File

@ -2,17 +2,13 @@
#include <libxml/parser.h>
#include <Utils_SALOME_Exception.hxx>
#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
{

View File

@ -4,10 +4,10 @@
#include <libxml/parser.h>
#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
{

View File

@ -23,8 +23,8 @@
#include <iosfwd>
#include <Utils_SALOME_Exception.hxx>
#include "Xao.hxx"
#include "XaoUtils.hxx"
#include "XAO_Xao.hxx"
#include "XAO_XaoUtils.hxx"
using namespace XAO;

View File

@ -24,8 +24,8 @@
#include <sstream>
#include <string>
#include "Xao.hxx"
#include "Field.hxx"
#include "XAO_Xao.hxx"
#include "XAO_Field.hxx"
namespace XAO
{

View File

@ -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;

View File

@ -3,8 +3,6 @@
#include <cppunit/extensions/HelperMacros.h>
#include "../Xao.hxx"
namespace XAO
{
class BrepGeometryTest: public CppUnit::TestFixture

View File

@ -2,14 +2,14 @@
#include <Utils_SALOME_Exception.hxx>
#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;

View File

@ -3,7 +3,8 @@
#include <cppunit/extensions/HelperMacros.h>
#include "../Xao.hxx"
#include "../XAO_Xao.hxx"
#include "../XAO_Field.hxx"
namespace XAO
{

View File

@ -3,7 +3,7 @@
#include "TestUtils.hxx"
#include "GeometryTest.hxx"
#include "../Geometry.hxx"
#include "../XAO_Geometry.hxx"
using namespace XAO;

View File

@ -3,8 +3,6 @@
#include <cppunit/extensions/HelperMacros.h>
#include "../Xao.hxx"
namespace XAO
{
class GeometryTest: public CppUnit::TestFixture

View File

@ -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;

View File

@ -3,8 +3,6 @@
#include <cppunit/extensions/HelperMacros.h>
#include "../Xao.hxx"
namespace XAO
{
class GroupTest: public CppUnit::TestFixture

View File

@ -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;

View File

@ -3,7 +3,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include "../Xao.hxx"
#include "../XAO_Xao.hxx"
namespace XAO
{

View File

@ -2,7 +2,7 @@
#define __XAO_TESTUTILS_HXX__
#include <fstream>
#include "../Xao.hxx"
#include <cstdlib>
namespace XAO
{

View File

@ -1,8 +1,8 @@
#include <Utils_SALOME_Exception.hxx>
#include "XaoUtilsTest.hxx"
#include "../Xao.hxx"
#include "../XaoUtils.hxx"
#include "../XAO_Xao.hxx"
#include "../XAO_XaoUtils.hxx"
using namespace XAO;

View File

@ -3,8 +3,6 @@
#include <cppunit/extensions/HelperMacros.h>
#include "../Xao.hxx"
namespace XAO
{
class XaoUtilsTest: public CppUnit::TestFixture

View File

@ -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