From: abd Date: Wed, 9 Apr 2008 09:11:25 +0000 (+0000) Subject: first executable version X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fe6220c161d46a8cd935a349579b0467144fafd5;p=modules%2Fsmesh.git first executable version --- diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx index 51d62037b..b15d32c49 100644 --- a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx @@ -92,6 +92,8 @@ #include #include +using namespace std; + #define SPACING 5 #define MARGIN 10 diff --git a/src/SMESHGUI/SMESHGUI_EditMeshDlg.h b/src/SMESHGUI/SMESHGUI_EditMeshDlg.h index f511b049f..5a0279d9c 100644 --- a/src/SMESHGUI/SMESHGUI_EditMeshDlg.h +++ b/src/SMESHGUI/SMESHGUI_EditMeshDlg.h @@ -78,7 +78,7 @@ class SMESHGUI_EXPORT SMESHGUI_EditMeshDlg : public QDialog void onEditGroup(); void FindGravityCenter(TColStd_MapOfInteger & ElemsIdMap, - list< gp_XYZ > & GrCentersXYZ); + std::list< gp_XYZ > & GrCentersXYZ); // add the centers of gravity of ElemsIdMap elements to the GrCentersXYZ list private: diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx index 11d298a6d..91eb0edf5 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx @@ -74,6 +74,8 @@ #include #include +using namespace std; + //================================================================================ /*! * \brief Constructor diff --git a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx index ccbdaff7d..fafbf8cb1 100644 --- a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx @@ -56,7 +56,7 @@ namespace SMESH QString name = baseName; while ( !aStudy->FindObjectByName( name.latin1(), "SMESH" ).empty() ) { int nb = 0; - if ( name[ name.length()-1 ].isNumber() ) { + if ( name.at( name.length()-1 ).isNumber() ) { int nbBeg = name.findRev("_"); nb = name.right( name.length() - nbBeg - 1 ).toInt(); name = name.left( nbBeg ); diff --git a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx index 51881af42..7faa62610 100644 --- a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx @@ -67,6 +67,8 @@ #include #include +using namespace std; + #define SPACING 5 #define MARGIN 10 diff --git a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx index 201b1c126..3dce515d8 100755 --- a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx @@ -63,6 +63,7 @@ #include #include +using namespace std; #define SPACING 5 #define MARGIN 10 diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.h b/src/SMESHGUI/SMESHGUI_VTKUtils.h index dc1ed57a9..bd65df648 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.h +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.h @@ -59,7 +59,7 @@ class SALOME_Actor; namespace SMESH { //---------------------------------------------------------------------------- - typedef pair TKeyOfVisualObj; + typedef std::pair TKeyOfVisualObj; SMESHGUI_EXPORT TVisualObjPtr GetVisualObj(int theStudyId, diff --git a/src/SMESH_I/SMESH_MEDFamily_i.hxx b/src/SMESH_I/SMESH_MEDFamily_i.hxx index 4dd63f3a1..e530c2e74 100644 --- a/src/SMESH_I/SMESH_MEDFamily_i.hxx +++ b/src/SMESH_I/SMESH_MEDFamily_i.hxx @@ -48,16 +48,16 @@ protected : int _numberOfAttribute; int * _attributeIdentifier; int * _attributeValue; - string * _attributeDescription; + std::string * _attributeDescription; int _numberOfGroup ; - string * _groupName ; + std::string * _groupName ; public : // Constructors and associated internal methods SMESH_MEDFamily_i(int identifier, SMESH_subMesh_i* sm, - string name, string description, SALOME_MED::medEntityMesh entity ); + std::string name, std::string description, SALOME_MED::medEntityMesh entity ); SMESH_MEDFamily_i(const SMESH_MEDFamily_i & f); // IDL Methods diff --git a/src/SMESH_I/SMESH_MEDMesh_i.hxx b/src/SMESH_I/SMESH_MEDMesh_i.hxx index 05fe0727d..f14ea173e 100644 --- a/src/SMESH_I/SMESH_MEDMesh_i.hxx +++ b/src/SMESH_I/SMESH_MEDMesh_i.hxx @@ -55,22 +55,22 @@ protected: ::SMESH_Mesh_i * _mesh_i; SMESHDS_Mesh *_meshDS; - string _meshId; + std::string _meshId; bool _compte; bool _creeFamily; int _indexElts; int _indexEnts; int _famIdent; - map < SALOME_MED::medGeometryElement, int >_mapIndToSeqElts; + std::map < SALOME_MED::medGeometryElement, int >_mapIndToSeqElts; SALOME_MED::long_array_var _seq_elemId[MED_NBR_GEOMETRIE_MAILLE]; - map < SALOME_MED::medEntityMesh, int >_mapNbTypes; - map < SALOME_MED::medEntityMesh, int >_mapIndToVectTypes; - vector < SALOME_MED::medGeometryElement > + std::map < SALOME_MED::medEntityMesh, int >_mapNbTypes; + std::map < SALOME_MED::medEntityMesh, int >_mapIndToVectTypes; + std::vector < SALOME_MED::medGeometryElement > _TypesId[MED_NBR_GEOMETRIE_MAILLE]; - vector < SALOME_MED::FAMILY_ptr > _families; + std::vector < SALOME_MED::FAMILY_ptr > _families; public: // Constructors and associated internal methods diff --git a/src/SMESH_I/SMESH_MEDSupport_i.hxx b/src/SMESH_I/SMESH_MEDSupport_i.hxx index 3a1d164e2..9f78b16cd 100644 --- a/src/SMESH_I/SMESH_MEDSupport_i.hxx +++ b/src/SMESH_I/SMESH_MEDSupport_i.hxx @@ -31,7 +31,6 @@ #include #include CORBA_SERVER_HEADER(MED) -#include #include "SMESHDS_Mesh.hxx" #include "SMESHDS_SubMesh.hxx" @@ -40,6 +39,7 @@ #include "SMESH_MEDSupport_i.hxx" #include "SALOME_GenericObj_i.hh" +#include class SMESH_subMesh_i; class SMESH_I_EXPORT SMESH_MEDSupport_i: @@ -49,7 +49,7 @@ class SMESH_I_EXPORT SMESH_MEDSupport_i: // Constructors and associated internal methods SMESH_MEDSupport_i(SMESH_subMesh_i * sm, - string name, string description, SALOME_MED::medEntityMesh entity); + std::string name, std::string description, SALOME_MED::medEntityMesh entity); SMESH_MEDSupport_i(const SMESH_MEDSupport_i & s); // IDL Methods @@ -102,8 +102,8 @@ class SMESH_I_EXPORT SMESH_MEDSupport_i: ::SMESH_subMesh_i * _subMesh_i; SMESHDS_Mesh * _meshDS; - string _name; - string _description; + std::string _name; + std::string _description; bool _isOnAllElements; bool _seqNumber; int _seqLength; diff --git a/src/SMESH_I/SMESH_Mesh_i.hxx b/src/SMESH_I/SMESH_Mesh_i.hxx index d76ade836..54842e09d 100644 --- a/src/SMESH_I/SMESH_Mesh_i.hxx +++ b/src/SMESH_I/SMESH_Mesh_i.hxx @@ -326,7 +326,7 @@ public: SMESH::SMESH_subMesh_ptr getSubMesh(int shapeID); // return an existing subMesh object for the shapeID. shapeID == submeshID. - const map& getGroups() { return _mapGroups; } + const std::map& getGroups() { return _mapGroups; } // return an existing group object. /*! @@ -437,8 +437,8 @@ public: SMESH::double_array* BaryCenter(CORBA::Long id); - map _mapSubMesh_i; //NRI - map _mapSubMesh; //NRI + std::map _mapSubMesh_i; //NRI + std::map _mapSubMesh; //NRI private: @@ -447,9 +447,9 @@ private: SMESH_Gen_i* _gen_i; int _id; // id given by creator (unique within the creator instance) int _studyId; - map _mapSubMeshIor; - map _mapGroups; - map _mapHypo; + std::map _mapSubMeshIor; + std::map _mapGroups; + std::map _mapHypo; }; #endif diff --git a/src/StdMeshers/StdMeshers_Distribution.cxx b/src/StdMeshers/StdMeshers_Distribution.cxx index fce8298f4..84e99b20c 100644 --- a/src/StdMeshers/StdMeshers_Distribution.cxx +++ b/src/StdMeshers/StdMeshers_Distribution.cxx @@ -41,6 +41,8 @@ #include #endif +using namespace std; + Function::Function( const int conv ) : myConv( conv ) { diff --git a/src/StdMeshers/StdMeshers_Distribution.hxx b/src/StdMeshers/StdMeshers_Distribution.hxx index 2dafda44b..124e4e8bc 100644 --- a/src/StdMeshers/StdMeshers_Distribution.hxx +++ b/src/StdMeshers/StdMeshers_Distribution.hxx @@ -105,14 +105,14 @@ STDMESHERS_EXPORT bool buildDistribution( const Function& f, const double start, const double end, const int nbSeg, - vector& data, + std::vector& data, const double eps ); STDMESHERS_EXPORT bool buildDistribution( const TCollection_AsciiString& f, const int conv, const double start, const double end, - const int nbSeg, vector& data, const double eps ); + const int nbSeg, std::vector& data, const double eps ); STDMESHERS_EXPORT bool buildDistribution( const std::vector& f, const int conv, const double start, const double end, - const int nbSeg, vector& data, const double eps ); + const int nbSeg, std::vector& data, const double eps ); #endif diff --git a/src/StdMeshers/StdMeshers_Penta_3D.hxx b/src/StdMeshers/StdMeshers_Penta_3D.hxx index 90eab4c74..0f69e68a5 100644 --- a/src/StdMeshers/StdMeshers_Penta_3D.hxx +++ b/src/StdMeshers/StdMeshers_Penta_3D.hxx @@ -97,7 +97,7 @@ protected: TopTools_IndexedMapOfOrientedShape myShapeIDMap; SMESH_Block myTBlock; TopoDS_Shape myEmptyShape; - vector myIsEdgeForward; + std::vector myIsEdgeForward; // int myErrorStatus; }; @@ -214,10 +214,10 @@ class STDMESHERS_EXPORT StdMeshers_Penta_3D { void MakeNodes(); - double SetHorizEdgeXYZ(const gp_XYZ& aBNXYZ, - const int aFaceID, - vector*& aCol1, - vector*& aCol2); + double SetHorizEdgeXYZ(const gp_XYZ& aBNXYZ, + const int aFaceID, + std::vector*& aCol1, + std::vector*& aCol2); void ShapeSupportID(const bool theIsUpperLayer, const SMESH_Block::TShapeID theBNSSID, @@ -256,14 +256,14 @@ class STDMESHERS_EXPORT StdMeshers_Penta_3D { void * myMesh; SMESH_ComputeErrorPtr myErrorStatus; // - vector myTNodes; + std::vector myTNodes; int myISize; int myJSize; double myTol3D; // Tolerance value std::map < int, int > myConnectingMap; // - vector myWallNodesMaps; // nodes on a face - vector myShapeXYZ; // point on each sub-shape + std::vector myWallNodesMaps; // nodes on a face + std::vector myShapeXYZ; // point on each sub-shape bool myCreateQuadratic; SMESH_MesherHelper* myTool; // tool building quadratic elements diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx index 3e143481a..a737d671b 100644 --- a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx +++ b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx @@ -65,6 +65,8 @@ #include #include +using namespace std; + #define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; } #define SHOW_VERTEX(v,msg) // { \ diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.hxx b/src/StdMeshers/StdMeshers_ProjectionUtils.hxx index 8d3939c2d..3d5111508 100644 --- a/src/StdMeshers/StdMeshers_ProjectionUtils.hxx +++ b/src/StdMeshers/StdMeshers_ProjectionUtils.hxx @@ -87,8 +87,8 @@ class StdMeshers_ProjectionUtils TopoDS_Vertex VV1[2], const TopoDS_Face& face2, TopoDS_Vertex VV2[2], - list< TopoDS_Edge > & edges1, - list< TopoDS_Edge > & edges2); + std::list< TopoDS_Edge > & edges1, + std::list< TopoDS_Edge > & edges2); /*! * \brief Insert vertex association defined by a hypothesis into a map diff --git a/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx b/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx index e0eedabdb..780d97d83 100644 --- a/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx +++ b/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx @@ -49,7 +49,7 @@ public: }; -class StdMeshers_UseExisting_1D: public SMESH_1D_Algo +class STDMESHERS_EXPORT StdMeshers_UseExisting_1D: public SMESH_1D_Algo { public: StdMeshers_UseExisting_1D(int hypId, int studyId, SMESH_Gen* gen); diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx index 85ec4d6b4..954beab10 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx @@ -40,6 +40,8 @@ #include "SALOME_ListIO.hxx" #include "SALOMEDSClient_SObject.hxx" +using namespace std; + //================================================================================ /*! * \brief Constructor initialized by filter diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx index a53902294..82d7f9d95 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx @@ -27,7 +27,6 @@ // Module : SMESH // $Header$ -using namespace std; #include "StdMeshers_NumberOfSegments_i.hxx" #include "SMESH_Gen_i.hxx" #include "SMESH_Gen.hxx" @@ -38,6 +37,8 @@ using namespace std; #include +using namespace std; + //============================================================================= /*! * StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx index e3d5f4eeb..a1543f7a5 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx @@ -26,8 +26,6 @@ // Module : SMESH // $Header$ -using namespace std; - #include "StdMeshers_ProjectionSource1D_i.hxx" #include "SMESH_Gen_i.hxx" @@ -39,6 +37,8 @@ using namespace std; #include "StdMeshers_ObjRefUlils.hxx" +using namespace std; + //============================================================================= /*! * StdMeshers_ProjectionSource1D_i::StdMeshers_ProjectionSource1D_i