X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_AddQuadraticElementDlg.h;h=19385a72cbb5ece59b0d7bc31414ed772e3cf9f8;hp=3b2c360b26f6bcf5dcdb889a6cad339b47b321b9;hb=1c3a10f8107fc78132341eb9543a42b4ea0e4fa0;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6

diff --git a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.h b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.h
index 3b2c360b2..19385a72c 100644
--- 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-2014  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;
 }
 
 //=================================================================================
@@ -73,11 +73,9 @@ private:
   typedef QList<SMESH::SMESH_GroupBase_var> GrpList;
 
   void                        Init();
-  void                        closeEvent( QCloseEvent* );
-  void                        hideEvent( QHideEvent* );    /* ESC key */
   void                        enterEvent( QEvent* );       /* mouse enter the QWidget */
   void                        keyPressEvent( QKeyEvent* );
-  void                        displaySimulation();
+  void                        displaySimulation(int = -1, int = -1);
   void                        UpdateTable( bool = true );
   bool                        IsValid();
   void                        updateButtons();
@@ -90,11 +88,12 @@ private:
   int                         myNbMidFaceNodes;
   int                         myNbCenterNodes;
   bool                        myBusy;
+  int                         myShift;
   SVTK_Selector*              mySelector;
   
   SMESH::SMESH_Mesh_var       myMesh;
   SMESH_Actor*                myActor;
-  SMESH::TElementSimulation*  mySimulation;
+  SMESH::TElementSimulationQuad* mySimulation;
   QString                     myEntry;
   GrpList                     myGroups;
   
@@ -114,6 +113,8 @@ private:
   QPushButton*                myCenterSelectButton;
   QLineEdit*                  myCenterNode;
   QTableWidget*               myTable;
+  QCheckBox*                  myAutomaticPresentation;
+  QPushButton*                myNextPresentationButton;
   QCheckBox*                  myReverseCB;
   
   QGroupBox*                  GroupGroups;
@@ -128,6 +129,9 @@ private:
   
   QString                     myHelpFileName;
   
+protected slots:
+  virtual void                reject();
+
 private slots:
   void                        onTextChange( const QString& );
   void                        onCellTextChange( int, int );
@@ -135,8 +139,7 @@ private slots:
   void                        onCellDoubleClicked( int, int );
   
   void                        ClickOnOk();
-  void                        ClickOnCancel();
-  void                        ClickOnApply();
+  bool                        ClickOnApply();
   void                        ClickOnHelp();
   void                        SetCurrentSelection();
   void                        SelectionIntoArgument();