ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-26 12:30:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

PAL10343 - it is impossible to select shape in "create mesh" dialog

Browse Source
This commit is contained in:
asl 2005-11-09 06:48:58 +00:00
parent d5f8c39955
commit ab4288fb65
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -410,7 +410,8 @@ GEOM_Client* SMESH_Gen_i::GetShapeReader()
void SMESH_Gen_i::SetCurrentStudy( SALOMEDS::Study_ptr theStudy ) void SMESH_Gen_i::SetCurrentStudy( SALOMEDS::Study_ptr theStudy )
{ {
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::SetCurrentStudy" ); //if(MYDEBUG)
MESSAGE( "SMESH_Gen_i::SetCurrentStudy" );
myCurrentStudy = SALOMEDS::Study::_duplicate( theStudy ); myCurrentStudy = SALOMEDS::Study::_duplicate( theStudy );
// create study context, if it doesn't exist and set current study // create study context, if it doesn't exist and set current study
int studyId = GetCurrentStudyID(); int studyId = GetCurrentStudyID();
@ -418,11 +419,13 @@ void SMESH_Gen_i::SetCurrentStudy( SALOMEDS::Study_ptr theStudy )
if ( myStudyContextMap.find( studyId ) == myStudyContextMap.end() ) { if ( myStudyContextMap.find( studyId ) == myStudyContextMap.end() ) {
myStudyContextMap[ studyId ] = new StudyContext; myStudyContextMap[ studyId ] = new StudyContext;
} }
SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
aStudyBuilder->LoadWith( myCurrentStudy->FindComponent( "GEOM" ), GetGeomEngine() );
// set current study for geom engine // set current study for geom engine
/* //if ( !CORBA::is_nil( GetGeomEngine() ) )
if ( !CORBA::is_nil( GetGeomEngine() ) ) // GetGeomEngine()->GetCurrentStudy( myCurrentStudy->StudyId() );
GetGeomEngine()->GetCurrentStudy( myCurrentStudy->StudyId() );
*/
} }
//============================================================================= //=============================================================================
@ -1657,6 +1660,13 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
theComponent->GetStudy()->StudyId() != myCurrentStudy->StudyId() ) theComponent->GetStudy()->StudyId() != myCurrentStudy->StudyId() )
SetCurrentStudy( theComponent->GetStudy() ); SetCurrentStudy( theComponent->GetStudy() );
/* if( !theComponent->_is_nil() )
{
//SALOMEDS::Study_var aStudy = SALOMEDS::Study::_narrow( theComponent->GetStudy() );
if( !myCurrentStudy->FindComponent( "GEOM" )->_is_nil() )
loadGeomData( myCurrentStudy->FindComponent( "GEOM" ) );
}*/
StudyContext* myStudyContext = GetCurrentStudyContext(); StudyContext* myStudyContext = GetCurrentStudyContext();
// Get temporary files location // Get temporary files location
@ -1961,7 +1971,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
SALOMEDS::SObject_var shapeSO = myCurrentStudy->FindObjectID( refFromFile ); SALOMEDS::SObject_var shapeSO = myCurrentStudy->FindObjectID( refFromFile );
// Make sure GEOM data are loaded first // Make sure GEOM data are loaded first
loadGeomData( shapeSO->GetFatherComponent() ); //loadGeomData( shapeSO->GetFatherComponent() );
CORBA::Object_var shapeObject = SObjectToObject( shapeSO ); CORBA::Object_var shapeObject = SObjectToObject( shapeSO );
if ( !CORBA::is_nil( shapeObject ) ) { if ( !CORBA::is_nil( shapeObject ) ) {