Minor changes.

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_Module.h

diff --git a/src/HYDROGUI/HYDROGUI_Module.h b/src/HYDROGUI/HYDROGUI_Module.h
index f7957e9c8c2b01c1695ef000afdecdf94c0bc135..e2dee3ee51dfc18f657a5f7f5bd2be705df80c3b 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Module.h
+++ b/src/HYDROGUI/HYDROGUI_Module.h
@@ -28,6 +28,7 @@
 #include <LightApp_Module.h>
 
 #include <QEvent>
+#include <QStack>
 
 class QGraphicsSceneMouseEvent;
 
@@ -45,6 +46,7 @@ class HYDROGUI_VTKPrsDisplayer;
 class HYDROGUI_AbstractDisplayer;
 class HYDROGUI_Shape;
 class HYDROGUI_VTKPrs;
+class HYDROGUI_Operation;
 
 /**\class HYDROGUI_Module
  *\brief The class representing the HYDROGUI module
@@ -79,8 +81,8 @@ public:
     double ZValue;
     ObjectState() : Visibility( false ), Transparency( 1.0 ), ZValue( 0.0 ) {}
   };
-  typedef QMap< QString, ObjectState > Name2ObjectStateMap;
-  typedef QMap< int, Name2ObjectStateMap > ViewId2Name2ObjectStateMap;
+  typedef QMap< QString, ObjectState > Entry2ObjectStateMap;
+  typedef QMap< int, Entry2ObjectStateMap > ViewId2Entry2ObjectStateMap;
 
   typedef QList<HYDROGUI_Shape*> ListOfShapes;
   typedef QMap<int,ListOfShapes> ViewId2ListOfShapes;
@@ -151,6 +153,9 @@ public:
   void                            removeObjectVTKPrs( const int                      theViewId,
                                                      const Handle(HYDROData_Entity)& theObject );
 
+  void                            removeObjectVTKPrs( const int      theViewId,
+                                                      const QString& theEntry );
+
   /**
    * Update global imposed range of Z values for the given VTK viewer id
    */
@@ -168,6 +173,9 @@ public:
    */
   virtual bool                    renameObject( const QString& theEntry, const QString& theName );
 
+  QStack<HYDROGUI_Operation*>&    getActiveOperations();
+  HYDROGUI_Operation*             activeOperation();
+
 protected:
   CAM_DataModel*                  createDataModel();
 
@@ -233,11 +241,12 @@ private:
   HYDROGUI_VTKPrsDisplayer*       myVTKDisplayer;
 
   ViewManagerMap                  myViewManagerMap;
-  ViewId2Name2ObjectStateMap      myObjectStateMap;
+  ViewId2Entry2ObjectStateMap     myObjectStateMap;
+
+  QStack<HYDROGUI_Operation*>     myActiveOperationMap;
 
   ViewId2ListOfShapes             myShapesMap;
   ViewId2ListOfVTKPrs             myVTKPrsMap;
-
   bool                            myIsUpdateEnabled;
 
   QStringList                     myGeomObjectsToImport; ///< entries of GEOM objects to be imported