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_PrsPolylineDriver.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_PrsPolylineDriver.cxx
b/src/HYDROGUI/HYDROGUI_PrsPolylineDriver.cxx
index 54a75540eb9eee6d2205f6843e4faf85ceb29c46..5443aaa2d1298c7acbd52f6c80dea4901584330d 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_PrsPolylineDriver.cxx
+++ b/
src/HYDROGUI/HYDROGUI_PrsPolylineDriver.cxx
@@
-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
@@
-24,7
+20,7
@@
#include "HYDROGUI_PrsPolyline.h"
#include "HYDROGUI_PrsPolyline.h"
-#include <HYDROData_Polyline.h>
+#include <HYDROData_Polyline
XY
.h>
HYDROGUI_PrsPolylineDriver::HYDROGUI_PrsPolylineDriver()
:HYDROGUI_PrsDriver()
HYDROGUI_PrsPolylineDriver::HYDROGUI_PrsPolylineDriver()
:HYDROGUI_PrsDriver()
@@
-35,7
+31,7
@@
HYDROGUI_PrsPolylineDriver::~HYDROGUI_PrsPolylineDriver()
{
}
{
}
-bool HYDROGUI_PrsPolylineDriver::Update( const Handle(HYDROData_
Object
)& theObj,
+bool HYDROGUI_PrsPolylineDriver::Update( const Handle(HYDROData_
Entity
)& theObj,
HYDROGUI_Prs*& thePrs )
{
HYDROGUI_PrsDriver::Update( theObj, thePrs );
HYDROGUI_Prs*& thePrs )
{
HYDROGUI_PrsDriver::Update( theObj, thePrs );
@@
-43,7
+39,7
@@
bool HYDROGUI_PrsPolylineDriver::Update( const Handle(HYDROData_Object)& theObj,
if( theObj.IsNull() )
return false;
if( theObj.IsNull() )
return false;
- Handle(HYDROData_Polyline
) aPolyline = Handle(HYDROData_Polyline
)::DownCast( theObj );
+ Handle(HYDROData_Polyline
XY) aPolyline = Handle(HYDROData_PolylineXY
)::DownCast( theObj );
if( aPolyline.IsNull() )
return false;
if( aPolyline.IsNull() )
return false;
@@
-53,7
+49,7
@@
bool HYDROGUI_PrsPolylineDriver::Update( const Handle(HYDROData_Object)& theObj,
HYDROGUI_PrsPolyline* aPrsPolyline = (HYDROGUI_PrsPolyline*)thePrs;
aPrsPolyline->setName( aPolyline->GetName() );
HYDROGUI_PrsPolyline* aPrsPolyline = (HYDROGUI_PrsPolyline*)thePrs;
aPrsPolyline->setName( aPolyline->GetName() );
- aPrsPolyline->setPath( aPolyline->
p
ainterPath() );
+ aPrsPolyline->setPath( aPolyline->
GetP
ainterPath() );
aPrsPolyline->compute();
aPrsPolyline->compute();