ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-15 17:23:08 +05:00
Code Issues Packages Projects Releases Wiki Activity

first executable version

Browse Source
This commit is contained in:
abd 2008-04-09 09:11:25 +00:00
parent ee9052e3b5
commit fe6220c161
20 changed files with 53 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
View File

@ -92,6 +92,8 @@
#include <vector>
#include <set>
using namespace std;
#define SPACING 5
#define MARGIN 10

2
src/SMESHGUI/SMESHGUI_EditMeshDlg.h
View File

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

2
src/SMESHGUI/SMESHGUI_MeshOp.cxx
View File

@ -74,6 +74,8 @@
#include <TopoDS_Shape.hxx>
#include <TopExp_Explorer.hxx>
using namespace std;
//================================================================================
/*!
* \brief Constructor

2
src/SMESHGUI/SMESHGUI_MeshUtils.cxx
View File

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

2
src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
View File

@ -67,6 +67,8 @@
#include <qapplication.h>
#include <qstringlist.h>
using namespace std;
#define SPACING 5
#define MARGIN 10

1
src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
View File

@ -63,6 +63,7 @@
#include <qmessagebox.h>
#include <qvalidator.h>
using namespace std;
#define SPACING 5
#define MARGIN 10

2
src/SMESHGUI/SMESHGUI_VTKUtils.h
View File

@ -59,7 +59,7 @@ class SALOME_Actor;
namespace SMESH {
//----------------------------------------------------------------------------
typedef pair<int,string> TKeyOfVisualObj;
typedef std::pair<int,std::string> TKeyOfVisualObj;
SMESHGUI_EXPORT
TVisualObjPtr GetVisualObj(int theStudyId,

6
src/SMESH_I/SMESH_MEDFamily_i.hxx
View File

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

12
src/SMESH_I/SMESH_MEDMesh_i.hxx
View File

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

8
src/SMESH_I/SMESH_MEDSupport_i.hxx
View File

@ -31,7 +31,6 @@
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(MED)
#include <string>
#include "SMESHDS_Mesh.hxx"
#include "SMESHDS_SubMesh.hxx"
@ -40,6 +39,7 @@
#include "SMESH_MEDSupport_i.hxx"
#include "SALOME_GenericObj_i.hh"
#include <string>
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;

12
src/SMESH_I/SMESH_Mesh_i.hxx
View File

@ -326,7 +326,7 @@ public:
SMESH::SMESH_subMesh_ptr getSubMesh(int shapeID);
// return an existing subMesh object for the shapeID. shapeID == submeshID.
const map<int, SMESH::SMESH_GroupBase_ptr>& getGroups() { return _mapGroups; }
const std::map<int, SMESH::SMESH_GroupBase_ptr>& getGroups() { return _mapGroups; }
// return an existing group object.
/*!
@ -437,8 +437,8 @@ public:
SMESH::double_array* BaryCenter(CORBA::Long id);
map<int, SMESH_subMesh_i*> _mapSubMesh_i; //NRI
map<int, ::SMESH_subMesh*> _mapSubMesh; //NRI
std::map<int, SMESH_subMesh_i*> _mapSubMesh_i; //NRI
std::map<int, ::SMESH_subMesh*> _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<int, SMESH::SMESH_subMesh_ptr> _mapSubMeshIor;
map<int, SMESH::SMESH_GroupBase_ptr> _mapGroups;
map<int, SMESH::SMESH_Hypothesis_ptr> _mapHypo;
std::map<int, SMESH::SMESH_subMesh_ptr> _mapSubMeshIor;
std::map<int, SMESH::SMESH_GroupBase_ptr> _mapGroups;
std::map<int, SMESH::SMESH_Hypothesis_ptr> _mapHypo;
};
#endif

2
src/StdMeshers/StdMeshers_Distribution.cxx
View File

@ -41,6 +41,8 @@
#include <Standard_ErrorHandler.hxx>
#endif
using namespace std;
Function::Function( const int conv )
: myConv( conv )
{

6
src/StdMeshers/StdMeshers_Distribution.hxx
View File

@ -105,14 +105,14 @@ STDMESHERS_EXPORT
bool buildDistribution( const Function& f,
const double start, const double end,
const int nbSeg,
vector<double>& data,
std::vector<double>& 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<double>& data, const double eps );
const int nbSeg, std::vector<double>& data, const double eps );
STDMESHERS_EXPORT
bool buildDistribution( const std::vector<double>& f, const int conv, const double start, const double end,
const int nbSeg, vector<double>& data, const double eps );
const int nbSeg, std::vector<double>& data, const double eps );
#endif

16
src/StdMeshers/StdMeshers_Penta_3D.hxx
View File

@ -97,7 +97,7 @@ protected:
TopTools_IndexedMapOfOrientedShape myShapeIDMap;
SMESH_Block myTBlock;
TopoDS_Shape myEmptyShape;
vector<int> myIsEdgeForward;
std::vector<int> 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<const SMDS_MeshNode*>*& aCol1,
vector<const SMDS_MeshNode*>*& aCol2);
double SetHorizEdgeXYZ(const gp_XYZ& aBNXYZ,
const int aFaceID,
std::vector<const SMDS_MeshNode*>*& aCol1,
std::vector<const SMDS_MeshNode*>*& 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 <StdMeshers_TNode> myTNodes;
std::vector <StdMeshers_TNode> myTNodes;
int myISize;
int myJSize;
double myTol3D; // Tolerance value
std::map < int, int > myConnectingMap;
//
vector<StdMeshers_IJNodeMap> myWallNodesMaps; // nodes on a face
vector<gp_XYZ> myShapeXYZ; // point on each sub-shape
std::vector<StdMeshers_IJNodeMap> myWallNodesMaps; // nodes on a face
std::vector<gp_XYZ> myShapeXYZ; // point on each sub-shape
bool myCreateQuadratic;
SMESH_MesherHelper* myTool; // tool building quadratic elements

2
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
View File

@ -65,6 +65,8 @@
#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
using namespace std;
#define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; }
#define SHOW_VERTEX(v,msg) // { \

4
src/StdMeshers/StdMeshers_ProjectionUtils.hxx
View File

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

2
src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
View File

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

2
src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
View File

@ -40,6 +40,8 @@
#include "SALOME_ListIO.hxx"
#include "SALOMEDSClient_SObject.hxx"
using namespace std;
//================================================================================
/*!
* \brief Constructor initialized by filter

3
src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
View File

@ -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 <TCollection_AsciiString.hxx>
using namespace std;
//=============================================================================
/*!
* StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i

4
src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
View File

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