Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/occ/compounds_processing'
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_OperationMgr.h
diff --git
a/src/XGUI/XGUI_OperationMgr.h
b/src/XGUI/XGUI_OperationMgr.h
old mode 100755
(executable)
new mode 100644
(file)
index
81b414f
..
503c79c
--- a/
src/XGUI/XGUI_OperationMgr.h
+++ b/
src/XGUI/XGUI_OperationMgr.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-201
7
CEA/DEN, EDF R&D
+// Copyright (C) 2014-201
9
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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-12,10
+12,9
@@
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
//
// 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA
//
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef XGUI_OperationMgr_H
//
#ifndef XGUI_OperationMgr_H
@@
-53,8
+52,8
@@
public:
/// Enumeration of kind of message that is used when trying to stop the active operation
enum XGUI_MessageKind
{
/// Enumeration of kind of message that is used when trying to stop the active operation
enum XGUI_MessageKind
{
- XGUI_AbortOperationMessage, //< warns and give possibility to abort current operation
- XGUI_InformationMessage //< ask to apply the current operation before performing something
+ XGUI_AbortOperationMessage, //
/
< warns and give possibility to abort current operation
+ XGUI_InformationMessage //
/
< ask to apply the current operation before performing something
};
public:
};
public:
@@
-113,6
+112,10
@@
public:
/// else, or if there is no parent - returns NULL
ModuleBase_Operation* previousOperation(ModuleBase_Operation* theOperation) const;
/// else, or if there is no parent - returns NULL
ModuleBase_Operation* previousOperation(ModuleBase_Operation* theOperation) const;
+ /// Returns an active widget of the current operation.
+ /// \return widget or NULL
+ ModuleBase_ModelWidget* activeWidget() const;
+
/// Start the operation and append it to the stack of operations
/// \param theOperation the started operation
/// \return the state whether the current operation is started
/// Start the operation and append it to the stack of operations
/// \param theOperation the started operation
/// \return the state whether the current operation is started
@@
-261,6
+264,12
@@
private:
/// \return message box
static QMessageBox* createMessageBox(const QString& theMessage);
/// \return message box
static QMessageBox* createMessageBox(const QString& theMessage);
+ /// Creates information message box with OK button,
+ /// Escape is Null button
+ /// \param theMessage text of the message
+ /// \return message box
+ static QMessageBox* createInformationBox(const QString& theMessage);
+
private:
typedef QList<ModuleBase_Operation*> Operations; ///< definition for a list of operations
Operations myOperations; ///< a stack of started operations. The active operation is on top,
private:
typedef QList<ModuleBase_Operation*> Operations; ///< definition for a list of operations
Operations myOperations; ///< a stack of started operations. The active operation is on top,