Merge V9_dev branch into master

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

diff --git a/src/SMESHGUI/SMESHGUI_Operation.h b/src/SMESHGUI/SMESHGUI_Operation.h
index 398f1f8d0e200773177ddd9b6d3d10ede2fc53c6..0ddbff46dd3be180a3473c9b88492af13b710665 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_Operation.h
+++ b/src/SMESHGUI/SMESHGUI_Operation.h
@@ -1,32 +1,39 @@
-//  SMESH SMDS : implementaion of Salome mesh data structure
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE
-// 
-//  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// 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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//  File   : SMESHGUI_Operation.h
-//  Author : Sergey LITONIN
-//  Module : SALOME
 
+// SMESH SMDS : implementation of Salome mesh data structure
+// File   : SMESHGUI_Operation.h
+// Author : Sergey LITONIN, Open CASCADE S.A.S.
+//
+#ifndef SMESHGUI_OPERATION_H
+#define SMESHGUI_OPERATION_H
 
-#ifndef SMESHGUI_Operation_H
-#define SMESHGUI_Operation_H
+// SMESH includes
+#include "SMESH_SMESHGUI.hxx"
 
+// SALOME GUI includes
 #include <LightApp_Operation.h>
+
+// SALOME KERNEL includes
 #include <SALOMEDSClient.hxx>
 
 class SMESHGUI;
@@ -36,7 +43,7 @@ class SMESHGUI;
   Description : Base class for all SMESH operations
 */
 
-class SMESHGUI_Operation : public LightApp_Operation
+class SMESHGUI_EXPORT SMESHGUI_Operation : public LightApp_Operation
 {
   Q_OBJECT
 
@@ -51,29 +58,24 @@ protected:
   virtual void      startOperation();
   virtual bool      isReadyToStart() const;
   
+  virtual void      setIsApplyAndClose( const bool theFlag );
+  virtual bool      isApplyAndClose() const;
+
   //! Set according dialog active or inactive
   virtual void      setDialogActive( const bool );
 
   SMESHGUI*         getSMESHGUI() const;
-  bool              isStudyLocked( const bool = true ) const;
-
-  _PTR(Study)       studyDS() const;
   
   virtual bool      isValid( SUIT_Operation* ) const;
 
   QString           myHelpFileName;
+  bool              myIsApplyAndClose;
 
 protected slots:
-  virtual void onOk();
-  virtual bool onApply();
-  virtual void onCancel();
-  void onHelp();
+  virtual void      onOk();
+  virtual bool      onApply();
+  virtual void      onCancel();
+  void              onHelp();
 };
 
-#endif
-
-
-
-
-
-
+#endif // SMESHGUI_OPERATION_H