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
global misprinting in the word "splitted" is replaced by "split"
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_TwoImagesOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
index 885fff83946e677c3a371990824e165b701c1c49..8ebdf0259ed9788dabdf1cc4ed41c499e7fb87a1 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_TwoImagesOp.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,9
+19,10
@@
#include "HYDROGUI_TwoImagesOp.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_TwoImagesOp.h"
#include "HYDROGUI_Module.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool
2
.h"
#include "HYDROGUI_TwoImagesDlg.h"
#include "HYDROGUI_UpdateFlags.h"
#include "HYDROGUI_TwoImagesDlg.h"
#include "HYDROGUI_UpdateFlags.h"
+#include <HYDROGUI_DataObject.h>
#include <HYDROData_Document.h>
#include <HYDROData_Image.h>
#include <HYDROData_Document.h>
#include <HYDROData_Image.h>
@@
-53,7
+50,7
@@
HYDROGUI_TwoImagesOp::HYDROGUI_TwoImagesOp( HYDROGUI_Module* theModule,
{
case Fuse: aName = theIsEdit ? tr( "EDIT_FUSED_IMAGE" ) : tr( "FUSE_IMAGES" ); break;
case Cut: aName = theIsEdit ? tr( "EDIT_CUT_IMAGE" ) : tr( "CUT_IMAGES" ); break;
{
case Fuse: aName = theIsEdit ? tr( "EDIT_FUSED_IMAGE" ) : tr( "FUSE_IMAGES" ); break;
case Cut: aName = theIsEdit ? tr( "EDIT_CUT_IMAGE" ) : tr( "CUT_IMAGES" ); break;
- case Split: aName = theIsEdit ? tr( "EDIT_SPLIT
TED
_IMAGE" ) : tr( "SPLIT_IMAGE" ); break;
+ case Split: aName = theIsEdit ? tr( "EDIT_SPLIT_IMAGE" ) : tr( "SPLIT_IMAGE" ); break;
default: break;
}
setName( aName );
default: break;
}
setName( aName );
@@
-75,15
+72,20
@@
void HYDROGUI_TwoImagesOp::startOperation()
HYDROGUI_TwoImagesDlg* aPanel = (HYDROGUI_TwoImagesDlg*)inputPanel();
aPanel->reset();
HYDROGUI_TwoImagesDlg* aPanel = (HYDROGUI_TwoImagesDlg*)inputPanel();
aPanel->reset();
- if( myType == Fuse || myType == Cut )
- aPanel->setMode( HYDROGUI_TwoImagesDlg::TwoImages, myIsEdit );
+ int aMode;
+ if( myType == Fuse )
+ aMode = HYDROGUI_TwoImagesDlg::TwoFuseImage;
+ if ( myType == Cut )
+ aMode = HYDROGUI_TwoImagesDlg::TwoCutImage;
else if( myType == Split )
else if( myType == Split )
- aPanel->setMode( HYDROGUI_TwoImagesDlg::ImageAndPolyline, myIsEdit );
+ aMode = HYDROGUI_TwoImagesDlg::ImageAndPolyline;
+ aPanel->setMode( aMode, myIsEdit );
QString anImageName;
if( myIsEdit )
{
QString anImageName;
if( myIsEdit )
{
- myEditedObject = Handle(HYDROData_Image)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+ if ( isApplyAndClose() )
+ myEditedObject = Handle(HYDROData_Image)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
if( !myEditedObject.IsNull() )
anImageName = myEditedObject->GetName();
}
if( !myEditedObject.IsNull() )
anImageName = myEditedObject->GetName();
}
@@
-147,7
+149,8
@@
void HYDROGUI_TwoImagesOp::onAlreadySelected( const QString& theName )
}
bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags,
}
bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
HYDROGUI_TwoImagesDlg* aPanel = dynamic_cast<HYDROGUI_TwoImagesDlg*>( inputPanel() );
{
HYDROGUI_TwoImagesDlg* aPanel = dynamic_cast<HYDROGUI_TwoImagesDlg*>( inputPanel() );
@@
-204,6
+207,8
@@
bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags,
anOperator = aFactory->Operator( anOperatorName );
aResult = aFactory->CreateImage( doc(), anOperator );
anOperator = aFactory->Operator( anOperatorName );
aResult = aFactory->CreateImage( doc(), anOperator );
+ QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aResult );
+ theBrowseObjectsEntries.append( anEntry );
}
if( aResult.IsNull() || !anOperator )
}
if( aResult.IsNull() || !anOperator )
@@
-224,7
+229,7
@@
bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags,
Handle(HYDROData_Image) aSelectedImage = Handle(HYDROData_Image)::DownCast( anObject1 );
if( !aSelectedImage.IsNull() )
{
Handle(HYDROData_Image) aSelectedImage = Handle(HYDROData_Image)::DownCast( anObject1 );
if( !aSelectedImage.IsNull() )
{
- aSelectedImage->SetIsSelfSplit
ted
( true );
+ aSelectedImage->SetIsSelfSplit( true );
aSelectedImage->SetImage( aResult->Image() );
aSelectedImage->SetTrsf( aResult->Trsf() );
aResult->Remove();
aSelectedImage->SetImage( aResult->Image() );
aSelectedImage->SetTrsf( aResult->Trsf() );
aResult->Remove();