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
Merge remote-tracking branch 'origin/BR_DEMO' into BR_2017
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_Shape.h
diff --git
a/src/HYDROGUI/HYDROGUI_Shape.h
b/src/HYDROGUI/HYDROGUI_Shape.h
index 397096cd2e13e9954ebbe2036552ace9c2ba459d..76b002ca1741b2d95a0344a2adab5f8212cfcee2 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_Shape.h
+++ b/
src/HYDROGUI/HYDROGUI_Shape.h
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 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
@@
-83,7
+79,8
@@
public:
virtual void setShape( const TopoDS_Shape& theShape,
const bool theToDisplay = true,
virtual void setShape( const TopoDS_Shape& theShape,
const bool theToDisplay = true,
- const bool theIsUpdateViewer = true );
+ const bool theIsUpdateViewer = true,
+ const int theDisplayMode = AIS_Shaded );
virtual void setFillingColor( const QColor& theColor,
const bool theToDisplay = true,
virtual void setFillingColor( const QColor& theColor,
const bool theToDisplay = true,
@@
-98,18
+95,22
@@
public:
virtual void setHighlightColor( const QColor& theColor );
virtual QColor getHighlightColor() const;
virtual void setHighlightColor( const QColor& theColor );
virtual QColor getHighlightColor() const;
- virtual Handle(AIS_InteractiveObject) getAISObject() const;
-
void setZLayer( const int theZLayer );
void setZLayer( const int theZLayer );
+ void setSelectionMode( int theSelectionMode );
+
+ QList<Handle(AIS_InteractiveObject)> getAISObjects() const;
protected:
virtual void buildShape();
virtual void updateShape( const bool theToDisplay = true,
const bool theIsUpdateViewer = true );
virtual void displayShape( const bool theIsUpdateViewer );
protected:
virtual void buildShape();
virtual void updateShape( const bool theToDisplay = true,
const bool theIsUpdateViewer = true );
virtual void displayShape( const bool theIsUpdateViewer );
+ virtual void eraseShape( const bool theIsUpdateViewer );
virtual QColor getActiveColor() const;
virtual QColor getActiveColor() const;
- virtual Handle_AIS_InteractiveObject createShape() const;
+ virtual QList<Handle(AIS_InteractiveObject)> createShape() const;
+
+ void setDisplayMode( int theDisplayMode );
private:
static double getQuantityColorVal( const int theColorVal );
private:
static double getQuantityColorVal( const int theColorVal );
@@
-118,7
+119,7
@@
private:
private:
Handle(AIS_InteractiveContext) myContext;
Handle(HYDROData_Entity) myObject;
private:
Handle(AIS_InteractiveContext) myContext;
Handle(HYDROData_Entity) myObject;
-
Handle(AIS_InteractiveObject) myShape
;
+
QList<Handle(AIS_InteractiveObject)> myShapes
;
int myZLayer;
int myZLayer;
@@
-128,6
+129,7
@@
private:
bool myIsHighlight;
TopoDS_Shape myTopoShape;
int myDisplayMode;
bool myIsHighlight;
TopoDS_Shape myTopoShape;
int myDisplayMode;
+ int mySelectionMode;
QColor myFillingColor;
QColor myBorderColor;
QColor myFillingColor;
QColor myBorderColor;