Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #430: incorrect coordinates in dump polyline
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_Module.h
diff --git
a/src/HYDROGUI/HYDROGUI_Module.h
b/src/HYDROGUI/HYDROGUI_Module.h
index a51ef9d27558b318fffcac036f07e72445935e2c..e2dee3ee51dfc18f657a5f7f5bd2be705df80c3b 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_Module.h
+++ b/
src/HYDROGUI/HYDROGUI_Module.h
@@
-28,15
+28,13
@@
#include <LightApp_Module.h>
#include <QEvent>
#include <LightApp_Module.h>
#include <QEvent>
-
-#include <vtkNew.h>
+#include <QStack>
class QGraphicsSceneMouseEvent;
class GraphicsView_Viewer;
class OCCViewer_Viewer;
class SVTK_Viewer;
class QGraphicsSceneMouseEvent;
class GraphicsView_Viewer;
class OCCViewer_Viewer;
class SVTK_Viewer;
-class vtkWorldPointPicker;
class SUIT_ViewWindow;
class SUIT_ViewManager;
class SUIT_ViewWindow;
class SUIT_ViewManager;
@@
-48,6
+46,7
@@
class HYDROGUI_VTKPrsDisplayer;
class HYDROGUI_AbstractDisplayer;
class HYDROGUI_Shape;
class HYDROGUI_VTKPrs;
class HYDROGUI_AbstractDisplayer;
class HYDROGUI_Shape;
class HYDROGUI_VTKPrs;
+class HYDROGUI_Operation;
/**\class HYDROGUI_Module
*\brief The class representing the HYDROGUI module
/**\class HYDROGUI_Module
*\brief The class representing the HYDROGUI module
@@
-154,6
+153,9
@@
public:
void removeObjectVTKPrs( const int theViewId,
const Handle(HYDROData_Entity)& theObject );
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
*/
/**
* Update global imposed range of Z values for the given VTK viewer id
*/
@@
-171,6
+173,9
@@
public:
*/
virtual bool renameObject( const QString& theEntry, const QString& theName );
*/
virtual bool renameObject( const QString& theEntry, const QString& theName );
+ QStack<HYDROGUI_Operation*>& getActiveOperations();
+ HYDROGUI_Operation* activeOperation();
+
protected:
CAM_DataModel* createDataModel();
protected:
CAM_DataModel* createDataModel();
@@
-236,12
+241,12
@@
private:
HYDROGUI_VTKPrsDisplayer* myVTKDisplayer;
ViewManagerMap myViewManagerMap;
HYDROGUI_VTKPrsDisplayer* myVTKDisplayer;
ViewManagerMap myViewManagerMap;
- ViewId2Entry2ObjectStateMap myObjectStateMap;
+ ViewId2Entry2ObjectStateMap myObjectStateMap;
+
+ QStack<HYDROGUI_Operation*> myActiveOperationMap;
ViewId2ListOfShapes myShapesMap;
ViewId2ListOfVTKPrs myVTKPrsMap;
ViewId2ListOfShapes myShapesMap;
ViewId2ListOfVTKPrs myVTKPrsMap;
- vtkNew<vtkWorldPointPicker> myPicker;
-
bool myIsUpdateEnabled;
QStringList myGeomObjectsToImport; ///< entries of GEOM objects to be imported
bool myIsUpdateEnabled;
QStringList myGeomObjectsToImport; ///< entries of GEOM objects to be imported