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_QuadrangleParams_i.cxx
diff --git
a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
index ebff90789f44fad934783cb8c1ef1af5a23d347f..78b2841e1575a4d7a3f56809f3faaa3fe1a0ad2a 100644
(file)
--- a/
src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
+++ b/
src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
@@
-45,14
+45,11
@@
using namespace std;
StdMeshers_QuadrangleParams_i::StdMeshers_QuadrangleParams_i
(PortableServer::POA_ptr thePOA,
StdMeshers_QuadrangleParams_i::StdMeshers_QuadrangleParams_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_QuadrangleParams_i::StdMeshers_QuadrangleParams_i" );
myBaseImpl = new ::StdMeshers_QuadrangleParams(theGenImpl->GetANewId(),
myBaseImpl = new ::StdMeshers_QuadrangleParams(theGenImpl->GetANewId(),
- theStudyId,
theGenImpl);
}
theGenImpl);
}
@@
-66,7
+63,6
@@
StdMeshers_QuadrangleParams_i::StdMeshers_QuadrangleParams_i
StdMeshers_QuadrangleParams_i::~StdMeshers_QuadrangleParams_i()
{
StdMeshers_QuadrangleParams_i::~StdMeshers_QuadrangleParams_i()
{
- MESSAGE( "StdMeshers_QuadrangleParams_i::~StdMeshers_QuadrangleParams_i" );
}
//=============================================================================
}
//=============================================================================
@@
-79,7
+75,6
@@
StdMeshers_QuadrangleParams_i::~StdMeshers_QuadrangleParams_i()
void StdMeshers_QuadrangleParams_i::SetTriaVertex(CORBA::Long vertID)
{
void StdMeshers_QuadrangleParams_i::SetTriaVertex(CORBA::Long vertID)
{
- MESSAGE( "StdMeshers_QuadrangleParams_i::SetTriaVertex" );
ASSERT( myBaseImpl );
try {
this->GetImpl()->SetTriaVertex( vertID );
ASSERT( myBaseImpl );
try {
this->GetImpl()->SetTriaVertex( vertID );
@@
-102,7
+97,6
@@
void StdMeshers_QuadrangleParams_i::SetTriaVertex(CORBA::Long vertID)
CORBA::Long StdMeshers_QuadrangleParams_i::GetTriaVertex()
{
CORBA::Long StdMeshers_QuadrangleParams_i::GetTriaVertex()
{
- MESSAGE( "StdMeshers_QuadrangleParams_i::GetTriaVertex" );
ASSERT( myBaseImpl );
return this->GetImpl()->GetTriaVertex();
}
ASSERT( myBaseImpl );
return this->GetImpl()->GetTriaVertex();
}
@@
-117,7
+111,6
@@
CORBA::Long StdMeshers_QuadrangleParams_i::GetTriaVertex()
void StdMeshers_QuadrangleParams_i::SetObjectEntry( const char* entry )
{
void StdMeshers_QuadrangleParams_i::SetObjectEntry( const char* entry )
{
- MESSAGE( "StdMeshers_QuadrangleParams_i::SetObjectEntry" );
ASSERT( myBaseImpl );
try {
ASSERT( myBaseImpl );
try {
@@
-141,7
+134,6
@@
void StdMeshers_QuadrangleParams_i::SetObjectEntry( const char* entry )
char* StdMeshers_QuadrangleParams_i::GetObjectEntry()
{
char* StdMeshers_QuadrangleParams_i::GetObjectEntry()
{
- MESSAGE( "StdMeshers_QuadrangleParams_i::SetObjectEntry" );
ASSERT( myBaseImpl );
const char* entry;
try {
ASSERT( myBaseImpl );
const char* entry;
try {
@@
-162,7
+154,6
@@
char* StdMeshers_QuadrangleParams_i::GetObjectEntry()
//=============================================================================
void StdMeshers_QuadrangleParams_i::SetQuadType(StdMeshers::QuadType type)
{
//=============================================================================
void StdMeshers_QuadrangleParams_i::SetQuadType(StdMeshers::QuadType type)
{
- MESSAGE("StdMeshers_QuadrangleParams_i::SetQuadType");
ASSERT(myBaseImpl);
if (int(type) >= int(StdMeshers::QUAD_NB_TYPES)) {
ASSERT(myBaseImpl);
if (int(type) >= int(StdMeshers::QUAD_NB_TYPES)) {
@@
-204,7
+195,6
@@
void StdMeshers_QuadrangleParams_i::SetQuadType(StdMeshers::QuadType type)
//=============================================================================
StdMeshers::QuadType StdMeshers_QuadrangleParams_i::GetQuadType()
{
//=============================================================================
StdMeshers::QuadType StdMeshers_QuadrangleParams_i::GetQuadType()
{
- MESSAGE("StdMeshers_QuadrangleParams_i::GetQuadType");
ASSERT(myBaseImpl);
return StdMeshers::QuadType(int(this->GetImpl()->GetQuadType()));
}
ASSERT(myBaseImpl);
return StdMeshers::QuadType(int(this->GetImpl()->GetQuadType()));
}
@@
-313,7
+303,6
@@
SMESH::string_array* StdMeshers_QuadrangleParams_i::GetEnfVertices()
::StdMeshers_QuadrangleParams* StdMeshers_QuadrangleParams_i::GetImpl()
{
::StdMeshers_QuadrangleParams* StdMeshers_QuadrangleParams_i::GetImpl()
{
- MESSAGE( "StdMeshers_QuadrangleParams_i::GetImpl" );
return ( ::StdMeshers_QuadrangleParams* )myBaseImpl;
}
return ( ::StdMeshers_QuadrangleParams* )myBaseImpl;
}
@@
-379,7
+368,11
@@
void StdMeshers_QuadrangleParams_i::LoadFrom( const char* theStream )
for ( int i = 0; i < nb; ++i )
shapes.push_back( StdMeshers_ObjRefUlils::LoadFromStream( is, & myShapeEntries[i] ));
for ( int i = 0; i < nb; ++i )
shapes.push_back( StdMeshers_ObjRefUlils::LoadFromStream( is, & myShapeEntries[i] ));
- GetImpl()->SetEnforcedNodes( shapes, points );
+ try {
+ GetImpl()->SetEnforcedNodes( shapes, points );
+ }
+ catch (...) {
+ }
}
}
}
}