Reduce code

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_HomardBoundaryDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_HomardBoundaryDlg.cxx b/src/SMESHGUI/SMESHGUI_HomardBoundaryDlg.cxx
index 7d51a886af358ff06e1b6da179f722489afb45e4..97fc628c47a6bfecea3c95255211fd56fffd7abb 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_HomardBoundaryDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_HomardBoundaryDlg.cxx
@@ -44,8 +44,8 @@ using namespace std;
 
 // ----------------------------------------------------------------------------------
 SMESH_CreateBoundaryAn::SMESH_CreateBoundaryAn(SMESHGUI_HomardAdaptDlg* parent, bool modal,
-                                         SMESHHOMARD::HOMARD_Gen_var myHomardGen0,
-                                         QString caseName) :
+                                               SMESHHOMARD::HOMARD_Gen_var myHomardGen0,
+                                               QString caseName) :
 /* Constructs a SMESH_CreateBoundaryAn
    appele pour une vraie creation
    initialise un cylindre et non une sphere
@@ -106,8 +106,8 @@ SMESH_CreateBoundaryAn::SMESH_CreateBoundaryAn(SMESHGUI_HomardAdaptDlg* parent,
 
 // -------------------------------------------------------------------------------
 SMESH_CreateBoundaryAn::SMESH_CreateBoundaryAn(SMESHGUI_HomardAdaptDlg* parent,
-                                         SMESHHOMARD::HOMARD_Gen_var myHomardGen0,
-                                         QString caseName):
+                                               SMESHHOMARD::HOMARD_Gen_var myHomardGen0,
+                                               QString caseName):
     QDialog(0), SMESH_Ui_CreateBoundaryAn(),
     _parent(parent),
     _Name (""),
@@ -117,10 +117,10 @@ SMESH_CreateBoundaryAn::SMESH_CreateBoundaryAn(SMESHGUI_HomardAdaptDlg* parent,
     // Pour affichage lors de l edition d une BoundaryAn sans nom de Cas
     _Xcentre(0), _Ycentre(0), _Zcentre(0), _Rayon(0),
     _Xmin(1), _Xmax(1), _Xincr(1), _Ymin(1), _Ymax(1), _Yincr(1), _Zmin(1), _Zmax(1), _Zincr(1), _DMax(1),
-     Chgt (false),
-     myHomardGen(myHomardGen0)
+     Chgt (false)
     {
   //  MESSAGE("Debut de  SMESH_CreateBoundaryAn")
+      myHomardGen = SMESHHOMARD::HOMARD_Gen::_duplicate(myHomardGen0);
       setupUi(this);
       SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
       QPixmap pix = resMgr->loadPixmap( "HOMARD", "spherepoint.png" );
@@ -509,9 +509,7 @@ void SMESH_CreateBoundaryAn::PushOnOK()
 void SMESH_CreateBoundaryAn::PushOnHelp()
 // ------------------------------------------------------------------------
 {
-  SMESH::ShowHelpFile(QString("gui_create_boundary.html"));
-  //std::string LanguageShort = myHomardGen->GetLanguageShort();
-  //HOMARD_UTILS::PushOnHelp(QString("gui_create_boundary.html"), QString("un-cylindre"), QString(LanguageShort.c_str()));
+  SMESH::ShowHelpFile(QString("homard_create_boundary.html#analytical-boundary"));
 }
 
 // -----------------------------------
@@ -807,8 +805,8 @@ void SMESH_CreateBoundaryAn::convertRayonAngle(int option)
 
 // -------------------------------------------------------------------------------
 SMESH_CreateBoundaryCAO::SMESH_CreateBoundaryCAO(SMESHGUI_HomardAdaptDlg* parent, bool modal,
-                                           SMESHHOMARD::HOMARD_Gen_var myHomardGen0,
-                                           QString caseName, QString aName)
+                                                 SMESHHOMARD::HOMARD_Gen_var myHomardGen0,
+                                                 QString caseName, QString aName)
 // ---------------------------------------------------------------------------------
 /* Constructs a SMESH_CreateBoundaryCAO */
     :
@@ -903,9 +901,7 @@ void SMESH_CreateBoundaryCAO::PushOnOK()
 void SMESH_CreateBoundaryCAO::PushOnHelp()
 // ------------------------------------------------------------------------
 {
-  SMESH::ShowHelpFile(QString("gui_create_boundary.html"));
-  //std::string LanguageShort = myHomardGen->GetLanguageShort();
-  //HOMARD_UTILS::PushOnHelp(QString("gui_create_boundary.html"), QString("CAO"), QString(LanguageShort.c_str()));
+  SMESH::ShowHelpFile(QString("homard_create_boundary.html#cao-boundary"));
 }
 // ------------------------------------------------------------------------
 void SMESH_CreateBoundaryCAO::AssocieLesGroupes()
@@ -960,7 +956,7 @@ void SMESH_CreateBoundaryCAO::setGroups (QStringList listGroup)
 }
 // ------------------------------------------------------------------------
 void SMESH_CreateBoundaryCAO::SetFiltrage()
