Update from V7_dev branch

[modules/homard.git] / src / HOMARDGUI / HOMARDGUI.h

diff --git a/src/HOMARDGUI/HOMARDGUI.h b/src/HOMARDGUI/HOMARDGUI.h
index c00798cbba9fe69117839dda9d6330105e6c165b..4d224c3f39b104c96f61a6d12e5d16db7bd2eac0 100644 (file)
--- a/src/HOMARDGUI/HOMARDGUI.h
+++ b/src/HOMARDGUI/HOMARDGUI.h
@@ -1,9 +1,9 @@
-// Copyright (C) 2011-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2011-2015  CEA/DEN, EDF R&D
 //
 // 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
@@ -34,7 +34,7 @@
 #include CORBA_CLIENT_HEADER(HOMARD_Cas)
 #include CORBA_CLIENT_HEADER(HOMARD_Hypothesis)
 
-#include <QtCore/QString>
+#include <QString>
 
 class SalomeApp_Application;
 
@@ -64,9 +64,12 @@ public slots:
 private slots:
     void OnGUIEvent();
     void EditAsciiFile();
-    void LanceCalcul();
+    void LanceCalcul0();
+    void LanceCalcul1();
     void IterInfo();
     void NextIter();
+    void MeshPublish0();
+    void MeshPublish1();
     void YACSCreate();
     void YACSWrite();
     void Edit();
@@ -81,6 +84,7 @@ private:
                             const int key = 0, const bool toggle = false );
    void createActions();
    void createMenus();
+   void recupPreferences();
    void createPopupMenus();
    _PTR(SObject)  chercheMonObjet();
 
@@ -91,6 +95,12 @@ private:
    int anId;
    QString _ObjectName;
    QString _LanguageShort ;
+   int _PublisMeshIN ;
+   int _PublisMeshOUT ;
+   int _YACSMaxIter ;
+   int _YACSMaxNode ;
+   int _YACSMaxElem ;
+   int _YACSTypeTest ;
 };
 
 #endif