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 #550: fix crash when myObject is NULL
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_Displayer.h
diff --git
a/src/HYDROGUI/HYDROGUI_Displayer.h
b/src/HYDROGUI/HYDROGUI_Displayer.h
index bc01eb9017ca8a7593da0964df54945c01345136..b4a574ed450bbb01763e3d3c578aeb7a2e6c3fd6 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_Displayer.h
+++ b/
src/HYDROGUI/HYDROGUI_Displayer.h
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 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
// License as published by the Free Software Foundation; either
// 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.
+// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,23
+16,25
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
#ifndef HYDROGUI_DISPLAYER_H
#define HYDROGUI_DISPLAYER_H
#ifndef HYDROGUI_DISPLAYER_H
#define HYDROGUI_DISPLAYER_H
-#include
<HYDROData_Entity.h>
+#include
"HYDROGUI_AbstractDisplayer.h"
#include <QMap>
#include <QMap>
+#include <QPoint>
+#include <vtkNew.h>
-class HYDROGUI_Module;
class HYDROGUI_PrsDriver;
class HYDROGUI_PrsDriver;
-
-class
GraphicsView_View
er;
+class SUIT_ViewWindow;
+class
vtkWorldPointPick
er;
/**
/**
- * \class HYDROGUI_D
ataModel
- * \brief Class intended to create, display and update the presentations.
+ * \class HYDROGUI_D
isplayer
+ * \brief Class intended to create, display and update the presentations
in 2D graphics viewer
.
*/
*/
-class HYDROGUI_Displayer
+class HYDROGUI_Displayer
: public HYDROGUI_AbstractDisplayer
{
public:
/**
{
public:
/**
@@
-56,69
+54,68
@@
public:
* \param theObjs sequence of objects to update
* \param theViewerId viewer identifier
*/
* \param theObjs sequence of objects to update
* \param theViewerId viewer identifier
*/
- void
SetToUpdate( const HYDROData_SequenceOfObjects& theObjs,
-
const int theViewerId );
+ void SetToUpdate( const HYDROData_SequenceOfObjects& theObjs,
+ const int theViewerId );
/**
/**
- * \brief Update all objects in the viewer.
- * \param theViewerId viewer identifier
- * \param theIsInit flag used for initial update
- * \param theIsForced flag used to update all objects, including the unchanged ones
+ * \brief Get the applicable viewer type.
*/
*/
- void UpdateAll( const int theViewerId,
- const bool theIsInit,
- const bool theIsForced );
+ virtual QString GetType() const;
-protected:
- /**
- * \brief Erase all viewer objects.
- * \param theViewerId viewer identifier
+ /*
+ * Get the current cursor view position and save it in the displayer
+ * to be used in the obtaining the view coordinates of the cursor.
+ * \param theViewWindow a view window. If a view window is null, an active view is used
+ * only OCC and VTK views are processed
*/
*/
- void EraseAll( const int theViewerId );
-
+ void SaveCursorViewPosition( SUIT_ViewWindow* theViewWindow = 0 );
/**
/**
- * \brief Update and display all objects in the viewer.
- * \param theViewerId viewer identifier
- * \param theIsForced flag used to update all objects, including the unchanged ones
+ * \brief Get the coodinates from the view window, projected on XOY plane
+ * \param theViewWindow a view window
+ * \param theXCoordinate a X coordinate
+ * \param theXCoordinate an Y coordinate
+ * \param theXCoordinate a Z coordinate, has a zero value because of the plane
+ * \return true if the coordinates are got
*/
*/
- void DisplayAll( const int theViewerId,
- const bool theIsForced );
-
+ bool GetCursorViewCoordinates( SUIT_ViewWindow* theViewWindow,
+ double& theXCoordinate,
+ double& theYCoordinate,
+ double& theZCoordinate );
+protected:
/**
/**
- * \brief Update the specified viewer objects.
- * \param theObjs sequence of objects to update
+ * \brief Erase all viewer objects.
* \param theViewerId viewer identifier
* \param theViewerId viewer identifier
- * \param theIsForced flag used to update all objects, including the unchanged ones
*/
*/
- void Update( const HYDROData_SequenceOfObjects& theObjs,
- const int theViewerId,
- const bool theIsForced );
+ void EraseAll( const int theViewerId );
/**
* \brief Erase the specified viewer objects.
* \param theObjs sequence of objects to erase
* \param theViewerId viewer identifier
*/
/**
* \brief Erase the specified viewer objects.
* \param theObjs sequence of objects to erase
* \param theViewerId viewer identifier
*/
- void
Erase( const HYDROData_SequenceOfObjects& theObjs,
-
const int theViewerId );
+ void Erase( const HYDROData_SequenceOfObjects& theObjs,
+ const int theViewerId );
/**
* \brief Display the specified viewer objects.
* \param theObjs sequence of objects to display
* \param theViewerId viewer identifier
* \param theIsForced flag used to update all objects, including the unchanged ones
/**
* \brief Display the specified viewer objects.
* \param theObjs sequence of objects to display
* \param theViewerId viewer identifier
* \param theIsForced flag used to update all objects, including the unchanged ones
+ * \param theDoFitAll flag used to fit the view to all visible objects; do not fit by default
*/
*/
- void Display( const HYDROData_SequenceOfObjects& theObjs,
- const int theViewerId,
- const bool theIsForced );
+ void Display( const HYDROData_SequenceOfObjects& theObjs,
+ const int theViewerId,
+ const bool theIsForced,
+ const bool theDoFitAll );
-pr
ivate
:
+pr
otected
:
/**
* \brief Purge all invalid objects in the viewer.
* \param theViewerId viewer identifier
*/
/**
* \brief Purge all invalid objects in the viewer.
* \param theViewerId viewer identifier
*/
- void
purgeObjects( const int theViewerId );
+ void purgeObjects( const int theViewerId );
+private:
/**
* \brief Get the presentation driver for the specified data object.
* \param theObj data object
/**
* \brief Get the presentation driver for the specified data object.
* \param theObj data object
@@
-126,10
+123,12
@@
private:
HYDROGUI_PrsDriver* getDriver( const Handle(HYDROData_Entity)& theObj );
private:
HYDROGUI_PrsDriver* getDriver( const Handle(HYDROData_Entity)& theObj );
private:
- HYDROGUI_Module* myModule;
-
typedef QMap< ObjectKind, HYDROGUI_PrsDriver* > PrsDriversMap;
PrsDriversMap myPrsDriversMap;
typedef QMap< ObjectKind, HYDROGUI_PrsDriver* > PrsDriversMap;
PrsDriversMap myPrsDriversMap;
+ vtkNew<vtkWorldPointPicker> myPicker;
+ int myXPosition;
+ int myYPosition;
+ bool myIsPositionSaved;
};
#endif
};
#endif