Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gni/evolution
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_LayerDistributionParamWdg.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
index 78608b81f07bc4cfb490abe5193afc781db51836..acf1f2a856650168630660fe003de1e5135f64d6 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-45,7
+45,7
@@
//================================================================================
/*!
* \brief Constructor initialized by filter
//================================================================================
/*!
* \brief Constructor initialized by filter
-
* \param f - object filter
+ * \param f - object filter
*/
//================================================================================
*/
//================================================================================
@@
-53,8
+53,8
@@
StdMeshersGUI_LayerDistributionParamWdg
::StdMeshersGUI_LayerDistributionParamWdg(SMESH::SMESH_Hypothesis_ptr holderHyp,
SMESH::SMESH_Hypothesis_ptr distribHyp,
const QString& name,
::StdMeshersGUI_LayerDistributionParamWdg(SMESH::SMESH_Hypothesis_ptr holderHyp,
SMESH::SMESH_Hypothesis_ptr distribHyp,
const QString& name,
- QDialog* dlg):
- QWidget(), my
Name(name), myDlg( dlg
)
+ QDialog* dlg):
+ QWidget(), my
Dlg( dlg ), myName(name
)
{
myHolderHyp = SMESH::SMESH_Hypothesis::_duplicate( holderHyp );
init();
{
myHolderHyp = SMESH::SMESH_Hypothesis::_duplicate( holderHyp );
init();
@@
-111,9
+111,11
@@
void StdMeshersGUI_LayerDistributionParamWdg::init()
myCreateButton = new QPushButton( this );
myCreateButton->setObjectName( "createBut" );
myCreateButton = new QPushButton( this );
myCreateButton->setObjectName( "createBut" );
+ myCreateButton->setMinimumWidth(100);
myEditButton = new QPushButton( tr("EDIT"), this );
myEditButton->setObjectName( "editBut" );
myEditButton = new QPushButton( tr("EDIT"), this );
myEditButton->setObjectName( "editBut" );
+ myEditButton->setMinimumWidth(100);
myHypTypePopup = new QMenu( this );
myHypTypePopup = new QMenu( this );
@@
-130,8
+132,8
@@
void StdMeshersGUI_LayerDistributionParamWdg::init()
}
aHBox->addWidget( myCreateButton );
}
aHBox->addWidget( myCreateButton );
+ aHBox->addStretch(5);
aHBox->addWidget( myEditButton );
aHBox->addWidget( myEditButton );
- aHBox->addStretch();
connect( myCreateButton, SIGNAL(clicked()), SLOT(onCreate()));
connect( myEditButton, SIGNAL(clicked()), SLOT(onEdit()));
connect( myCreateButton, SIGNAL(clicked()), SLOT(onCreate()));
connect( myEditButton, SIGNAL(clicked()), SLOT(onEdit()));
@@
-150,7
+152,7
@@
void StdMeshersGUI_LayerDistributionParamWdg::onHypTypePopup( QAction* a )
SMESH::SMESH_Gen_var gen = mySMESHGUI->GetSMESHGen();
// avoid publishing a new 1D hyp
SMESH::SMESH_Gen_var gen = mySMESHGUI->GetSMESHGen();
// avoid publishing a new 1D hyp
- gen->Set
CurrentStudy( SALOMEDS::Study::_nil()
);
+ gen->Set
EnablePublish( false
);
// create a hyp
HypothesisData* aHypData = 0;
// create a hyp
HypothesisData* aHypData = 0;
@@
-165,14
+167,14
@@
void StdMeshersGUI_LayerDistributionParamWdg::onHypTypePopup( QAction* a )
QString aServLib = aHypData->ServerLibName;
QString aHypType = aHypData->TypeName;
try {
QString aServLib = aHypData->ServerLibName;
QString aHypType = aHypData->TypeName;
try {
- set( gen->CreateHypothesis(aHypType.toLatin1().data(), aServLib.to
Latin1
().data()));
+ set( gen->CreateHypothesis(aHypType.toLatin1().data(), aServLib.to
Utf8
().data()));
}
catch (const SALOME::SALOME_Exception & S_ex) {
SalomeApp_Tools::QtCatchCorbaException(S_ex);
}
// restore current study
}
catch (const SALOME::SALOME_Exception & S_ex) {
SalomeApp_Tools::QtCatchCorbaException(S_ex);
}
// restore current study
-
mySMESHGUI->GetSMESHGen(
);
+
gen->SetEnablePublish( true
);
onEdit();
}
onEdit();
}
@@
-205,7
+207,11
@@
void StdMeshersGUI_LayerDistributionParamWdg::onEdit()
if ( !editor ) return;
if ( myDlg )
if ( !editor ) return;
if ( myDlg )
- myDlg->hide();
+ {
+ //myDlg->hide(); -- pb: show() does not work
+ myDlg->setWindowTitle( tr( "SMESH_HYPOTHESIS" ));
+ myDlg->setEnabled(false);
+ }
try {
QWidget* parent = this;
try {
QWidget* parent = this;
@@
-218,8
+224,11
@@
void StdMeshersGUI_LayerDistributionParamWdg::onEdit()
}
}
}
}
-void StdMeshersGUI_LayerDistributionParamWdg::onEdited( int
result
)
+void StdMeshersGUI_LayerDistributionParamWdg::onEdited( int
/*result*/
)
{
if ( myDlg )
{
if ( myDlg )
- myDlg->show();
+ {
+ //myDlg->show(); does not work
+ myDlg->setEnabled(true);
+ }
}
}