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 branch 'BR_v14_rc' into BR_quadtree
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_Shape.h
diff --git
a/src/HYDROGUI/HYDROGUI_Shape.h
b/src/HYDROGUI/HYDROGUI_Shape.h
index 64548763669e165503aacf191ca22cc8dcfd4f3d..0acd1a4509b6b67e56b15b7201c8e5fc80a468c6 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_Shape.h
+++ b/
src/HYDROGUI/HYDROGUI_Shape.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
@@
-106,11
+102,13
@@
protected:
virtual void buildShape();
virtual void updateShape( const bool theToDisplay = true,
const bool theIsUpdateViewer = true );
virtual void buildShape();
virtual void updateShape( const bool theToDisplay = true,
const bool theIsUpdateViewer = true );
- v
oid
displayShape( const bool theIsUpdateViewer );
+ v
irtual void
displayShape( const bool theIsUpdateViewer );
virtual QColor getActiveColor() const;
virtual Handle_AIS_InteractiveObject createShape() const;
virtual QColor getActiveColor() const;
virtual Handle_AIS_InteractiveObject createShape() const;
+ void setDisplayMode( int theDisplayMode );
+
private:
static double getQuantityColorVal( const int theColorVal );
void colorShapeBorder( const QColor& theColor );
private:
static double getQuantityColorVal( const int theColorVal );
void colorShapeBorder( const QColor& theColor );