X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Hypotheses.cxx;h=36b29d8453ba4d8d12e9c697d0bcb1051690ce75;hp=630100e7174f28b7773217b1ded4e0186b0653f0;hb=bbca2cb797c37bb7695d3f35490bcd328fbddd4e;hpb=2742029b9094540c12b9e30bbdb958087e0cb850 diff --git a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx index 630100e71..36b29d845 100644 --- a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx +++ b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -35,10 +35,11 @@ #include // SALOME GUI includes -#include +#include #include +#include #include -#include +#include #include // Qt includes @@ -150,7 +151,7 @@ void SMESHGUI_GenericHypothesisCreator::editHypothesis( SMESH::SMESH_Hypothesis_ } else { emit finished( QDialog::Accepted ); - delete myDlg; + delete myDlg; } } @@ -246,6 +247,12 @@ QFrame* SMESHGUI_GenericHypothesisCreator::buildStdFrame() changeWidgets().append( w ); } } + if ( QWidget* w = getHelperWidget() ) + { + w->setParent( fr ); + w->move( QPoint( 0, 0 ) ); + lay->addWidget( w ); + } return fr; } @@ -264,6 +271,7 @@ void SMESHGUI_GenericHypothesisCreator::onDialogFinished( int result ) bool res = result==QDialog::Accepted; if( res ) { + SUIT_OverrideCursor wc; /*QString paramValues = */storeParams(); // No longer needed since NoteBook appears and "Value" OB field shows names of variable // if ( !paramValues.isEmpty() ) { @@ -512,6 +520,17 @@ QWidget* SMESHGUI_GenericHypothesisCreator::getCustomWidget( const StdParam & /* { return 0; } +//================================================================================ +/*! + * \brief Returns a widget representing not a hypothesis parameter but some helper widget + */ +//================================================================================ + +QWidget* SMESHGUI_GenericHypothesisCreator::getHelperWidget() const +{ + return 0; +} + bool SMESHGUI_GenericHypothesisCreator::getParamFromCustomWidget( StdParam&, QWidget* ) const { return false;