Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/V8_5_asterstudy'
[modules/smesh.git]
/
src
/
StdMeshers_I
/
StdMeshers_CartesianParameters3D_i.cxx
diff --git
a/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx
b/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx
index cd90066a0da17cdd200bc5439d411158f477d592..18c7426e8a3ac44c5b1fc7e8d8c6b59c51626fae 100644
(file)
--- a/
src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx
+++ b/
src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-59,14
+59,11
@@
namespace
StdMeshers_CartesianParameters3D_i::
StdMeshers_CartesianParameters3D_i( PortableServer::POA_ptr thePOA,
StdMeshers_CartesianParameters3D_i::
StdMeshers_CartesianParameters3D_i( PortableServer::POA_ptr thePOA,
- int theStudyId,
::SMESH_Gen* theGenImpl )
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA )
{
::SMESH_Gen* theGenImpl )
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA )
{
- MESSAGE( "StdMeshers_CartesianParameters3D_i::StdMeshers_CartesianParameters3D_i" );
myBaseImpl = new ::StdMeshers_CartesianParameters3D( theGenImpl->GetANewId(),
myBaseImpl = new ::StdMeshers_CartesianParameters3D( theGenImpl->GetANewId(),
- theStudyId,
theGenImpl );
}
theGenImpl );
}
@@
-80,7
+77,6
@@
StdMeshers_CartesianParameters3D_i( PortableServer::POA_ptr thePOA,
StdMeshers_CartesianParameters3D_i::~StdMeshers_CartesianParameters3D_i()
{
StdMeshers_CartesianParameters3D_i::~StdMeshers_CartesianParameters3D_i()
{
- MESSAGE( "StdMeshers_CartesianParameters3D_i::~StdMeshers_CartesianParameters3D_i" );
}
//=============================================================================
}
//=============================================================================
@@
-169,8
+165,8
@@
CORBA::Double StdMeshers_CartesianParameters3D_i::GetSizeThreshold()
//\brief Set grid spacing along the three axes
// \param spaceFunctions - functions defining spacing values at given point on axis
// \param internalPoints - points dividing a grid into parts along each direction
//\brief Set grid spacing along the three axes
// \param spaceFunctions - functions defining spacing values at given point on axis
// \param internalPoints - points dividing a grid into parts along each direction
-// Parameter t of spaceFunction f(t) is a position [0,1] within
g
bounding box of
-// the shape to mesh or within
g
an interval defined by internal points
+// Parameter t of spaceFunction f(t) is a position [0,1] within bounding box of
+// the shape to mesh or within an interval defined by internal points
//=======================================================================
void StdMeshers_CartesianParameters3D_i::SetGridSpacing(const SMESH::string_array& spaceFunctions,
//=======================================================================
void StdMeshers_CartesianParameters3D_i::SetGridSpacing(const SMESH::string_array& spaceFunctions,
@@
-178,8
+174,8
@@
void StdMeshers_CartesianParameters3D_i::SetGridSpacing(const SMESH::string_arra
CORBA::Short axis)
throw (SALOME::SALOME_Exception)
{
CORBA::Short axis)
throw (SALOME::SALOME_Exception)
{
-
vector<
string> funVec;
-
vector<double>
pointVec;
+
std::vector<std::
string> funVec;
+
std::vector<double>
pointVec;
_array2vec( spaceFunctions, funVec, (const char*) );
_array2vec( internalPoints, pointVec, );
_array2vec( spaceFunctions, funVec, (const char*) );
_array2vec( internalPoints, pointVec, );
@@
-209,8
+205,8
@@
void StdMeshers_CartesianParameters3D_i::GetGridSpacing(SMESH::string_array_out
{
ASSERT( myBaseImpl );
try {
{
ASSERT( myBaseImpl );
try {
-
vector<
string> funVec;
-
vector<double>
pointVec;
+
std::vector<std::
string> funVec;
+
std::vector<double>
pointVec;
this->GetImpl()->GetGridSpacing( funVec, pointVec, axis );
xSpaceFunctions = new SMESH::string_array();
this->GetImpl()->GetGridSpacing( funVec, pointVec, axis );
xSpaceFunctions = new SMESH::string_array();
@@
-394,8
+390,8
@@
StdMeshers_CartesianParameters3D_i::ComputeCoordinates(CORBA::Double
const char* axisName )
throw (SALOME::SALOME_Exception)
{
const char* axisName )
throw (SALOME::SALOME_Exception)
{
-
vector<
string> xFuns;
-
vector<double>
xPoints, coords;
+
std::vector<std::
string> xFuns;
+
std::vector<double>
xPoints, coords;
_array2vec( spaceFuns, xFuns, (const char*) );
_array2vec( points, xPoints, );
_array2vec( spaceFuns, xFuns, (const char*) );
_array2vec( points, xPoints, );
@@
-419,7
+415,6
@@
StdMeshers_CartesianParameters3D_i::ComputeCoordinates(CORBA::Double
::StdMeshers_CartesianParameters3D* StdMeshers_CartesianParameters3D_i::GetImpl()
{
::StdMeshers_CartesianParameters3D* StdMeshers_CartesianParameters3D_i::GetImpl()
{
- MESSAGE( "StdMeshers_CartesianParameters3D_i::GetImpl" );
return ( ::StdMeshers_CartesianParameters3D* )myBaseImpl;
}
return ( ::StdMeshers_CartesianParameters3D* )myBaseImpl;
}