From 0cb593d0ce5b22f1261b93534a7db794ce3b40cb Mon Sep 17 00:00:00 2001 From: ouv Date: Tue, 24 Nov 2009 14:11:08 +0000 Subject: [PATCH] Compilable version --- src/GEOMBase/GEOMBase_Skeleton.cxx | 14 ++++++++++++++ src/GEOMBase/GEOMBase_Skeleton.h | 3 +++ 2 files changed, 17 insertions(+) diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx index bed9d3411..56768d709 100644 --- a/src/GEOMBase/GEOMBase_Skeleton.cxx +++ b/src/GEOMBase/GEOMBase_Skeleton.cxx @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -55,6 +56,7 @@ GEOMBase_Skeleton::GEOMBase_Skeleton( GeometryGUI* theGeometryGUI, QWidget* pare : QDialog( parent, fl ), GEOMBase_Helper( dynamic_cast( 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( app->module( "Geometry" ) ); + if ( !myNoteBook && app ) + if( SalomeApp_Study* appStudy = dynamic_cast( 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 1d267ffc2..e91e58379 100644 --- a/src/GEOMBase/GEOMBase_Skeleton.h +++ b/src/GEOMBase/GEOMBase_Skeleton.h @@ -32,6 +32,7 @@ #include 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(); -- 2.39.2