X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers_I%2FStdMeshers_QuadrangleParams_i.cxx;h=1681544faff61bd86766d6c4b0e51985b121377c;hb=f0354b9d849838668be5de74ee19014b1290e3e9;hp=e31e6035ac8331853746983f176ce9d424c0393d;hpb=7a65c9fad427b1ccba6b9ccae612296e5092a324;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
index e31e6035a..1681544fa 100644
--- a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -50,7 +50,6 @@ StdMeshers_QuadrangleParams_i::StdMeshers_QuadrangleParams_i
      : SALOME::GenericObj_i( thePOA ), 
        SMESH_Hypothesis_i( thePOA )
 {
-  MESSAGE( "StdMeshers_QuadrangleParams_i::StdMeshers_QuadrangleParams_i" );
   myBaseImpl = new ::StdMeshers_QuadrangleParams(theGenImpl->GetANewId(),
                                                  theStudyId,
                                                  theGenImpl);
@@ -66,7 +65,6 @@ StdMeshers_QuadrangleParams_i::StdMeshers_QuadrangleParams_i
 
 StdMeshers_QuadrangleParams_i::~StdMeshers_QuadrangleParams_i()
 {
-  MESSAGE( "StdMeshers_QuadrangleParams_i::~StdMeshers_QuadrangleParams_i" );
 }
 
 //=============================================================================
@@ -79,7 +77,6 @@ StdMeshers_QuadrangleParams_i::~StdMeshers_QuadrangleParams_i()
 
 void StdMeshers_QuadrangleParams_i::SetTriaVertex(CORBA::Long vertID)
 {
-  MESSAGE( "StdMeshers_QuadrangleParams_i::SetTriaVertex" );
   ASSERT( myBaseImpl );
   try {
     this->GetImpl()->SetTriaVertex( vertID );
@@ -102,7 +99,6 @@ void StdMeshers_QuadrangleParams_i::SetTriaVertex(CORBA::Long vertID)
 
 CORBA::Long StdMeshers_QuadrangleParams_i::GetTriaVertex()
 {
-  MESSAGE( "StdMeshers_QuadrangleParams_i::GetTriaVertex" );
   ASSERT( myBaseImpl );
   return this->GetImpl()->GetTriaVertex();
 }
@@ -117,7 +113,6 @@ CORBA::Long StdMeshers_QuadrangleParams_i::GetTriaVertex()
 
 void StdMeshers_QuadrangleParams_i::SetObjectEntry( const char* entry )
 {
-  MESSAGE( "StdMeshers_QuadrangleParams_i::SetObjectEntry" );
   ASSERT( myBaseImpl );
 
   try {
@@ -141,7 +136,6 @@ void StdMeshers_QuadrangleParams_i::SetObjectEntry( const char* entry )
 
 char* StdMeshers_QuadrangleParams_i::GetObjectEntry()
 {
-  MESSAGE( "StdMeshers_QuadrangleParams_i::SetObjectEntry" );
   ASSERT( myBaseImpl );
   const char* entry;
   try {
@@ -162,7 +156,6 @@ char* StdMeshers_QuadrangleParams_i::GetObjectEntry()
 //=============================================================================
 void StdMeshers_QuadrangleParams_i::SetQuadType(StdMeshers::QuadType type)
 {
-  MESSAGE("StdMeshers_QuadrangleParams_i::SetQuadType");
   ASSERT(myBaseImpl);
 
   if (int(type) >= int(StdMeshers::QUAD_NB_TYPES)) {
@@ -204,7 +197,6 @@ void StdMeshers_QuadrangleParams_i::SetQuadType(StdMeshers::QuadType type)
 //=============================================================================
 StdMeshers::QuadType StdMeshers_QuadrangleParams_i::GetQuadType()
 {
-  MESSAGE("StdMeshers_QuadrangleParams_i::GetQuadType");
   ASSERT(myBaseImpl);
   return StdMeshers::QuadType(int(this->GetImpl()->GetQuadType()));
 }
@@ -313,7 +305,6 @@ SMESH::string_array* StdMeshers_QuadrangleParams_i::GetEnfVertices()
 
 ::StdMeshers_QuadrangleParams* StdMeshers_QuadrangleParams_i::GetImpl()
 {
-  MESSAGE( "StdMeshers_QuadrangleParams_i::GetImpl" );
   return ( ::StdMeshers_QuadrangleParams* )myBaseImpl;
 }
 
@@ -379,7 +370,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] ));
 
-      GetImpl()->SetEnforcedNodes( shapes, points );
+      try {
+        GetImpl()->SetEnforcedNodes( shapes, points );
+      }
+      catch (...) {
+      }
     }
   }