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_ShapeBathymetry.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
index bf417bacb6586d455084c3dac8f687997aded7a4..fd8158e539b1f4d8bc143b1ce0b7000bb0b1dda1 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
@@
-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
@@
-26,7
+22,6
@@
#include <HYDROData_Bathymetry.h>
#include <AIS_InteractiveContext.hxx>
#include <HYDROData_Bathymetry.h>
#include <AIS_InteractiveContext.hxx>
-#include <AIS_Drawer.hxx>
#include <Aspect_ColorScale.hxx>
#include <Prs3d_PointAspect.hxx>
#include <Aspect_ColorScale.hxx>
#include <Prs3d_PointAspect.hxx>
@@
-37,6
+32,7
@@
HYDROGUI_ShapeBathymetry::HYDROGUI_ShapeBathymetry( HYDROGUI_OCCDisplayer*
: HYDROGUI_Shape( theContext, theBathymetry, theZLayer ),
myDisplayer( theDisplayer )
{
: HYDROGUI_Shape( theContext, theBathymetry, theZLayer ),
myDisplayer( theDisplayer )
{
+ setDisplayMode( AIS_PointCloud::DM_Points );
}
HYDROGUI_ShapeBathymetry::~HYDROGUI_ShapeBathymetry()
}
HYDROGUI_ShapeBathymetry::~HYDROGUI_ShapeBathymetry()
@@
-68,6
+64,7
@@
Handle_AIS_InteractiveObject HYDROGUI_ShapeBathymetry::createShape() const
if( !aBath.IsNull() )
{
Handle_AIS_PointCloud aPntCloud = new HYDROGUI_BathymetryPrs();
if( !aBath.IsNull() )
{
Handle_AIS_PointCloud aPntCloud = new HYDROGUI_BathymetryPrs();
+ aPntCloud->SetHilightMode( AIS_PointCloud::DM_BndBox );
aPntCloud->Attributes()->SetPointAspect (new Prs3d_PointAspect (Aspect_TOM_POINT, Quantity_NOC_WHITE, 2.0));
const HYDROData_Bathymetry::AltitudePoints& aBathPoints = aBath->GetAltitudePoints();
aPntCloud->Attributes()->SetPointAspect (new Prs3d_PointAspect (Aspect_TOM_POINT, Quantity_NOC_WHITE, 2.0));
const HYDROData_Bathymetry::AltitudePoints& aBathPoints = aBath->GetAltitudePoints();