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_SHAPE_RECOGNITION' into BR_v14_rc
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_StreamOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_StreamOp.cxx
b/src/HYDROGUI/HYDROGUI_StreamOp.cxx
index cabf8c677b047fd4c88830eb661c316e840234ae..d11ea2c3f3ef669b7479e5c89a86eb8c83e9ba0d 100755
(executable)
--- a/
src/HYDROGUI/HYDROGUI_StreamOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_StreamOp.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
@@
-23,6
+19,7
@@
#include "HYDROGUI_StreamOp.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_StreamOp.h"
#include "HYDROGUI_Module.h"
+#include <HYDROGUI_DataObject.h>
#include "HYDROGUI_Shape.h"
#include "HYDROGUI_StreamDlg.h"
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_Shape.h"
#include "HYDROGUI_StreamDlg.h"
#include "HYDROGUI_Tool.h"
@@
-95,7
+92,8
@@
void HYDROGUI_StreamOp::startOperation()
{
HYDROGUI_Operation::startOperation();
{
HYDROGUI_Operation::startOperation();
- myEditedObject.Nullify();
+ if ( !myIsEdit || isApplyAndClose() )
+ myEditedObject.Nullify();
myHydAxis.clear();
myProfiles.clear();
myProfileParams.clear();
myHydAxis.clear();
myProfiles.clear();
myProfileParams.clear();
@@
-107,8
+105,9
@@
void HYDROGUI_StreamOp::startOperation()
QString anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_STREAM_NAME" ) );
if ( myIsEdit )
{
QString anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_STREAM_NAME" ) );
if ( myIsEdit )
{
- myEditedObject =
- Handle(HYDROData_Stream)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+ if ( isApplyAndClose() )
+ myEditedObject =
+ Handle(HYDROData_Stream)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
if ( !myEditedObject.IsNull() )
{
anObjectName = myEditedObject->GetName();
if ( !myEditedObject.IsNull() )
{
anObjectName = myEditedObject->GetName();
@@
-184,7
+183,8
@@
HYDROGUI_InputPanel* HYDROGUI_StreamOp::createInputPanel() const
}
bool HYDROGUI_StreamOp::processApply( int& theUpdateFlags,
}
bool HYDROGUI_StreamOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
HYDROGUI_StreamDlg* aPanel = ::qobject_cast<HYDROGUI_StreamDlg*>( inputPanel() );
if ( !aPanel )
{
HYDROGUI_StreamDlg* aPanel = ::qobject_cast<HYDROGUI_StreamDlg*>( inputPanel() );
if ( !aPanel )
@@
-260,6
+260,8
@@
bool HYDROGUI_StreamOp::processApply( int& theUpdateFlags,
// Show the object in case of creation mode of the operation
if( !myIsEdit ) {
module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), myEditedObject, true );
// Show the object in case of creation mode of the operation
if( !myIsEdit ) {
module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), myEditedObject, true );
+ QString anEntry = HYDROGUI_DataObject::dataObjectEntry( myEditedObject );
+ theBrowseObjectsEntries.append( anEntry );
}
module()->setIsToUpdate( myEditedObject );
}
module()->setIsToUpdate( myEditedObject );