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_NumberOfSegments_i.cxx
diff --git
a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
index c9047fb7ae7a57c14af5e83ff977a42957d2509b..c61aa3785b538b316a445bc773100a9ab58ac2f6 100644
(file)
--- a/
src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
+++ b/
src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
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
@@
-20,7
+20,7
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH SMESH_I : idl implementation based on 'SMESH' unit's c
al
sses
+// SMESH SMESH_I : idl implementation based on 'SMESH' unit's c
la
sses
// File : StdMeshers_NumberOfSegments_i.cxx
// Moved here from SMESH_NumberOfSegments_i.cxx
// Author : Paul RASCLE, EDF
// File : StdMeshers_NumberOfSegments_i.cxx
// Moved here from SMESH_NumberOfSegments_i.cxx
// Author : Paul RASCLE, EDF
@@
-46,15
+46,12
@@
using namespace std;
//=============================================================================
StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i( PortableServer::POA_ptr thePOA,
//=============================================================================
StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i( PortableServer::POA_ptr thePOA,
- int theStudyId,
- ::SMESH_Gen* theGenImpl )
+ ::SMESH_Gen* theGenImpl )
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA )
{
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA )
{
- MESSAGE( "StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i" );
myBaseImpl = new ::StdMeshers_NumberOfSegments( theGenImpl->GetANewId(),
myBaseImpl = new ::StdMeshers_NumberOfSegments( theGenImpl->GetANewId(),
- theStudyId,
- theGenImpl );
+ theGenImpl );
}
//=============================================================================
}
//=============================================================================
@@
-67,7
+64,6
@@
StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i( PortableServer::PO
StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i()
{
StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i()
{
- MESSAGE( "StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i" );
}
//=============================================================================
}
//=============================================================================
@@
-88,7
+84,7
@@
SMESH::double_array* StdMeshers_NumberOfSegments_i::BuildDistributionExpr( const
SMESH::double_array_var aRes = new SMESH::double_array();
const std::vector<double>& res = this->GetImpl()->BuildDistributionExpr( func, nbSeg, conv );
aRes->length( res.size() );
SMESH::double_array_var aRes = new SMESH::double_array();
const std::vector<double>& res = this->GetImpl()->BuildDistributionExpr( func, nbSeg, conv );
aRes->length( res.size() );
- for (
in
t i = 0; i < res.size(); i++)
+ for (
size_
t i = 0; i < res.size(); i++)
aRes[i] = res[i];
return aRes._retn();
}
aRes[i] = res[i];
return aRes._retn();
}
@@
-98,23
+94,24
@@
SMESH::double_array* StdMeshers_NumberOfSegments_i::BuildDistributionExpr( const
}
}
}
}
-SMESH::double_array* StdMeshers_NumberOfSegments_i::BuildDistributionTab( const SMESH::double_array& func,
- CORBA::Long nbSeg,
- CORBA::Long conv )
+SMESH::double_array*
+StdMeshers_NumberOfSegments_i::BuildDistributionTab( const SMESH::double_array& func,
+ CORBA::Long nbSeg,
+ CORBA::Long conv )
throw ( SALOME::SALOME_Exception )
{
ASSERT( myBaseImpl );
std::vector<double> tbl( func.length() );
throw ( SALOME::SALOME_Exception )
{
ASSERT( myBaseImpl );
std::vector<double> tbl( func.length() );
- for (
int i = 0; i < func.length(); i++
)
+ for (
size_t i = 0; i < tbl.size(); i++
)
tbl[i] = func[i];
try
{
tbl[i] = func[i];
try
{
- SMESH::double_array_var aRes = new SMESH::double_array();
+ SMESH::double_array_var
aRes = new SMESH::double_array();
const std::vector<double>& res = this->GetImpl()->BuildDistributionTab( tbl, nbSeg, conv );
aRes->length( res.size() );
const std::vector<double>& res = this->GetImpl()->BuildDistributionTab( tbl, nbSeg, conv );
aRes->length( res.size() );
- for (
in
t i = 0; i < res.size(); i++)
+ for (
size_
t i = 0; i < res.size(); i++)
aRes[i] = res[i];
return aRes._retn();
}
aRes[i] = res[i];
return aRes._retn();
}
@@
-246,12
+243,11
@@
char* StdMeshers_NumberOfSegments_i::GetObjectEntry()
SMESH::long_array* StdMeshers_NumberOfSegments_i::GetReversedEdges()
{
SMESH::long_array* StdMeshers_NumberOfSegments_i::GetReversedEdges()
{
- MESSAGE( "StdMeshers_NumberOfSegments_i::GetReversedEdges" );
ASSERT( myBaseImpl );
SMESH::long_array_var anArray = new SMESH::long_array;
std::vector<int> ids = this->GetImpl()->GetReversedEdges();
anArray->length( ids.size() );
ASSERT( myBaseImpl );
SMESH::long_array_var anArray = new SMESH::long_array;
std::vector<int> ids = this->GetImpl()->GetReversedEdges();
anArray->length( ids.size() );
- for (
CORBA::Long
i = 0; i < ids.size(); i++)
+ for (
size_t
i = 0; i < ids.size(); i++)
anArray [ i ] = ids [ i ];
return anArray._retn();
anArray [ i ] = ids [ i ];
return anArray._retn();
@@
-267,10
+263,13
@@
void StdMeshers_NumberOfSegments_i::SetDistrType(CORBA::Long typ)
{
ASSERT( myBaseImpl );
try {
{
ASSERT( myBaseImpl );
try {
+ CORBA::Long oldType = (CORBA::Long) this->GetImpl()->GetDistrType();
+
this->GetImpl()->SetDistrType( (::StdMeshers_NumberOfSegments::DistrType) typ );
// Update Python script
this->GetImpl()->SetDistrType( (::StdMeshers_NumberOfSegments::DistrType) typ );
// Update Python script
- SMESH::TPythonDump() << _this() << ".SetDistrType( " << typ << " )";
+ if ( oldType != typ )
+ SMESH::TPythonDump() << _this() << ".SetDistrType( " << typ << " )";
}
catch ( SALOME_Exception& S_ex ) {
THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),
}
catch ( SALOME_Exception& S_ex ) {
THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),
@@
-345,7
+344,7
@@
void StdMeshers_NumberOfSegments_i::SetTableFunction(const SMESH::double_array&
{
ASSERT( myBaseImpl );
std::vector<double> tbl( table.length() );
{
ASSERT( myBaseImpl );
std::vector<double> tbl( table.length() );
- for (
int
i = 0; i < table.length(); i++)
+ for (
CORBA::ULong
i = 0; i < table.length(); i++)
tbl[i] = table[i];
try {
this->GetImpl()->SetTableFunction( tbl );
tbl[i] = table[i];
try {
this->GetImpl()->SetTableFunction( tbl );
@@
-372,12
+371,11
@@
SMESH::double_array* StdMeshers_NumberOfSegments_i::GetTableFunction()
tbl = &this->GetImpl()->GetTableFunction();
}
catch ( SALOME_Exception& S_ex ) {
tbl = &this->GetImpl()->GetTableFunction();
}
catch ( SALOME_Exception& S_ex ) {
- THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),
- SALOME::BAD_PARAM );
+ THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM );
}
SMESH::double_array_var aRes = new SMESH::double_array();
aRes->length(tbl->size());
}
SMESH::double_array_var aRes = new SMESH::double_array();
aRes->length(tbl->size());
- for (
int i = 0; i < tbl->size(); i++
)
+ for (
size_t i = 0; i < tbl->size(); i++
)
aRes[i] = (*tbl)[i];
return aRes._retn();
}
aRes[i] = (*tbl)[i];
return aRes._retn();
}