#include <qpixmap.h>
#include <qgroupbox.h>
-SMESHGUI_GenericHypothesisCreator::SMESHGUI_GenericHypothesisCreator( const QString& aHypType )
-: myHypType( aHypType ),
- myIsCreate( false )
+#include <qapplication.h>
+
+SMESHGUI_GenericHypothesisCreator::SMESHGUI_GenericHypothesisCreator( const QString& theHypType )
+ : myHypType( theHypType ), myIsCreate( false ), myDlg( 0 )
{
}
}
void SMESHGUI_GenericHypothesisCreator::create( SMESH::SMESH_Hypothesis_ptr initParamsHyp,
+ const QString& theHypName,
QWidget* parent)
{
MESSAGE( "Creation of hypothesis with initial params" );
if ( !CORBA::is_nil( initParamsHyp ) && hypType() == initParamsHyp->GetName() )
myInitParamsHypo = SMESH::SMESH_Hypothesis::_duplicate( initParamsHyp );
- create( false, parent );
+ create( false, theHypName, parent );
}
-void SMESHGUI_GenericHypothesisCreator::create( const bool isAlgo, QWidget* parent )
+void SMESHGUI_GenericHypothesisCreator::create( bool isAlgo,
+ const QString& theHypName,
+ QWidget* theParent )
{
MESSAGE( "Creation of hypothesis" );
- // Get default name for hypothesis/algorithm creation
- HypothesisData* aHypData = SMESH::GetHypothesisData( hypType().latin1() );
- QString aHypName = aHypData ? aHypData->Label : hypType();
-
myIsCreate = true;
// Create hypothesis/algorithm
if (isAlgo)
- SMESH::CreateHypothesis( hypType(), aHypName, isAlgo );
-
+ SMESH::CreateHypothesis( hypType(), theHypName, isAlgo );
else
{
- SMESH::SMESH_Hypothesis_var newHypo = SMESH::SMESH_Hypothesis::_narrow
- ( SMESH::CreateHypothesis( hypType(), aHypName, false ) );
-
- if( !editHypothesis( newHypo.in(), parent ) )
+ SMESH::SMESH_Hypothesis_var aHypothesis =
+ SMESH::CreateHypothesis( hypType(), theHypName, false );
+ if( !editHypothesis( aHypothesis.in(), theHypName, theParent ) )
{ //remove just created hypothesis
- _PTR(SObject) SHyp = SMESH::FindSObject( newHypo.in() );
+ _PTR(SObject) aHypSObject = SMESH::FindSObject( aHypothesis.in() );
_PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
if( aStudy && !aStudy->GetProperties()->IsLocked() )
{
_PTR(StudyBuilder) aBuilder = aStudy->NewBuilder();
- aBuilder->RemoveObjectWithChildren( SHyp );
+ aBuilder->RemoveObjectWithChildren( aHypSObject );
}
}
}
SMESHGUI::GetSMESHGUI()->updateObjBrowser( true, 0 );
}
-void SMESHGUI_GenericHypothesisCreator::edit( SMESH::SMESH_Hypothesis_ptr h, QWidget* parent )
+void SMESHGUI_GenericHypothesisCreator::edit( SMESH::SMESH_Hypothesis_ptr theHypothesis,
+ const QString& theHypName,
+ QWidget* theParent )
{
- if( CORBA::is_nil( h ) )
+ if( CORBA::is_nil( theHypothesis ) )
return;
MESSAGE("Edition of hypothesis");
myIsCreate = false;
- if( !editHypothesis( h, parent ) )
+ if( !editHypothesis( theHypothesis, theHypName, theParent ) )
return;
- SMESH::SObjectList listSOmesh = SMESH::GetMeshesUsingAlgoOrHypothesis( h );
+ SMESH::SObjectList listSOmesh = SMESH::GetMeshesUsingAlgoOrHypothesis( theHypothesis );
if( listSOmesh.size() > 0 )
- for( int i=0; i<listSOmesh.size(); i++ )
+ for( int i = 0; i < listSOmesh.size(); i++ )
{
_PTR(SObject) submSO = listSOmesh[i];
SMESH::SMESH_Mesh_var aMesh = SMESH::SObjectToInterface<SMESH::SMESH_Mesh>( submSO );
if( !aSubMesh->_is_nil() )
aMesh = aSubMesh->GetFather();
_PTR(SObject) meshSO = SMESH::FindSObject( aMesh );
- SMESH::ModifiedMesh( meshSO, false);
+ SMESH::ModifiedMesh( meshSO, false, aMesh->NbNodes()==0);
}
SMESHGUI::GetSMESHGUI()->updateObjBrowser( true, 0 );
}
-bool SMESHGUI_GenericHypothesisCreator::editHypothesis( SMESH::SMESH_Hypothesis_ptr h, QWidget* parent )
+bool SMESHGUI_GenericHypothesisCreator::editHypothesis( SMESH::SMESH_Hypothesis_ptr h,
+ const QString& theHypName,
+ QWidget* theParent )
{
if( CORBA::is_nil( h ) )
return false;
bool res = true;
+ myHypName = theHypName;
myHypo = SMESH::SMESH_Hypothesis::_duplicate( h );
+ SMESHGUI_HypothesisDlg* Dlg = new SMESHGUI_HypothesisDlg( this, theParent );
+ myDlg = Dlg;
QFrame* fr = buildFrame();
if( fr )
{
- SMESHGUI_HypothesisDlg* dlg =
- new SMESHGUI_HypothesisDlg( const_cast<SMESHGUI_GenericHypothesisCreator*>( this ), parent );
- dlg->setCustomFrame( fr );
- dlg->setCaption( caption() );
- dlg->setHIcon( icon() );
- dlg->setType( type() );
+ Dlg->setCustomFrame( fr );
+ Dlg->setCaption( caption() );
+ Dlg->setName( theHypName );
+ Dlg->setHIcon( icon() );
+ Dlg->setType( type() );
retrieveParams();
- res = dlg->exec()==QDialog::Accepted;
+ Dlg->show();
+ qApp->enter_loop(); // make myDlg not modal
+ res = myDlg->result();
if( res ) {
QString paramValues = storeParams();
if ( !paramValues.isEmpty() ) {
SMESH::SetValue( SHyp, paramValues );
}
}
- delete dlg;
}
+ delete Dlg; myDlg = 0;
changeWidgets().clear();
myHypo = SMESH::SMESH_Hypothesis::_nil();
myInitParamsHypo = SMESH::SMESH_Hypothesis::_nil();
return res;
}
-
+
QFrame* SMESHGUI_GenericHypothesisCreator::buildStdFrame()
{
if( CORBA::is_nil( hypothesis() ) )
QLabel* lab = new QLabel( (*anIt).myName, GroupC1 );
GroupC1Layout->addWidget( lab, i, 0 );
- QWidget* w = getCustomWidget( *anIt, GroupC1 );
+ QWidget* w = getCustomWidget( *anIt, GroupC1, i );
if ( !w )
switch( (*anIt).myValue.type() )
{
{
QString valueStr = "";
ListOfStdParams::const_iterator param = params.begin(), aLast = params.end();
+ uint len0 = 0;
for( int i=0; param!=aLast; param++, i++ )
{
- if ( i > 0 )
+ if ( valueStr.length() > len0 ) {
valueStr += "; ";
+ len0 = valueStr.length();
+ }
switch( (*param).myValue.type() )
{
case QVariant::Int:
return myHypType;
}
+QString SMESHGUI_GenericHypothesisCreator::hypName() const
+{
+ return myHypName;
+}
+
const SMESHGUI_GenericHypothesisCreator::ListOfWidgets& SMESHGUI_GenericHypothesisCreator::widgets() const
{
return myParamWidgets;
return QString();
}
QWidget* SMESHGUI_GenericHypothesisCreator::getCustomWidget( const StdParam & /*param*/,
- QWidget* /*parent*/) const
+ QWidget* /*parent*/,
+ const int /*index*/) const
{
return 0;
}
return false;
}
+void SMESHGUI_GenericHypothesisCreator::onReject()
+{
+}
+
SMESHGUI_HypothesisDlg::SMESHGUI_HypothesisDlg( SMESHGUI_GenericHypothesisCreator* creator, QWidget* parent )
-: QtxDialog( parent, "", true, true ),
+: QtxDialog( parent, "", false, true ),
myCreator( creator )
{
setMinimumSize( 300, height() );
myHelpFileName = "";
connect( this, SIGNAL( dlgHelp() ), this, SLOT( onHelp() ) );
-
}
SMESHGUI_HypothesisDlg::~SMESHGUI_HypothesisDlg()
void SMESHGUI_HypothesisDlg::accept()
{
- if( !myCreator || myCreator->checkParams() )
- QtxDialog::accept();
+ if ( myCreator && !myCreator->checkParams() )
+ return;
+ QtxDialog::accept();
+ qApp->exit_loop();
+}
+
+void SMESHGUI_HypothesisDlg::reject()
+{
+ if ( myCreator ) myCreator->onReject();
+ QtxDialog::reject();
+ qApp->exit_loop();
}
void SMESHGUI_HypothesisDlg::onHelp()
