From: asl <asl@opencascade.com>
Date: Thu, 10 Dec 2009 11:19:22 +0000 (+0000)
Subject: debug of load
X-Git-Tag: PHASE_17_Part1_V3~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=316ce96f0c0f6940efb6a216501a769f9a8c56ef;p=modules%2Fkernel.git

debug of load
---

diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx b/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx
index 890cf15e4..5632eccab 100644
--- a/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx
+++ b/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx
@@ -215,8 +215,8 @@ void SALOMEDS_StudyBuilder::LoadWith(const _PTR(SComponent)& theSCO, const std::
     _corba_impl->LoadWith( aComponent, aDriver);
   }
 
-  SALOMEDS::Study_var aStudy = aComponent->GetStudy();
-  SALOME::Notebook_var aNotebookVar = aStudy->GetNotebook();
+  //SALOMEDS::Study_var aStudy = aComponent->GetStudy();
+  //SALOME::Notebook_var aNotebookVar = aStudy->GetNotebook();
   //SALOME_Notebook* aNotebook = dynamic_cast<SALOME_Notebook*>( aStudy->_default_POA()->reference_to_servant( aNotebookVar ) );
   //if( aNotebook )
   //  aNotebook->RebuildLinks();
diff --git a/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx b/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx
index b0a7f2234..fb7b0bc9b 100644
--- a/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx
@@ -183,9 +183,15 @@ SALOMEDS::Study_ptr  SALOMEDS_StudyManager_i::Open(const char* aUrl)
   if(!_name_service->Change_Directory("/Study")) MESSAGE( "Unable to access the study directory" )
   else _name_service->Register(Study, CORBA::string_dup(aStudyImpl->Name().c_str()));
 
+
+  SALOMEDS::SComponent_ptr aNotebookComponent = Study->FindComponent( "NOTEBOOK" );
+  SALOMEDS::StudyBuilder_var aBuilder = Study->NewBuilder();
+  aBuilder->LoadWith( aNotebookComponent, SALOME_NotebookDriver::getInstance() );
+
+
   // Notebook creation
-  SALOME::Notebook_var aNotebookVar = Study->GetNotebook();
-  SALOME_Notebook* aNotebook = dynamic_cast<SALOME_Notebook*>(_poa->reference_to_servant( aNotebookVar._retn() ) );
+  //SALOME::Notebook_var aNotebookVar = Study->GetNotebook();
+  /*SALOME_Notebook* aNotebook = dynamic_cast<SALOME_Notebook*>(_poa->reference_to_servant( aNotebookVar._retn() ) );
 
   // Parsing of old style notebook data
   list<int> keys;
@@ -228,7 +234,7 @@ SALOMEDS::Study_ptr  SALOMEDS_StudyManager_i::Open(const char* aUrl)
         aNotebook->ParseOldStyleObject( aCompName, anEntry, aData );
       }
     }
-  }
+  }*/
 
   return Study._retn();
 }