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 multi-study removal branch.
[modules/smesh.git]
/
src
/
StdMeshers_I
/
StdMeshers_ProjectionSource1D_i.cxx
diff --git
a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
index 9ee397fae3d297cc6bc9bc8f43e18d9d7fc4b37c..7b4048662ec682fe71197117b45b25ab1952af9c 100644
(file)
--- a/
src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
+++ b/
src/StdMeshers_I/StdMeshers_ProjectionSource1D_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
@@
-48,13
+48,10
@@
using namespace std;
StdMeshers_ProjectionSource1D_i::StdMeshers_ProjectionSource1D_i
( PortableServer::POA_ptr thePOA,
StdMeshers_ProjectionSource1D_i::StdMeshers_ProjectionSource1D_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_ProjectionSource1D_i::StdMeshers_ProjectionSource1D_i" );
myBaseImpl = new ::StdMeshers_ProjectionSource1D( theGenImpl->GetANewId(),
myBaseImpl = new ::StdMeshers_ProjectionSource1D( theGenImpl->GetANewId(),
- theStudyId,
theGenImpl );
}
theGenImpl );
}
@@
-68,7
+65,6
@@
StdMeshers_ProjectionSource1D_i::StdMeshers_ProjectionSource1D_i
StdMeshers_ProjectionSource1D_i::~StdMeshers_ProjectionSource1D_i()
{
StdMeshers_ProjectionSource1D_i::~StdMeshers_ProjectionSource1D_i()
{
- MESSAGE( "StdMeshers_ProjectionSource1D_i::~StdMeshers_ProjectionSource1D_i" );
}
//=============================================================================
}
//=============================================================================
@@
-287,11
+283,14
@@
void StdMeshers_ProjectionSource1D_i::LoadFrom( const char* theStream )
}
myCorbaMesh = SMESH::SMESH_Mesh::_duplicate( mesh );
}
myCorbaMesh = SMESH::SMESH_Mesh::_duplicate( mesh );
- GetImpl()->SetSourceMesh ( meshImpl );
- GetImpl()->SetSourceEdge ( shapes[ SRC_EDGE ] );
- GetImpl()->SetVertexAssociation( shapes[ SRC_VERTEX ],
- shapes[ TGT_VERTEX ]);
-
+ try {
+ GetImpl()->SetSourceMesh ( meshImpl );
+ GetImpl()->SetSourceEdge ( shapes[ SRC_EDGE ] );
+ GetImpl()->SetVertexAssociation( shapes[ SRC_VERTEX ],
+ shapes[ TGT_VERTEX ]);
+ }
+ catch (...) {
+ }
myBaseImpl->LoadFrom( is );
std::istringstream str( theStream );
myBaseImpl->LoadFrom( is );
std::istringstream str( theStream );