Merge from V6_main 01/04/2013

[modules/smesh.git] / src / StdMeshersGUI / StdMeshersGUI_LayerDistributionParamWdg.cxx

diff --git a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
index ee46af5b11a5adfc286d2f14e6d9ff17aa50130d..4cbe1bce3493bdd033c946864519b15d0b3b0559 100644 (file)
--- 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-2013  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
@@ -50,15 +50,15 @@
 //================================================================================
 
 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(), myName(name), myDlg( dlg )
 {
+  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
  */
 //================================================================================