Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch for MacOS (from SALOME forum)
[modules/geom.git]
/
src
/
GEOMGUI
/
GEOM_Displayer.h
diff --git
a/src/GEOMGUI/GEOM_Displayer.h
b/src/GEOMGUI/GEOM_Displayer.h
index 0096c51b2cac3a5a30763e0627828d52e531dc61..cf5a9df5536ac20be2197a3758db9829b29bcb61 100644
(file)
--- a/
src/GEOMGUI/GEOM_Displayer.h
+++ b/
src/GEOMGUI/GEOM_Displayer.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-28,6
+28,7
@@
#define GEOM_DISPLAYER_H
#include "GEOM_GEOMGUI.hxx"
#define GEOM_DISPLAYER_H
#include "GEOM_GEOMGUI.hxx"
+#include <GEOM_AISShape.hxx>
#include <SALOME_InteractiveObject.hxx>
#include <SALOME_InteractiveObject.hxx>
@@
-44,7
+45,11
@@
class SALOME_OCCViewType;
#include <LightApp_Displayer.h>
#include <LightApp_Study.h>
#include <Aspect_TypeOfMarker.hxx>
#include <LightApp_Displayer.h>
#include <LightApp_Study.h>
#include <Aspect_TypeOfMarker.hxx>
+#if OCC_VERSION_MAJOR >= 7
+ #include <AIS_ColorScale.hxx>
+#endif
#include <TCollection_AsciiString.hxx>
#include <TCollection_AsciiString.hxx>
+#include <TColStd_MapOfInteger.hxx>
#include <Basics_OCCTVersion.hxx>
#include <QList>
#include <Basics_OCCTVersion.hxx>
#include <QList>
@@
-60,14
+65,11
@@
class SALOME_OCCViewType;
typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
-class TColStd_MapOfInteger;
class LightApp_SelectionMgr;
class SalomeApp_Study;
class SalomeApp_Application;
class SUIT_SelectionFilter;
class LightApp_SelectionMgr;
class SalomeApp_Study;
class SalomeApp_Application;
class SUIT_SelectionFilter;
-class Handle_GEOM_AISShape;
class gp_Ax3;
class gp_Ax3;
-//class SALOME_Selection;
class GEOMGUI_EXPORT GEOM_Displayer : public LightApp_Displayer
{
class GEOMGUI_EXPORT GEOM_Displayer : public LightApp_Displayer
{
@@
-162,7
+164,20
@@
public:
void SetIsosWidth ( const int );
int GetIsosWidth () const;
bool HasIsosWidth () const;
void SetIsosWidth ( const int );
int GetIsosWidth () const;
bool HasIsosWidth () const;
+
+ /* Set nb iso-libes for displaying. Use -1 to set default values. */
+ int SetNbIsos( const int );
+ int UnsetNbIsos();
+ int GetNbIsos() const;
+ bool HasNbIsos() const;
+ /* Set color for iso-lines displaying. If it is equal -1 then default color is used.
+ Available values are from Quantity_NameOfColor enumeration */
+ int SetIsosColor ( const int );
+ int UnsetIsosColor();
+ int GetIsosColor () const;
+ bool HasIsosColor () const;
+
/* Set display mode shape displaying. If it is equal -1 then display mode is used. */
int SetDisplayMode( const int );
int GetDisplayMode() const;
/* Set display mode shape displaying. If it is equal -1 then display mode is used. */
int SetDisplayMode( const int );
int GetDisplayMode() const;
@@
-186,7
+201,9
@@
public:
bool ToActivate() const;
/* Activate/Deactivate selection*/
bool ToActivate() const;
/* Activate/Deactivate selection*/
+ void LocalSelection( const Handle(SALOME_InteractiveObject)&, const std::list<int> );
void LocalSelection( const Handle(SALOME_InteractiveObject)&, const int );
void LocalSelection( const Handle(SALOME_InteractiveObject)&, const int );
+ void LocalSelection( const SALOME_ListIO& theIOList, const std::list<int> );
void LocalSelection( const SALOME_ListIO& theIOList, const int );
void GlobalSelection( const int = GEOM_ALLOBJECTS, const bool = false );
void GlobalSelection( const TColStd_MapOfInteger&, const bool = false, const QList<int>* = 0 );
void LocalSelection( const SALOME_ListIO& theIOList, const int );
void GlobalSelection( const int = GEOM_ALLOBJECTS, const bool = false );
void GlobalSelection( const TColStd_MapOfInteger&, const bool = false, const QList<int>* = 0 );
@@
-283,19
+300,23
@@
protected:
std::string myTexture;
int myType;
SALOME_View* myViewFrame;
std::string myTexture;
int myType;
SALOME_View* myViewFrame;
+#if OCC_VERSION_MAJOR >= 7
+ Handle(AIS_ColorScale) myColorScale;
+#endif
// Attributes
Quantity_Color myShadingColor;
int myColor;
double myWidth;
int myIsosWidth;
// Attributes
Quantity_Color myShadingColor;
int myColor;
double myWidth;
int myIsosWidth;
+ int myNbIsos;
+ int myIsosColor;
bool myToActivate;
int myDisplayMode;
bool myHasDisplayMode;
Aspect_TypeOfMarker myTypeOfMarker;
double myScaleOfMarker;
double myTransparency;
bool myToActivate;
int myDisplayMode;
bool myHasDisplayMode;
Aspect_TypeOfMarker myTypeOfMarker;
double myScaleOfMarker;
double myTransparency;
- bool myHasTransparency;
private:
SalomeApp_Application* myApp;
private:
SalomeApp_Application* myApp;