X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_TwoImagesOp.cxx;h=50ecc0086a3e2640b75f4b4d2966da66cb225b4a;hb=adf1c2cc49502c366a2637adfcda9c1c71b11887;hp=dec0f974cc981af478bad21c80a2c52555d5fc29;hpb=0b4df27e9f347d6187dbf30bacf80b45c21813d4;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
index dec0f974..50ecc008 100644
--- 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,24 +26,35 @@
 #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 <HYDROOperations_Factory.h>
+#include <HYDROData_OperationsFactory.h>
 
 #include <ImageComposer_CutOperator.h>
+#include <ImageComposer_CropOperator.h>
 #include <ImageComposer_FuseOperator.h>
 
-HYDROGUI_TwoImagesOp::HYDROGUI_TwoImagesOp( HYDROGUI_Module* theModule, const int theType )
+#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 )
 : HYDROGUI_Operation( theModule ),
-  myType( theType )
+  myType( theType ),
+  myIsEdit( theIsEdit ),
+  myEditedObject( 0 )
 {
   QString aName;
   switch( myType )
   {
-    case Fuse: aName = tr( "FUSE" ); break;
-    case Cut: aName = tr( "CUT" ); 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_SPLITTED_IMAGE" ) : tr( "SPLIT_IMAGE" ); break;
     default: break;
   }
   setName( aName );
@@ -65,59 +76,177 @@ void HYDROGUI_TwoImagesOp::startOperation()
   HYDROGUI_TwoImagesDlg* aPanel = (HYDROGUI_TwoImagesDlg*)inputPanel();
   aPanel->reset();
 
-  QString anImageName = HYDROGUI_Tool::GenerateObjectName( module(), getName() );
+  int aMode;
+  if( myType == Fuse )
+    aMode = HYDROGUI_TwoImagesDlg::TwoFuseImage;
+  if ( myType == Cut )
+    aMode = HYDROGUI_TwoImagesDlg::TwoCutImage;
+  else if( myType == Split )
+    aMode = HYDROGUI_TwoImagesDlg::ImageAndPolyline;
+  aPanel->setMode( aMode, myIsEdit );
+
+  QString anImageName;
+  if( myIsEdit )
+  {
+    myEditedObject = Handle(HYDROData_Image)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+    if( !myEditedObject.IsNull() )
+      anImageName = myEditedObject->GetName();
+  }
+  else
+  {
+    QString aPrefix;
+    switch( myType )
+    {
+      case Fuse: aPrefix = tr( "FUSE" ); break;
+      case Cut: aPrefix = tr( "CUT" ); break;
+      case Split: aPrefix = tr( "SPLIT" ); break;
+      default: break;
+    }
+    anImageName = HYDROGUI_Tool::GenerateObjectName( module(), aPrefix );
+  }
   aPanel->setImageName( anImageName );
+
+  QString aSelectedName1, aSelectedName2;
+  if( myIsEdit && !myEditedObject.IsNull() )
+  {
+    if( myEditedObject->NbReferences() > 0 )
+    {
+      Handle(HYDROData_Entity) anObject1 = myEditedObject->Reference( 0 );
+      if( !anObject1.IsNull() )
+        aSelectedName1 = anObject1->GetName();
+    }
+    if( myEditedObject->NbReferences() > 1 )
+    {
+      Handle(HYDROData_Entity) anObject2 = myEditedObject->Reference( 1 );
+      if( !anObject2.IsNull() )
+        aSelectedName2 = anObject2->GetName();
+    }
+    aPanel->setSelectedObjects( aSelectedName1, aSelectedName2 );
+
+    HYDROData_OperationsFactory* aFactory = HYDROData_OperationsFactory::Factory();
+    if( ImageComposer_Operator* anOperator = aFactory->Operator( myEditedObject ) )
+    {
+      QColor aColor;
+      anOperator->getArgs( aColor );
+      aPanel->setColor( aColor );
+    }
+  }
+  else if( !myIsEdit )
+  {
+    Handle(HYDROData_Image) aSelectedImage =
+      Handle(HYDROData_Image)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+    if( !aSelectedImage.IsNull() )
+    {
+      QString aSelectedName = aSelectedImage->GetName();
+      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() );
 
+  bool anIsModifySelected = myType == Split && aPanel->isModifySelected();
+
   QString anImageName = aPanel->getImageName();
-  if( anImageName.isEmpty() )
+  if( !anIsModifySelected && anImageName.isEmpty() )
     return false;
 
   QString aSelectedName1, aSelectedName2;
-  if( !aPanel->getSelectedImages( aSelectedName1, aSelectedName2 ) )
+  if( !aPanel->getSelectedObjects( aSelectedName1, aSelectedName2 ) )
     return false;
 
-  // check that there are no other objects with the same name in the document
-  Handle(HYDROData_Object) anObject = HYDROGUI_Tool::FindObjectByName( module(), anImageName );
-  if( !anObject.IsNull() )
+  if( !anIsModifySelected &&
+      ( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != anImageName ) ) )
   {
-    theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( anImageName );
-    return false;
+    // check that there are no other objects with the same name in the document
+    Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( module(), anImageName );
+    if( !anObject.IsNull() )
+    {
+      theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( anImageName );
+      return false;
+    }
   }
 
-  Handle(HYDROData_Image) anImage1 = Handle(HYDROData_Image)::DownCast(
-    HYDROGUI_Tool::FindObjectByName( module(), aSelectedName1, KIND_IMAGE ) );
-  Handle(HYDROData_Image) anImage2 = Handle(HYDROData_Image)::DownCast(
-    HYDROGUI_Tool::FindObjectByName( module(), aSelectedName2, KIND_IMAGE ) );
-  if( anImage1.IsNull() || anImage2.IsNull() )
+  Handle(HYDROData_Entity) anObject1 =
+    HYDROGUI_Tool::FindObjectByName( module(), aSelectedName1, KIND_UNKNOWN ) ;
+  Handle(HYDROData_Entity) anObject2 =
+    HYDROGUI_Tool::FindObjectByName( module(), aSelectedName2, KIND_UNKNOWN );
+  if( anObject1.IsNull() || anObject2.IsNull() )
     return false;
 
-  HYDROOperations_Factory* aFactory = HYDROOperations_Factory::Factory();
+  HYDROData_OperationsFactory* aFactory = HYDROData_OperationsFactory::Factory();
+
+  Handle(HYDROData_Image) aResult;
   ImageComposer_Operator* anOperator = 0;
-  switch( myType )
+  if( myIsEdit )
   {
-    case Fuse: anOperator = new ImageComposer_FuseOperator(); break;
-    case Cut: anOperator = new ImageComposer_CutOperator(); break;
-    default: break;
+    aResult = myEditedObject;
+    aResult->ClearReferences();
+    anOperator = aFactory->Operator( aResult );
+  }
+  else
+  {
+    QString anOperatorName;
+    switch( myType )
+    {
+      case Fuse:  anOperatorName = ImageComposer_FuseOperator::Type(); break;
+      case Cut:   anOperatorName = ImageComposer_CutOperator::Type(); break;
+      case Split: anOperatorName = ImageComposer_CropOperator::Type(); break;
+      default: break;
+    }
+
+    anOperator = aFactory->Operator( anOperatorName );
+
+    aResult = aFactory->CreateImage( doc(), anOperator );
+    QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aResult );
+    theBrowseObjectsEntries.append( anEntry );
   }
 
