X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Module.h;h=e2dee3ee51dfc18f657a5f7f5bd2be705df80c3b;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=1cfd15c837b815be5171ec8b64775ac96557cfc0;hpb=42c150905c5e9fbd5582687d0c78b8f102a77cea;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Module.h b/src/HYDROGUI/HYDROGUI_Module.h
index 1cfd15c8..e2dee3ee 100644
--- a/src/HYDROGUI/HYDROGUI_Module.h
+++ b/src/HYDROGUI/HYDROGUI_Module.h
@@ -28,7 +28,7 @@
 #include <LightApp_Module.h>
 
 #include <QEvent>
-#include <QPoint>
+#include <QStack>
 
 class QGraphicsSceneMouseEvent;
 
@@ -46,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
@@ -152,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
    */
@@ -169,9 +173,8 @@ public:
    */
   virtual bool                    renameObject( const QString& theEntry, const QString& theName );
 
-  int                             getObjectDisplayOrder( const int theViewId,
-                                                         const Handle(HYDROData_Entity)& theObject ) const;
-  QPoint                          getPopupPosition() const;
+  QStack<HYDROGUI_Operation*>&    getActiveOperations();
+  HYDROGUI_Operation*             activeOperation();
 
 protected:
   CAM_DataModel*                  createDataModel();
@@ -240,11 +243,10 @@ private:
   ViewManagerMap                  myViewManagerMap;
   ViewId2Entry2ObjectStateMap     myObjectStateMap;
 
-  QMap<int, QStringList>          myObjectDisplayOrderMap;
+  QStack<HYDROGUI_Operation*>     myActiveOperationMap;
 
   ViewId2ListOfShapes             myShapesMap;
   ViewId2ListOfVTKPrs             myVTKPrsMap;
-  QPoint                          myPopupPos;
   bool                            myIsUpdateEnabled;
 
   QStringList                     myGeomObjectsToImport; ///< entries of GEOM objects to be imported