Fit All after was added stream selection and displaying in embedded viewer.

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_TwoImagesOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
index 38375491e69589af4e8b15b80029f11cfd1affd1..50ecc0086a3e2640b75f4b4d2966da66cb225b4a 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// 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
@@ -6,7 +6,7 @@
 // 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
@@ -26,10 +26,10 @@
 #include "HYDROGUI_Tool.h"
 #include "HYDROGUI_TwoImagesDlg.h"
 #include "HYDROGUI_UpdateFlags.h"
+#include <HYDROGUI_DataObject.h>
 
 #include <HYDROData_Document.h>
 #include <HYDROData_Image.h>
-#include <HYDROData_Polyline.h>
 
 #include <HYDROData_OperationsFactory.h>
 
@@ -37,6 +37,10 @@
 #include <ImageComposer_CropOperator.h>
 #include <ImageComposer_FuseOperator.h>
 
+#include <LightApp_Application.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_MessageBox.h>
+
 HYDROGUI_TwoImagesOp::HYDROGUI_TwoImagesOp( HYDROGUI_Module* theModule,
                                             const int theType,
                                             const bool theIsEdit )
@@ -72,10 +76,14 @@ void HYDROGUI_TwoImagesOp::startOperation()
   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 )
-    aPanel->setMode( HYDROGUI_TwoImagesDlg::ImageAndPolyline, myIsEdit );
+    aMode = HYDROGUI_TwoImagesDlg::ImageAndPolyline;
+  aPanel->setMode( aMode, myIsEdit );
 
   QString anImageName;
   if( myIsEdit )
@@ -133,10 +141,19 @@ void HYDROGUI_TwoImagesOp::startOperation()
       aPanel->setPreselectedObject( aSelectedName );
     }
   }
+  connect( aPanel, SIGNAL( alreadySelected( const QString& ) ), SLOT( onAlreadySelected( const QString& ) ) );
+}
+
+void HYDROGUI_TwoImagesOp::onAlreadySelected( const QString& theName )
+{
+  QString aTitle = tr( "INSUFFICIENT_INPUT_DATA" );
+  QString aMessage = tr( "OBJECT_ALREADY_SELECTED" ).arg( theName );
+  SUIT_MessageBox::critical( module()->getApp()->desktop(), aTitle, aMessage );
 }
 
 bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags,
-                                         QString& theErrorMsg )
+                                         QString& theErrorMsg,
+                                         QStringList& theBrowseObjectsEntries )
 {
   HYDROGUI_TwoImagesDlg* aPanel = dynamic_cast<HYDROGUI_TwoImagesDlg*>( inputPanel() );
 
@@ -193,6 +210,8 @@ bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags,
     anOperator = aFactory->Operator( anOperatorName );
 
     aResult = aFactory->CreateImage( doc(), anOperator );
+    QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aResult );
+    theBrowseObjectsEntries.append( anEntry );
   }
 
   if( aResult.IsNull() || !anOperator )