-  if( !anOperator )
+  if( aResult.IsNull() || !anOperator )
     return false;
 
-  Handle(HYDROData_Image) aResult = aFactory->CreateImage( doc(), anOperator );
-  if( aResult.IsNull() )
-    return false;
+  // Setting the operator arguments 
+  anOperator->setArgs( aPanel->getColor() );
+  aResult->SetArgs( anOperator->getBinArgs() );
 
   aResult->SetName( anImageName );
-  aResult->AppendReference( anImage1 );
-  aResult->AppendReference( anImage2 );
-  aFactory->UpdateImage( doc(), aResult );
+  aResult->AppendReference( anObject1 );
+  aResult->AppendReference( anObject2 );
+
+  aResult->Update();
+
+  if( anIsModifySelected )
+  {
+    Handle(HYDROData_Image) aSelectedImage = Handle(HYDROData_Image)::DownCast( anObject1 );
+    if( !aSelectedImage.IsNull() )
+    {
+      aSelectedImage->SetIsSelfSplitted( true );
+      aSelectedImage->SetImage( aResult->Image() );
+      aSelectedImage->SetTrsf( aResult->Trsf() );
+      aResult->Remove();
+    }
+  }
+
+  if( !myIsEdit && !anIsModifySelected )
+  {
+    size_t aViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( module() );
+    module()->setObjectVisible( aViewId, anObject1, false );
+    module()->setObjectVisible( aViewId, anObject2, false );
+    module()->setObjectVisible( aViewId, aResult, true );
+  }
 
-  theUpdateFlags = UF_Model | UF_Viewer;
+  theUpdateFlags = UF_Model | UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced;
   return true;
 }