Salome HOME
global misprinting in the word "splitted" is replaced by "split"
[modules/hydro.git] / src / HYDROGUI / HYDROGUI_TwoImagesOp.cxx
index 17ec192a8c7d6d2458a14466177cdc4c15daa19f..8ebdf0259ed9788dabdf1cc4ed41c499e7fb87a1 100644 (file)
@@ -19,7 +19,7 @@
 #include "HYDROGUI_TwoImagesOp.h"
 
 #include "HYDROGUI_Module.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_TwoImagesDlg.h"
 #include "HYDROGUI_UpdateFlags.h"
 #include <HYDROGUI_DataObject.h>
@@ -50,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 Split: aName = theIsEdit ? tr( "EDIT_SPLITTED_IMAGE" ) : tr( "SPLIT_IMAGE" ); break;
+    case Split: aName = theIsEdit ? tr( "EDIT_SPLIT_IMAGE" ) : tr( "SPLIT_IMAGE" ); break;
     default: break;
   }
   setName( aName );
@@ -84,7 +84,8 @@ void HYDROGUI_TwoImagesOp::startOperation()
   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();
   }
@@ -228,7 +229,7 @@ bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags,
     Handle(HYDROData_Image) aSelectedImage = Handle(HYDROData_Image)::DownCast( anObject1 );
     if( !aSelectedImage.IsNull() )
     {
-      aSelectedImage->SetIsSelfSplitted( true );
+      aSelectedImage->SetIsSelfSplit( true );
       aSelectedImage->SetImage( aResult->Image() );
       aSelectedImage->SetTrsf( aResult->Trsf() );
       aResult->Remove();