From: asl <asl@opencascade.com>
Date: Sat, 21 Nov 2009 12:14:55 +0000 (+0000)
Subject: Porting to new notebook mechanism
X-Git-Tag: PHASE_17_Part1_V1~11
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c91b41b9a7b6036908cfcbd4772168ba1ce0e013;p=modules%2Fgui.git

Porting to new notebook mechanism
---

diff --git a/src/SalomeApp/SalomeApp_DataObject.cxx b/src/SalomeApp/SalomeApp_DataObject.cxx
index 6db6c32ca..e3511dce4 100644
--- a/src/SalomeApp/SalomeApp_DataObject.cxx
+++ b/src/SalomeApp/SalomeApp_DataObject.cxx
@@ -25,6 +25,7 @@
 #include "SalomeApp_DataObject.h"
 #include "SalomeApp_Study.h"
 #include "SalomeApp_Application.h"
+#include "SalomeApp_Notebook.h"
 
 #include <CAM_DataObject.h>
 
@@ -489,7 +490,7 @@ QString SalomeApp_DataObject::value( const _PTR(SObject)& obj ) const
     {
       if ( SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>( aRoot->study() ) )
       {
-        _PTR(Study) studyDS( aStudy->studyDS() );
+        SalomeApp_Notebook aNb( aStudy );
 
 	bool ok = false;
 	QStringList aSectionList = aStrings.split( "|" );
@@ -503,7 +504,7 @@ QString SalomeApp_DataObject::value( const _PTR(SObject)& obj ) const
 	    for ( int i = 0, n = aStringList.size(); i < n; i++ )
 	    {
 	      QString aStr = aStringList[i];
-	      if ( studyDS->IsVariable( aStr.toStdString() ) )
+	      if ( aNb.get( aStr ).isValid() )
 		val.append( aStr + ", " );
 	    }