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 #682, #684 - #686: create icons for land cover map operations.
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ImportObstacleFromFileOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
b/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
index 6dba55c1adc20667ce80251f71b4104bfa1df7f5..5a639978d1e1eb1117568d4c8f829e6949ec5e3f 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.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
@@
-27,6
+23,7
@@
#include "HYDROGUI_DataModel.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_DataModel.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
#include "HYDROGUI_UpdateFlags.h"
#include <HYDROData_Obstacle.h>
#include "HYDROGUI_UpdateFlags.h"
#include <HYDROData_Obstacle.h>
@@
-156,8
+153,8
@@
bool HYDROGUI_ImportObstacleFromFileOp::processApply( int& theUpdateFlags,
if ( anObstacle.IsNull() ) {
anObstacle = Handle(HYDROData_Obstacle)::DownCast( doc()->CreateObject(KIND_OBSTACLE) );
if ( anObstacle.IsNull() ) {
anObstacle = Handle(HYDROData_Obstacle)::DownCast( doc()->CreateObject(KIND_OBSTACLE) );
- anObstacle->SetFillingColor(
HYDROData_Obstacle::
DefaultFillingColor() );
- anObstacle->SetBorderColor(
HYDROData_Obstacle::
DefaultBorderColor() );
+ anObstacle->SetFillingColor(
anObstacle->
DefaultFillingColor() );
+ anObstacle->SetBorderColor(
anObstacle->
DefaultBorderColor() );
}
if ( !anObstacle.IsNull() ) {
}
if ( !anObstacle.IsNull() ) {