-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012 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
// File : StdMeshers_ProjectionSource2D_i.cxx
// Author : Edward AGAPOV
// Module : SMESH
-// $Header$
//
#include "StdMeshers_ProjectionSource2D_i.hxx"
ASSERT( myBaseImpl );
try {
this->GetImpl()->SetSourceFace( StdMeshers_ObjRefUlils::GeomObjectToShape( face ));
+ CORBA::String_var entry = face->GetStudyEntry();
+ myShapeEntries[ SRC_FACE ] = entry.in();
}
catch ( SALOME_Exception& S_ex ) {
THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM );
TopoDS_Shape v3 = StdMeshers_ObjRefUlils::GeomObjectToShape( targetVertex1 );
TopoDS_Shape v4 = StdMeshers_ObjRefUlils::GeomObjectToShape( targetVertex2 );
this->GetImpl()->SetVertexAssociation( v1, v2, v3, v4 );
+
+ myShapeEntries[ SRC_VERTEX1 ] = StdMeshers_ObjRefUlils::GeomObjectToEntry( sourceVertex1 );
+ myShapeEntries[ SRC_VERTEX2 ] = StdMeshers_ObjRefUlils::GeomObjectToEntry( sourceVertex2 );
+ myShapeEntries[ TGT_VERTEX1 ] = StdMeshers_ObjRefUlils::GeomObjectToEntry( targetVertex1 );
+ myShapeEntries[ TGT_VERTEX2 ] = StdMeshers_ObjRefUlils::GeomObjectToEntry( targetVertex2 );
}
catch ( SALOME_Exception& S_ex ) {
THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM );
GEOM::GEOM_Object_ptr StdMeshers_ProjectionSource2D_i::GetSourceFace()
{
ASSERT( myBaseImpl );
- return StdMeshers_ObjRefUlils::ShapeToGeomObject( this->GetImpl()->GetSourceFace() );
+ return StdMeshers_ObjRefUlils::EntryOrShapeToGeomObject
+ ( myShapeEntries[ SRC_FACE ],
+ this->GetImpl()->GetSourceFace() );
}
//=============================================================================
GEOM::GEOM_Object_ptr StdMeshers_ProjectionSource2D_i::GetSourceVertex(CORBA::Long i)
{
ASSERT( myBaseImpl );
- return StdMeshers_ObjRefUlils::ShapeToGeomObject( this->GetImpl()->GetSourceVertex((int) i ));
+ return StdMeshers_ObjRefUlils::EntryOrShapeToGeomObject
+ ( myShapeEntries[ i == 1 ? SRC_VERTEX1 : SRC_VERTEX2 ],
+ this->GetImpl()->GetSourceVertex((int) i ));
}
//=============================================================================
GEOM::GEOM_Object_ptr StdMeshers_ProjectionSource2D_i::GetTargetVertex(CORBA::Long i)
{
ASSERT( myBaseImpl );
- return StdMeshers_ObjRefUlils::ShapeToGeomObject( this->GetImpl()->GetTargetVertex( (int)i ));
+ return StdMeshers_ObjRefUlils::EntryOrShapeToGeomObject
+ ( myShapeEntries[ i == 1 ? TGT_VERTEX1 : TGT_VERTEX2 ],
+ this->GetImpl()->GetTargetVertex( (int)i ));
}
//=============================================================================
ASSERT( myBaseImpl );
std::ostringstream os;
- TopoDS_Shape s1, s2, s3, s4, s5;
- GetImpl()->GetStoreParams( s1, s2, s3, s4, s5 );
-
- StdMeshers_ObjRefUlils::SaveToStream( s1, os );
- StdMeshers_ObjRefUlils::SaveToStream( s2, os );
- StdMeshers_ObjRefUlils::SaveToStream( s3, os );
- StdMeshers_ObjRefUlils::SaveToStream( s4, os );
- StdMeshers_ObjRefUlils::SaveToStream( s5, os );
+ for ( int i = 0; i < NB_SHAPES; ++i )
+ StdMeshers_ObjRefUlils::SaveToStream( myShapeEntries[ i ], os );
StdMeshers_ObjRefUlils::SaveToStream( GetSourceMesh(), os );
myBaseImpl->SaveTo( os );
ASSERT( myBaseImpl );
std::istringstream is( theStream );
- TopoDS_Shape s1 = StdMeshers_ObjRefUlils::LoadFromStream( is );
- TopoDS_Shape s2 = StdMeshers_ObjRefUlils::LoadFromStream( is );
- TopoDS_Shape s3 = StdMeshers_ObjRefUlils::LoadFromStream( is );
- TopoDS_Shape s4 = StdMeshers_ObjRefUlils::LoadFromStream( is );
- TopoDS_Shape s5 = StdMeshers_ObjRefUlils::LoadFromStream( is );
+ TopoDS_Shape shapes[ NB_SHAPES ];
+ for ( int i = 0; i < NB_SHAPES; ++i )
+ shapes[ i ] = StdMeshers_ObjRefUlils::LoadFromStream( is );
SMESH::SMESH_Mesh_var mesh =
StdMeshers_ObjRefUlils::LoadObjectFromStream< SMESH::SMESH_Mesh >( is );
}
myCorbaMesh = SMESH::SMESH_Mesh::_duplicate( mesh );
- GetImpl()->RestoreParams( s1, s2, s3, s4, s5, meshImpl );
+ GetImpl()->SetSourceMesh ( meshImpl );
+ GetImpl()->SetSourceFace ( shapes[ SRC_FACE ] );
+ GetImpl()->SetVertexAssociation( shapes[ SRC_VERTEX1 ],
+ shapes[ SRC_VERTEX2 ],
+ shapes[ TGT_VERTEX1 ],
+ shapes[ TGT_VERTEX2 ]);
myBaseImpl->LoadFrom( is );
+
+ std::istringstream str( theStream );
+ for ( int i = 0; i < NB_SHAPES; ++i )
+ str >> myShapeEntries[ i ];
}