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 'master' of ssh://git.salome-platform.org/modules/hydro
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_DigueOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_DigueOp.cxx
b/src/HYDROGUI/HYDROGUI_DigueOp.cxx
index 0d8c6073b778916acc6e38ba394587abee17b90e..0f5cb65a84674e2adbf4c935f4940c2d8a4b2201 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_DigueOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_DigueOp.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
@@
-54,9
+54,10
@@
void HYDROGUI_DigueOp::startOperation()
}
bool HYDROGUI_DigueOp::processApply( int& theUpdateFlags,
}
bool HYDROGUI_DigueOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
{
- if ( !HYDROGUI_ChannelOp::processApply( theUpdateFlags, theErrorMsg ) )
+ if ( !HYDROGUI_ChannelOp::processApply( theUpdateFlags, theErrorMsg
, theBrowseObjectsEntries
) )
return false;
if ( !myIsEdit )
return false;
if ( !myIsEdit )
@@
-75,8
+76,17
@@
HYDROGUI_InputPanel* HYDROGUI_DigueOp::createInputPanel() const
return aPanel;
}
return aPanel;
}
-Handle(HYDROData_Channel) HYDROGUI_DigueOp::
getObjectToEdi
t() const
+Handle(HYDROData_Channel) HYDROGUI_DigueOp::
createNewObjec
t() const
{
{
- return myIsEdit ? Handle(HYDROData_Digue)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ) :
- Handle(HYDROData_Digue)::DownCast( doc()->CreateObject( KIND_DIGUE ) );
+ return Handle(HYDROData_Digue)::DownCast( doc()->CreateObject( KIND_DIGUE ) );
+}
+
+QColor HYDROGUI_DigueOp::getDefaultFillingColor() const
+{
+ return HYDROData_Digue::DefaultFillingColor();
+}
+
+QColor HYDROGUI_DigueOp::getDefaultBorderColor() const
+{
+ return HYDROData_Digue::DefaultBorderColor();
}
}