Compilable version

diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx
index bed9d3411cc65ec80e942810c8cfd99b025ee294..56768d709d266b6430bf7ef043dffb4c0602ebbc 100644 (file)
--- a/src/GEOMBase/GEOMBase_Skeleton.cxx
+++ b/src/GEOMBase/GEOMBase_Skeleton.cxx
@@ -31,6 +31,7 @@
 
 #include <SalomeApp_Application.h>
 #include <SalomeApp_DoubleSpinBox.h>
+#include <SalomeApp_Notebook.h>
 #include <SalomeApp_Study.h>
 #include <LightApp_Application.h>
 #include <LightApp_SelectionMgr.h>
@@ -55,6 +56,7 @@ GEOMBase_Skeleton::GEOMBase_Skeleton( GeometryGUI* theGeometryGUI, QWidget* pare
   : QDialog( parent, fl ), 
     GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
     myGeomGUI( theGeometryGUI ),
+    myNoteBook( 0 ),
     myRBGroup( 0 )
 {
   setAttribute( Qt::WA_DeleteOnClose );
@@ -97,6 +99,12 @@ GEOMBase_Skeleton::~GEOMBase_Skeleton()
 {
   if ( myGeomGUI )
     myGeomGUI->SetActiveDialogBox( 0 );
+
+  if( myNoteBook )
+  {
+    delete myNoteBook;
+    myNoteBook = 0;
+  }
 }
 
 //=================================================================================
@@ -109,6 +117,10 @@ void GEOMBase_Skeleton::Init()
   if ( !myGeomGUI && app )
     myGeomGUI = dynamic_cast<GeometryGUI*>( app->module( "Geometry" ) );
 
+  if ( !myNoteBook && app )
+    if( SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() ) )
+      myNoteBook = new SalomeApp_Notebook( appStudy );
+
   /* init variables */
   if ( myGeomGUI )
     myGeomGUI->SetActiveDialogBox( this );
@@ -173,6 +185,7 @@ void GEOMBase_Skeleton::updateAttributes( GEOM::GEOM_Object_ptr theObj,
   SALOMEDS::AttributeString_var aStringAttrib = SALOMEDS::AttributeString::_narrow(anAttr);
 
   std::string aValue = aStringAttrib->Value();
+  /* ouv: temporarily disabled
   if( aValue != "" )
     aValue += "|";
   for( int i = 0, n = theParameters.count(); i < n; i++ ) {
@@ -182,6 +195,7 @@ void GEOMBase_Skeleton::updateAttributes( GEOM::GEOM_Object_ptr theObj,
     if(i != n-1)
       aValue += ":";
   }
+  */
   aStringAttrib->SetValue(aValue.c_str());
 }
 

diff --git a/src/GEOMBase/GEOMBase_Skeleton.h b/src/GEOMBase/GEOMBase_Skeleton.h
index 1d267ffc243bd8ee20bf3f8a0a78f897221b65cc..e91e58379961b606fbb1721787b5e9e5fdd96ce0 100644 (file)
--- a/src/GEOMBase/GEOMBase_Skeleton.h
+++ b/src/GEOMBase/GEOMBase_Skeleton.h
@@ -32,6 +32,7 @@
 #include <QDialog>
 
 class SalomeApp_DoubleSpinBox;
+class SalomeApp_Notebook;
 class GeometryGUI;
 class DlgRef_Skeleton;
 class QSpinBox;
@@ -102,6 +103,8 @@ protected:
     QButtonGroup*       myRBGroup;             //!< radio button group
     DlgRef_Skeleton*    myMainFrame;           //!< dialog box's mainframe widgetx
 
+    SalomeApp_Notebook* myNoteBook;
+
 protected slots:
     virtual void        ClickOnCancel();
     void                LineEditReturnPressed();