X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshersGUI%2FStdMeshersGUI_LayerDistributionParamWdg.cxx;h=5317368eadc4a9f3fe7896b6fe81bc82d92f08cd;hp=ee46af5b11a5adfc286d2f14e6d9ff17aa50130d;hb=2629c8bf51f3390fe65bfc35237846aefe1a06e0;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6

diff --git a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
index ee46af5b1..5317368ea 100644
--- a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  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
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,20 +45,20 @@
 //================================================================================
 /*!
  * \brief Constructor initialized by filter
-  * \param f - object filter
+ * \param f - object filter
  */
 //================================================================================
 
 StdMeshersGUI_LayerDistributionParamWdg
-::StdMeshersGUI_LayerDistributionParamWdg(SMESH::SMESH_Hypothesis_ptr hyp,
-                                          const QString& theName,
-                                          QDialog* dlg): 
-  QWidget(), myName(theName), myDlg( dlg )
+::StdMeshersGUI_LayerDistributionParamWdg(SMESH::SMESH_Hypothesis_ptr holderHyp,
+                                          SMESH::SMESH_Hypothesis_ptr distribHyp,
+                                          const QString&              name,
+                                          QDialog*                    dlg):
+  QWidget(), myDlg( dlg ), myName(name)
 {
+  myHolderHyp = SMESH::SMESH_Hypothesis::_duplicate( holderHyp );
   init();
-  set( hyp );
-//   if ( IsOk() )
-//     onEdit();
+  set( distribHyp );
 }
 
 //================================================================================
@@ -73,6 +73,7 @@ void StdMeshersGUI_LayerDistributionParamWdg::set(SMESH::SMESH_Hypothesis_ptr hy
   myHyp = SMESH::SMESH_Hypothesis::_nil();
   if ( !CORBA::is_nil( hyp )) {
     myHyp = SMESH::SMESH_Hypothesis::_duplicate( hyp );
+    myHyp->SetHolderHypothesis( myHolderHyp );
     myEditButton->setEnabled( true );
     myCreateButton->setText( tr("CHANGE_TYPE"));
     myParamValue = hyp->GetName();
@@ -96,7 +97,7 @@ StdMeshersGUI_LayerDistributionParamWdg::~StdMeshersGUI_LayerDistributionParamWd
 
 //================================================================================
 /*!
- * \brief Create a leayout, initialize fields
+ * \brief Create a layout, initialize fields
  */
 //================================================================================
 
@@ -110,9 +111,11 @@ void StdMeshersGUI_LayerDistributionParamWdg::init()
 
   myCreateButton = new QPushButton( this );
   myCreateButton->setObjectName( "createBut" );
+  myCreateButton->setMinimumWidth(100);
 
   myEditButton   = new QPushButton( tr("EDIT"), this );
   myEditButton->setObjectName( "editBut" );
+  myEditButton->setMinimumWidth(100);
 
   myHypTypePopup = new QMenu( this );
 
@@ -129,8 +132,8 @@ void StdMeshersGUI_LayerDistributionParamWdg::init()
   }
 
   aHBox->addWidget( myCreateButton );
+  aHBox->addStretch(5);
   aHBox->addWidget( myEditButton );
-  aHBox->addStretch();
 
   connect( myCreateButton, SIGNAL(clicked()), SLOT(onCreate()));
   connect( myEditButton,   SIGNAL(clicked()), SLOT(onEdit()));
@@ -149,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;
@@ -164,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();
 }
@@ -204,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,5 +227,8 @@ void StdMeshersGUI_LayerDistributionParamWdg::onEdit()
 void StdMeshersGUI_LayerDistributionParamWdg::onEdited( int result )
 {
   if ( myDlg )
-    myDlg->show();
+  {
+    //myDlg->show(); does not work
+    myDlg->setEnabled(true);
+  }
 }