-// // ------------------------------------------------------------------------
+// ------------------------------------------------------------------------
 {
   if (!CBGroupe->isChecked()) return;
 
@@ -972,8 +968,8 @@ void SMESH_CreateBoundaryCAO::SetFiltrage()
 
 // -------------------------------------------------------------------------------
 SMESH_CreateBoundaryDi::SMESH_CreateBoundaryDi(SMESHGUI_HomardAdaptDlg* parent, bool modal,
-                                         SMESHHOMARD::HOMARD_Gen_var myHomardGen0,
-                                         QString caseName, QString aName)
+                                               SMESHHOMARD::HOMARD_Gen_var myHomardGen0,
+                                               QString caseName, QString aName)
 // ---------------------------------------------------------------------------------
 /* Constructs a SMESH_CreateBoundaryDi */
     :
@@ -1077,9 +1073,7 @@ void SMESH_CreateBoundaryDi::PushOnOK()
 void SMESH_CreateBoundaryDi::PushOnHelp()
 // ------------------------------------------------------------------------
 {
-  SMESH::ShowHelpFile(QString("gui_create_boundary.html"));
-  //std::string LanguageShort = myHomardGen->GetLanguageShort();
-  //HOMARD_UTILS::PushOnHelp(QString("gui_create_boundary.html"), QString("frontiere-discrete"), QString(LanguageShort.c_str()));
+  SMESH::ShowHelpFile(QString("homard_create_boundary.html#discrete-boundary"));
 }
 // ------------------------------------------------------------------------
 void SMESH_CreateBoundaryDi::AssocieLesGroupes()
@@ -1146,13 +1140,13 @@ void SMESH_CreateBoundaryDi::SetFiltrage()
 
 // ------------------------------------------------------------------------
 SMESH_EditBoundaryAn::SMESH_EditBoundaryAn( SMESHGUI_HomardAdaptDlg* parent, bool modal,
-                                      SMESHHOMARD::HOMARD_Gen_var myHomardGen,
-                                      QString caseName, QString Name ):
+                                            SMESHHOMARD::HOMARD_Gen_var myHomardGen0,
+                                            QString caseName, QString Name ):
 // ------------------------------------------------------------------------
 /* Constructs a SMESH_EditBoundaryAn
     herite de SMESH_CreateBoundaryAn
 */
-    SMESH_CreateBoundaryAn(parent, myHomardGen, caseName)
+    SMESH_CreateBoundaryAn(parent, myHomardGen0, caseName)
 {
     MESSAGE("Debut de SMESH_EditBoundaryAn pour " << Name.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_BOUN_A_EDIT_WINDOW_TITLE"));
@@ -1522,9 +1516,9 @@ bool SMESH_EditBoundaryAn::CreateOrUpdateBoundaryAn()
 */
 // --------------------------------------------------------------------------------------
 SMESH_EditBoundaryCAO::SMESH_EditBoundaryCAO( SMESHGUI_HomardAdaptDlg* parent, bool modal,
-                                              SMESHHOMARD::HOMARD_Gen_var myHomardGen,
+                                              SMESHHOMARD::HOMARD_Gen_var myHomardGen0,
                                               QString caseName, QString Name):
-    SMESH_CreateBoundaryCAO(parent, modal, myHomardGen, caseName, Name)
+    SMESH_CreateBoundaryCAO(parent, modal, myHomardGen0, caseName, Name)
 {
     MESSAGE("Debut de Boundary pour " << Name.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_BOUN_C_EDIT_WINDOW_TITLE"));
@@ -1570,11 +1564,11 @@ bool SMESH_EditBoundaryCAO::PushOnApply()
 }
 // ------------------------------------------------------------------------
 void SMESH_EditBoundaryCAO::SetFiltrage()
-// // ------------------------------------------------------------------------
+// ------------------------------------------------------------------------
 {
   if (!CBGroupe->isChecked()) return;
-  SMESHHOMARD::HOMARD_Cas_var monCas = myHomardGen->GetCase();
-  SMESHHOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
+  //SMESHHOMARD::HOMARD_Cas_var monCas = myHomardGen->GetCase();
+  //SMESHHOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
 
   SMESH_EditListGroupCAO *aDlg = new SMESH_EditListGroupCAO
     (this, true, SMESHHOMARD::HOMARD_Gen::_duplicate(myHomardGen),
@@ -1582,15 +1576,15 @@ void SMESH_EditBoundaryCAO::SetFiltrage()
   aDlg->show();
 }
 
-// -------------------------------------------------------------------------------------------------------------------------------------
-SMESH_EditBoundaryDi::SMESH_EditBoundaryDi( SMESHGUI_HomardAdaptDlg* parent, bool modal,
-                                      SMESHHOMARD::HOMARD_Gen_var myHomardGen,
-                                      QString caseName, QString Name):
-// -------------------------------------------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------
 /* Constructs a SMESH_EditBoundaryDi
     herite de SMESH_CreateBoundaryDi
 */
-  SMESH_CreateBoundaryDi(parent, modal, myHomardGen, caseName, Name)
+// ------------------------------------------------------------------------------------
+SMESH_EditBoundaryDi::SMESH_EditBoundaryDi( SMESHGUI_HomardAdaptDlg* parent, bool modal,
+                                            SMESHHOMARD::HOMARD_Gen_var myHomardGen0,
+                                            QString caseName, QString Name):
+  SMESH_CreateBoundaryDi(parent, modal, myHomardGen0, caseName, Name)
 {
     MESSAGE("Debut de Boundary pour " << Name.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_BOUN_D_EDIT_WINDOW_TITLE"));