X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshersGUI%2FStdMeshersGUI_LayerDistributionParamWdg.cxx;h=acf1f2a856650168630660fe003de1e5135f64d6;hp=57e21193d3c01efc8e8a4c4f4ed4c25db1b27529;hb=cb55604f37e3d2583272fd436bb6557b041948b5;hpb=5482b99d07dd144fd5be299e722f39a81de3b5be diff --git a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx index 57e21193d..acf1f2a85 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2020 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 @@ -152,7 +152,7 @@ void StdMeshersGUI_LayerDistributionParamWdg::onHypTypePopup( QAction* a ) SMESH::SMESH_Gen_var gen = mySMESHGUI->GetSMESHGen(); // avoid publishing a new 1D hyp - gen->SetCurrentStudy( SALOMEDS::Study::_nil() ); + gen->SetEnablePublish( false ); // create a hyp HypothesisData* aHypData = 0; @@ -167,14 +167,14 @@ void StdMeshersGUI_LayerDistributionParamWdg::onHypTypePopup( QAction* a ) QString aServLib = aHypData->ServerLibName; QString aHypType = aHypData->TypeName; try { - set( gen->CreateHypothesis(aHypType.toLatin1().data(), aServLib.toLatin1().data())); + set( gen->CreateHypothesis(aHypType.toLatin1().data(), aServLib.toUtf8().data())); } catch (const SALOME::SALOME_Exception & S_ex) { SalomeApp_Tools::QtCatchCorbaException(S_ex); } // restore current study - mySMESHGUI->GetSMESHGen(); + gen->SetEnablePublish( true ); onEdit(); } @@ -207,7 +207,11 @@ void StdMeshersGUI_LayerDistributionParamWdg::onEdit() 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; @@ -220,8 +224,11 @@ void StdMeshersGUI_LayerDistributionParamWdg::onEdit() } } -void StdMeshersGUI_LayerDistributionParamWdg::onEdited( int result ) +void StdMeshersGUI_LayerDistributionParamWdg::onEdited( int /*result*/ ) { if ( myDlg ) - myDlg->show(); + { + //myDlg->show(); does not work + myDlg->setEnabled(true); + } }