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 remote-tracking branch 'origin/BR_SHP_FORMAT2' into BR_LAND_COVER_MAP
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_StreamOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_StreamOp.cxx
b/src/HYDROGUI/HYDROGUI_StreamOp.cxx
index 6162acb8e391d9ae2836e8f09dc9e084886dbd42..a2072046345be71268bd07eeb74fdbcfe26457c6 100755
(executable)
--- a/
src/HYDROGUI/HYDROGUI_StreamOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_StreamOp.cxx
@@
-245,13
+245,13
@@
bool HYDROGUI_StreamOp::processApply( int& theUpdateFlags,
myEditedObject->SetHydraulicAxis( aHydAxis );
myEditedObject->SetProfiles( aRefProfiles, false );
myEditedObject->SetHydraulicAxis( aHydAxis );
myEditedObject->SetProfiles( aRefProfiles, false );
- if ( myEditedObject->IsMustBeUpdated() )
+ if ( myEditedObject->IsMustBeUpdated(
HYDROData_Entity::Geom_2d
) )
myEditedObject->Update();
if ( !myIsEdit )
{
myEditedObject->Update();
if ( !myIsEdit )
{
- myEditedObject->SetFillingColor(
HYDROData_Stream::
DefaultFillingColor() );
- myEditedObject->SetBorderColor(
HYDROData_Stream::
DefaultBorderColor() );
+ myEditedObject->SetFillingColor(
myEditedObject->
DefaultFillingColor() );
+ myEditedObject->SetBorderColor(
myEditedObject->
DefaultBorderColor() );
}
// Erase preview
}
// Erase preview
@@
-291,8
+291,8
@@
void HYDROGUI_StreamOp::createPreview()
{
myPreviewPrs = new HYDROGUI_Shape( aCtx, NULL, getPreviewZLayer() );
{
myPreviewPrs = new HYDROGUI_Shape( aCtx, NULL, getPreviewZLayer() );
- QColor aFillingColor =
HYDROData_Stream::DefaultFillingColor()
;
- QColor aBorderColor =
HYDROData_Stream::DefaultBorderColor()
;
+ QColor aFillingColor =
Qt::green
;
+ QColor aBorderColor =
Qt::transparent
;
if ( !myEditedObject.IsNull() )
{
aFillingColor = myEditedObject->GetFillingColor();
if ( !myEditedObject.IsNull() )
{
aFillingColor = myEditedObject->GetFillingColor();