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_Module.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_Module.cxx
b/src/HYDROGUI/HYDROGUI_Module.cxx
index 3c752c2996aa99ce20d71eaaae911d8d1504efb2..cbed2b66dc1943b3c443b75712ee31a944c3078e 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_Module.cxx
+++ b/
src/HYDROGUI/HYDROGUI_Module.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
@@
-577,6
+573,8
@@
void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
theMenu->addAction( action( CutImagesId ) );
theMenu->addAction( action( SplitImageId ) );
theMenu->addSeparator();
theMenu->addAction( action( CutImagesId ) );
theMenu->addAction( action( SplitImageId ) );
theMenu->addSeparator();
+ theMenu->addAction( action( RecognizeContoursId ) );
+ theMenu->addSeparator();
}
else if( anIsBathymetry )
{
}
else if( anIsBathymetry )
{
@@
-710,6
+708,21
@@
void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
if( isRoot )
theMenu->addAction( action( EditLocalCSId ) );
if( isRoot )
theMenu->addAction( action( EditLocalCSId ) );
+
+ if( anIsObjectBrowser && anOwners.size()==1 )
+ {
+ if( aSeq.Size() > 0 )
+ {
+ Handle( HYDROData_Object ) anObject = Handle( HYDROData_Object )::DownCast( aSeq.First() );
+ if( !anObject.IsNull() )
+ {
+ theMenu->addSeparator();
+ theMenu->addAction( action( SubmersibleId ) );
+ action( SubmersibleId )->setCheckable( true );
+ action( SubmersibleId )->setChecked( anObject->IsSubmersible() );
+ }
+ }
+ }
}
void HYDROGUI_Module::createPreferences()
}
void HYDROGUI_Module::createPreferences()