Merge remote branch 'origin/V8_5_asterstudy'

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_AddQuadraticElementDlg.h

diff --git a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.h b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.h
index 7ef5800229dafcdc6005404a1ed0f77d78e8c003..72c049c799585cfdcb70f555f926363014345f48 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.h
+++ b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -54,7 +54,7 @@ class LightApp_SelectionMgr;
 
 namespace SMESH
 {
-  struct TElementSimulation;
+  struct TElementSimulationQuad;
 }
 
 //=================================================================================
@@ -92,7 +92,7 @@ private:
   
   SMESH::SMESH_Mesh_var       myMesh;
   SMESH_Actor*                myActor;
-  SMESH::TElementSimulation*  mySimulation;
+  SMESH::TElementSimulationQuad* mySimulation;
   QString                     myEntry;
   GrpList                     myGroups;
   
@@ -136,12 +136,14 @@ private slots:
   void                        onCellDoubleClicked( int, int );
   
   void                        ClickOnOk();
-  void                        ClickOnApply();
+  bool                        ClickOnApply();
   void                        ClickOnHelp();
   void                        SetCurrentSelection();
   void                        SelectionIntoArgument();
   void                        DeactivateActiveDialog();
   void                        ActivateThisDialog();
+  void                        onOpenView();
+  void                        onCloseView();
 };
 
 #endif // SMESHGUI_ADDQUADRATICELEMENTDLG_H