Merge branch 'master' into gni/adaptation

This commit is contained in:
Gérald NICOLAS 2020-05-25 08:32:02 +02:00
commit 94b4f20a65
2 changed files with 10 additions and 2 deletions

View File

@ -94,6 +94,7 @@ void StdMeshers_LayerDistribution::SetLayerDistribution(SMESH_Hypothesis* hyp1D)
ostream & StdMeshers_LayerDistribution::SaveTo(ostream & save) ostream & StdMeshers_LayerDistribution::SaveTo(ostream & save)
{ {
save << "StdMeshers_LayerDistribution"; // just to enable "Edit" in pop-up menu
return save; return save;
} }

View File

@ -207,7 +207,11 @@ void StdMeshersGUI_LayerDistributionParamWdg::onEdit()
if ( !editor ) return; if ( !editor ) return;
if ( myDlg ) if ( myDlg )
myDlg->hide(); {
//myDlg->hide(); -- pb: show() does not work
myDlg->setWindowTitle( tr( "SMESH_HYPOTHESIS" ));
myDlg->setEnabled(false);
}
try { try {
QWidget* parent = this; QWidget* parent = this;
@ -223,5 +227,8 @@ 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);
}
} }