X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ImportImageOp.cxx;h=d68840a8b22a5026b0a4858622e89a91a08861ca;hb=36005df362d7bee6db949b079960cec90333aed2;hp=cc0d9b428479f70310727ef68f90e68ec6ca72f6;hpb=33e6f9ca520516c79548c5b80dfcf6f6a7d6674e;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
index cc0d9b42..d68840a8 100644
--- a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportImageOp.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
-// 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
@@ -23,6 +19,7 @@
 #include "HYDROGUI_ImportImageOp.h"
 
 #include "HYDROGUI_DataModel.h"
+#include <HYDROGUI_DataObject.h>
 #include "HYDROGUI_ImportImageDlg.h"
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_PrsImage.h"
@@ -41,8 +38,10 @@
 
 #include <STD_TabDesktop.h>
 #include <SUIT_Desktop.h>
+#include <SUIT_MessageBox.h>
 #include <QtxWorkstack.h>
 #include <QApplication>
+#include <QFileInfo>
 
 HYDROGUI_ImportImageOp::HYDROGUI_ImportImageOp( HYDROGUI_Module* theModule,
                                                 const bool theIsEdit )
@@ -75,7 +74,8 @@ void HYDROGUI_ImportImageOp::startOperation()
 
   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() )
     {
       QImage anImage = myEditedObject->Image();
@@ -164,36 +164,8 @@ void HYDROGUI_ImportImageOp::startOperation()
     }
   }
 
-  // Collect information about existing images and initialize the combobox 
-  // reference image selector in the dialog.
   HYDROGUI_ImportImageDlg::PrsPointDataList aPrsPointDataList;
-  HYDROData_Iterator anIterator( doc(), KIND_IMAGE );
-  for( ; anIterator.More(); anIterator.Next() )
-  {
-    Handle(HYDROData_Image) anImageObj = Handle(HYDROData_Image)::DownCast( anIterator.Current() );
-    if( !anImageObj.IsNull() )
-    {
-      if( myIsEdit && IsEqual( anImageObj, myEditedObject ) )
-        continue;
-
-      QPoint aLocalPointA, aLocalPointB, aLocalPointC;
-      anImageObj->GetLocalPoints( aLocalPointA, aLocalPointB, aLocalPointC );
-      
-      HYDROData_Image::TransformationMode aImgTrsfMode;
-      QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC;
-      anImageObj->GetGlobalPoints( aImgTrsfMode,
-                                   aTrsfPointA, aTrsfPointB, aTrsfPointC );
-
-      HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap;
-      computeTrsfData( aImgTrsfMode, false, aLocalPointA, aLocalPointB, aLocalPointC,
-        aTrsfPointA, aTrsfPointB, aTrsfPointC, aDataMap );
-
-      HYDROGUI_ImportImageDlg::PrsPointData aPrsPointData( anImageObj->GetName(), aDataMap );
-      aPrsPointDataList.append( aPrsPointData );
-    }
-  }
-
-  // Initialize the combobox in the dialog with the list of available reference images
+  getReferenceDataList( aPrsPointDataList );
   aPanel->setPrsPointDataList( aPrsPointDataList );
   // Select the current reference image in the dialog combobox
   aPanel->setRefImageName( aRefImageName );
@@ -217,11 +189,44 @@ void HYDROGUI_ImportImageOp::setPresentationTrsfPoints( HYDROGUI_PrsImage* thePr
       if ( !theIsByTwoPoints )
         aPointMap[ HYDROGUI_PrsImage::PointC ].Point = theLocalPointC;
 
+      thePrs->setIsByTwoPoints( theIsByTwoPoints );
       thePrs->setTransformationPointMap( aPointMap );
     }
   }
 }
 
+void HYDROGUI_ImportImageOp::getReferenceDataList(
+                        HYDROGUI_ImportImageDlg::PrsPointDataList& theList ) const
+{
+  // Collect information about existing images and initialize the combobox 
+  // reference image selector in the dialog.
+  HYDROData_Iterator anIterator( doc(), KIND_IMAGE );
+  for( ; anIterator.More(); anIterator.Next() )
+  {
+    Handle(HYDROData_Image) anImageObj = Handle(HYDROData_Image)::DownCast( anIterator.Current() );
+    if( !anImageObj.IsNull() )
+    {
+      if( myIsEdit && IsEqual( anImageObj, myEditedObject ) )
+        continue;
+
+      QPoint aLocalPointA, aLocalPointB, aLocalPointC;
+      anImageObj->GetLocalPoints( aLocalPointA, aLocalPointB, aLocalPointC );
+      
+      HYDROData_Image::TransformationMode aImgTrsfMode;
+      QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC;
+      anImageObj->GetGlobalPoints( aImgTrsfMode,
+                                   aTrsfPointA, aTrsfPointB, aTrsfPointC );
+
+      HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap;
+      computeTrsfData( aImgTrsfMode, false, aLocalPointA, aLocalPointB, aLocalPointC,
+        aTrsfPointA, aTrsfPointB, aTrsfPointC, aDataMap );
+
+      HYDROGUI_ImportImageDlg::PrsPointData aPrsPointData( anImageObj->GetName(), aDataMap );
+      theList.append( aPrsPointData );
+    }
+  }
+}
+
 void HYDROGUI_ImportImageOp::computeTrsfData( HYDROData_Image::TransformationMode theTrsfMode,
                                               bool theIsByTwoPoints,
                                               const QPoint& theLocalPointA,
@@ -254,7 +259,8 @@ void HYDROGUI_ImportImageOp::abortOperation()
 
 void HYDROGUI_ImportImageOp::commitOperation()
 {
-  closePreview();
+  if ( isApplyAndClose() )
+    closePreview();
 
   HYDROGUI_Operation::commitOperation();
 }
@@ -262,19 +268,31 @@ void HYDROGUI_ImportImageOp::commitOperation()
 HYDROGUI_InputPanel* HYDROGUI_ImportImageOp::createInputPanel() const
 {
   HYDROGUI_InputPanel* aPanel = new HYDROGUI_ImportImageDlg( module(), getName() );
-  connect( aPanel, SIGNAL( createPreview( QImage ) ),
-           this, SLOT( onCreatePreview( QImage ) ) );
-  connect( aPanel, SIGNAL( activatePointSelection( int ) ),
-           this, SLOT( onActivatePointSelection( int ) ) );
-  connect( aPanel, SIGNAL( pointCoordChanged( bool, int, bool, int ) ),
-           this, SLOT( onPointCoordChanged( bool, int, bool, int ) ) );
-  connect( aPanel, SIGNAL( modeActivated( int ) ),
-           this, SLOT( onModeActivated( int ) ) );
+  connect( aPanel, SIGNAL( createPreview( QImage ) ), SLOT( onCreatePreview( QImage ) ) );
+  connect( aPanel, SIGNAL( activatePointSelection( int ) ), SLOT( onActivatePointSelection( int ) ) );
+  connect( aPanel, SIGNAL( pointCoordChanged( bool, int, bool, int ) ), 
+                     SLOT( onPointCoordChanged( bool, int, bool, int ) ) );
+  connect( aPanel, SIGNAL( modeActivated( int ) ), SLOT( onModeActivated( int ) ) );
   connect( aPanel, SIGNAL( refImageActivated( const QString& ) ),
-           this, SLOT( onRefImageActivated( const QString& ) ) );
+                     SLOT( onRefImageActivated( const QString& ) ) );
+  connect( aPanel, SIGNAL( setCIsUsed( bool ) ), SLOT( onSetCIsUsed( bool ) ) );
+  connect( aPanel, SIGNAL( filesSelected( const QStringList& ) ),
+                   SLOT( onFilesSelected( const QStringList& ) ) );
   return aPanel;
 }
 
+void HYDROGUI_ImportImageOp::onSetCIsUsed( bool theCIsUsed )
+{
+  if ( myPreviewPrs )
+  {
+    myPreviewPrs->setIsByTwoPoints( !theCIsUsed );
+  }
+  if ( myRefPreviewPrs )
+  {
+    myRefPreviewPrs->setIsByTwoPoints( !theCIsUsed );
+  }
+}
+
 bool HYDROGUI_ImportImageOp::checkPoints( const QPointF& thePointA,
                                           const QPointF& thePointB,
                                           const QPointF& thePointC,
@@ -299,41 +317,55 @@ bool HYDROGUI_ImportImageOp::checkPoints( const QPointF& thePointA,
       theErrorMsg = theLineErrMsg;
       return false;
     }
+
+    if ( theIsToCheckInvertibles )
+    {
+      QTransform aTransform1( xa, ya, 1, xb, yb, 1, xc, yc, 1 );
+
+      bool anIsInvertible = false;
+      QTransform aTransform1Inverted = aTransform1.inverted( &anIsInvertible );
+      if( !anIsInvertible )
+      {
+        theErrorMsg = tr( "TRANSFORMATION_MATRIX_CANNOT_BE_COMPUTED" );
+        return false;
+      }
+    }
   }
   else 
   {
     // check that two points are not identical
-    if ( ValuesEquals( xa, ya ) && ValuesEquals( xb, yb ) )
+    if ( ValuesEquals( xa, xb ) && ValuesEquals( ya, yb ) )
     {
       theErrorMsg = thePoinErrMsg;
       return false;
     }
   }
 
-  if ( theIsToCheckInvertibles )
-  {
-    QTransform aTransform1( xa, ya, 1, xb, yb, 1, xc, yc, 1 );
-
-    bool anIsInvertible = false;
-    QTransform aTransform1Inverted = aTransform1.inverted( &anIsInvertible );
-    if( !anIsInvertible )
-    {
-      theErrorMsg = tr( "TRANSFORMATION_MATRIX_CANNOT_BE_COMPUTED" );
-      return false;
-    }
-  }
-
   return true;
 }
 
 bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags,
-                                           QString& theErrorMsg )
+                                           QString& theErrorMsg,
+                                           QStringList& theBrowseObjectsEntries )
 {
   HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
 
+  if( !myIsEdit )
+  {
+    QString aFilePath = aPanel->getFileName();
+    if( aFilePath.isEmpty() )
+    {
+      theErrorMsg = tr( "SELECT_IMAGE_FILE" ).arg( aFilePath );
+      return false;
+    }
+  }
+
   QString anImageName = aPanel->getImageName();
   if( anImageName.isEmpty() )
+  {
+    theErrorMsg = tr( "SELECT_IMAGE_NAME" ).arg( anImageName );
     return false;
+  }
 
   if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != anImageName ) )
   {
@@ -346,74 +378,82 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags,
     }
   }
 
-  HYDROGUI_ImportImageDlg::TransformationDataMap aMap;
-  if( !aPanel->getTransformationDataMap( aMap ) )
-    return false;
+  HYDROData_Image::TransformationMode aTransformationMode = 
+    (HYDROData_Image::TransformationMode)aPanel->getTransformationMode();
+  
+  QPoint aPointA, aPointB, aPointC;
+  QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC( INT_MIN, INT_MIN );
+  Handle(HYDROData_Image) aRefImageObj;
 
-  bool anIsByTwoPoints = aPanel->isByTwoPoints();
+  if ( aTransformationMode != HYDROData_Image::CartesianFromFile ) {
+    HYDROGUI_ImportImageDlg::TransformationDataMap aMap;
+    if( !aPanel->getTransformationDataMap( aMap ) )
+      return false;
 
-  QPoint aPointA = aMap[ HYDROGUI_PrsImage::PointA ].ImagePoint;
-  QPoint aPointB = aMap[ HYDROGUI_PrsImage::PointB ].ImagePoint;
-  QPoint aPointC = anIsByTwoPoints ? QPoint( INT_MIN, INT_MIN ) :
-                                     aMap[ HYDROGUI_PrsImage::PointC ].ImagePoint;
+    bool anIsByTwoPoints = aPanel->isByTwoPoints();
 
-  // first, we check correctness of image points
-  if ( !checkPoints( aPointA, aPointB, aPointC, anIsByTwoPoints, 
-                     tr( "POINTS_A_B_C_BELONG_TO_SINGLE_LINE" ),
-                     tr( "POINTS_A_B_ARE_IDENTICAL" ),
-                     theErrorMsg, true ) )
-    return false;
+    aPointA = aMap[ HYDROGUI_PrsImage::PointA ].ImagePoint;
+    aPointB = aMap[ HYDROGUI_PrsImage::PointB ].ImagePoint;
+    aPointC = anIsByTwoPoints ? QPoint( INT_MIN, INT_MIN ) :
+                                aMap[ HYDROGUI_PrsImage::PointC ].ImagePoint;
 
-  Handle(HYDROData_Image) aRefImageObj;
-  QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC( INT_MIN, INT_MIN );
+    // first, we check correctness of image points
+    if ( !checkPoints( aPointA, aPointB, aPointC, anIsByTwoPoints, 
+                       tr( "POINTS_A_B_C_BELONG_TO_SINGLE_LINE" ),
+                       tr( "POINTS_A_B_ARE_IDENTICAL" ),
+                       theErrorMsg, true ) )
+      return false;
 
-  HYDROData_Image::TransformationMode aTransformationMode = 
-    (HYDROData_Image::TransformationMode)aPanel->getTransformationMode();
-  if ( aTransformationMode == HYDROData_Image::ReferenceImage )
-  {
-    QString aRefImageName = aPanel->getRefImageName();
-    if( aRefImageName.isEmpty() )
+    if ( aTransformationMode == HYDROData_Image::ReferenceImage )
     {
-      theErrorMsg = tr( "REFERENCE_IMAGE_IS_NOT_SELECTED" );
-      return false;
-    }
+      QString aRefImageName = aPanel->getRefImageName();
+      if( aRefImageName.isEmpty() )
+      {
+        theErrorMsg = tr( "REFERENCE_IMAGE_IS_NOT_SELECTED" );
+        return false;
+      }
 
-    HYDROGUI_ImportImageDlg::TransformationDataMap aRefMap;
-    if( !aPanel->getTransformationDataMap( aRefMap, true ) )
-      return false;
+      HYDROGUI_ImportImageDlg::TransformationDataMap aRefMap;
+      if( !aPanel->getTransformationDataMap( aRefMap, true ) )
+        return false;
 
-    aRefImageObj = Handle(HYDROData_Image)::DownCast(
-      HYDROGUI_Tool::FindObjectByName( module(), aRefImageName, KIND_IMAGE ) );
-    if( aRefImageObj.IsNull() )
-      return false;
+      aRefImageObj = Handle(HYDROData_Image)::DownCast(
+        HYDROGUI_Tool::FindObjectByName( module(), aRefImageName, KIND_IMAGE ) );
+      if( aRefImageObj.IsNull() ) {
+        return false;
+      }
+      else if ( !isReferenceCorrect() ) {
+        aRefImageObj->RemoveAllReferences();
+      }
 
-    aTrsfPointA = aRefMap[ HYDROGUI_PrsImage::PointA ].ImagePoint;
-    aTrsfPointB = aRefMap[ HYDROGUI_PrsImage::PointB ].ImagePoint;
-    if ( !anIsByTwoPoints )
+      aTrsfPointA = aRefMap[ HYDROGUI_PrsImage::PointA ].ImagePoint;
+      aTrsfPointB = aRefMap[ HYDROGUI_PrsImage::PointB ].ImagePoint;
+      if ( !anIsByTwoPoints )
       aTrsfPointC = aRefMap[ HYDROGUI_PrsImage::PointC ].ImagePoint;
 
-    // the same check of correctness for the reference points
-    if ( !checkPoints( aTrsfPointA, aTrsfPointB, aTrsfPointC, anIsByTwoPoints, 
-                       tr( "REFERENCE_POINTS_A_B_C_BELONG_TO_SINGLE_LINE" ),
-                       tr( "REFERENCE_POINTS_A_B_ARE_IDENTICAL" ),
-                       theErrorMsg, false ) )
-      return false;
-  }
-  else
-  {
-    if ( aTransformationMode == HYDROData_Image::ManualGeodesic )
-    {
-      aTrsfPointA = aMap[ HYDROGUI_PrsImage::PointA ].GeodesicPoint;
-      aTrsfPointB = aMap[ HYDROGUI_PrsImage::PointB ].GeodesicPoint;
-      if ( !anIsByTwoPoints )
-        aTrsfPointC = aMap[ HYDROGUI_PrsImage::PointC ].GeodesicPoint;
+      // the same check of correctness for the reference points
+      if ( !checkPoints( aTrsfPointA, aTrsfPointB, aTrsfPointC, anIsByTwoPoints, 
+                         tr( "REFERENCE_POINTS_A_B_C_BELONG_TO_SINGLE_LINE" ),
+                         tr( "REFERENCE_POINTS_A_B_ARE_IDENTICAL" ),
+                         theErrorMsg, false ) )
+        return false;
     }
     else
     {
-      aTrsfPointA = aMap[ HYDROGUI_PrsImage::PointA ].CartesianPoint;
-      aTrsfPointB = aMap[ HYDROGUI_PrsImage::PointB ].CartesianPoint;
-      if ( !anIsByTwoPoints )
-        aTrsfPointC = aMap[ HYDROGUI_PrsImage::PointC ].CartesianPoint;
+      if ( aTransformationMode == HYDROData_Image::ManualGeodesic )
+      {
+        aTrsfPointA = aMap[ HYDROGUI_PrsImage::PointA ].GeodesicPoint;
+        aTrsfPointB = aMap[ HYDROGUI_PrsImage::PointB ].GeodesicPoint;
+        if ( !anIsByTwoPoints )
+          aTrsfPointC = aMap[ HYDROGUI_PrsImage::PointC ].GeodesicPoint;
+      }
+      else
+      {
+        aTrsfPointA = aMap[ HYDROGUI_PrsImage::PointA ].CartesianPoint;
+        aTrsfPointB = aMap[ HYDROGUI_PrsImage::PointB ].CartesianPoint;
+        if ( !anIsByTwoPoints )
+          aTrsfPointC = aMap[ HYDROGUI_PrsImage::PointC ].CartesianPoint;
+      }
     }
   }
 
@@ -421,24 +461,45 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags,
   if( myIsEdit )
     anImageObj = myEditedObject;
   else
+  {
     anImageObj = Handle(HYDROData_Image)::DownCast( doc()->CreateObject( KIND_IMAGE ) );
+    QString anEntry = HYDROGUI_DataObject::dataObjectEntry( anImageObj );
+    theBrowseObjectsEntries.append( anEntry );
+  }
 
   if( anImageObj.IsNull() )
     return false;
 
   anImageObj->SetName( anImageName );
   anImageObj->SetImage( myImage );
-  anImageObj->SetLocalPoints( aPointA, aPointB, aPointC, false );
+  
+  if ( aTransformationMode == HYDROData_Image::CartesianFromFile ) {
+    QString aGeoreferencementFileName = aPanel->getGeoreferencementFileName();
+    if ( aGeoreferencementFileName.isEmpty() ) {
+      return false;
+    }
 
-  if ( aTransformationMode == HYDROData_Image::ReferenceImage )
-  {
-    anImageObj->SetReferencePoints( aRefImageObj,
+    QPoint aLocalPointA( 0, 0 ),
+           aLocalPointB( anImageObj->Image().width(), 0 ), 
+           aLocalPointC( INT_MIN, INT_MIN );
+    anImageObj->SetLocalPoints( aLocalPointA, aLocalPointB, aLocalPointC, false );
+    if ( !anImageObj->SetGlobalPointsFromFile( aGeoreferencementFileName ) ) {
+      theErrorMsg = tr( "CANT_LOAD_GEOREFERENCEMENT_FILE" );
+      return false;
+    }
+  } else {
+    anImageObj->SetLocalPoints( aPointA, aPointB, aPointC, false );
+
+    if ( aTransformationMode == HYDROData_Image::ReferenceImage )
+    {
+      anImageObj->SetReferencePoints( aRefImageObj,
                                     aTrsfPointA, aTrsfPointB, aTrsfPointC );
-  }
-  else
-  {
-    anImageObj->SetGlobalPoints( aTransformationMode,
+    }
+    else
+    {
+      anImageObj->SetGlobalPoints( aTransformationMode,
                                  aTrsfPointA, aTrsfPointB, aTrsfPointC );
+    }
   }
 
   if( !myIsEdit )
@@ -449,18 +510,85 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags,
   }
    
   // must be done after all checks and before calling SetVisible() method below
-  closePreview();
+  if ( isApplyAndClose() )
+    closePreview();
 
   if( !myIsEdit )
     module()->setObjectVisible( HYDROGUI_Tool::GetActiveGraphicsViewId( module() ), anImageObj, true );
 
-  if( myIsEdit )
-    anImageObj->Update();
+  anImageObj->Update();
+
+  theUpdateFlags = UF_Model;
+  if ( isApplyAndClose() )
+    theUpdateFlags |= UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced;
+
+  if( isApplyAndClose() )
+  {
+    commitDocOperation(); // to save the modifications in the data model
+    return true;
+  }
+
+  if( SetNextFile() )
+  {
+    theErrorMsg = "";
+    module()->updateObjBrowser();
+    return false;         // and to continue the operation
+  }
 
-  theUpdateFlags = UF_Model | UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced;
+  /*if( myFiles.count() > 1 )
+  {
+    setIsApplyAndClose( true );
+  }*/
   return true;
 }
 
+bool HYDROGUI_ImportImageOp::isReferenceCorrect() const
+{
+  bool isCorrect = true;
+
+  if( myIsEdit && !myEditedObject.IsNull() )
+  {
+    HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
+    Handle(HYDROData_Image) aRefImageObj = Handle(HYDROData_Image)::DownCast(
+      HYDROGUI_Tool::FindObjectByName( module(), aPanel->getRefImageName(), KIND_IMAGE ) );
+    if( !aRefImageObj.IsNull() )
+    {
+      bool isFoundEdited = false;
+      HYDROData_SequenceOfObjects aRefSeq = aRefImageObj->GetAllReferenceObjects();
+      for ( int i = 1, n = aRefSeq.Length(); i <= n && !isFoundEdited; ++i )
+      {
+        Handle(HYDROData_Entity) anObject = aRefSeq.Value( i );
+        isFoundEdited = anObject->GetName() == myEditedObject->GetName();
+      }
+      isCorrect = !isFoundEdited;
+    }
+  }
+  return isCorrect;
+}
+
+void HYDROGUI_ImportImageOp::apply()
+{
+  HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
+
+  bool aCanApply = isReferenceCorrect();
+  if ( !aCanApply && !myEditedObject.IsNull() )
+  {
+    Handle(HYDROData_Image) aRefImageObj = Handle(HYDROData_Image)::DownCast(
+      HYDROGUI_Tool::FindObjectByName( module(), aPanel->getRefImageName(), KIND_IMAGE ) );
+    if ( !aRefImageObj.IsNull() )
+      aCanApply = SUIT_MessageBox::question( module()->getApp()->desktop(),
+                    tr( "CORRECT_INPUT_DATA" ), tr( "CONFIRM_REMOVE_REFERENCE_FROM_IMAGE" ).
+                    arg( aRefImageObj->GetName() ).arg( myEditedObject->GetName() ),
+                    QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) == QMessageBox::Yes;
+  }
+  if ( aCanApply )
+    HYDROGUI_Operation::apply();
+  else {
+    aPanel->setRefImageName( "" );
+    onRefImageActivated( aPanel->getRefImageName() );
+  }
+}
+
 void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage )
 {
   HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
@@ -469,9 +597,20 @@ void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage )
 
   if( myPreviewPrs ) // if the image is changed by choosing another file
   {
-    myPreviewPrs->setImage( myImage );
-    myPreviewPrs->compute();
-
+    myPreviewPrs->setImage( myImage, true );
+    if ( sender() ) // reset the previous presentation settings
+    {
+      QString aFileName = aPanel->getFileName();
+
+      aPanel->reset();
+      aPanel->setIsEdit( myIsEdit );
+      // restore the file name
+      aPanel->setFileName( aFileName );
+      // fill the reference list
+      HYDROGUI_ImportImageDlg::PrsPointDataList aPrsPointDataList;
+      getReferenceDataList( aPrsPointDataList );
+      aPanel->setPrsPointDataList( aPrsPointDataList );
+    }
     if( myPreviewViewManager )
     {
       if( GraphicsView_Viewer* aViewer = myPreviewViewManager->getViewer() )
@@ -491,8 +630,7 @@ void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage )
     myActiveViewManager = anApp->activeViewManager();
 
     myPreviewPrs = new HYDROGUI_PrsImage( myIsEdit ? myEditedObject : 0 );
-    myPreviewPrs->setImage( myImage );
-    myPreviewPrs->compute();
+    myPreviewPrs->setImage( myImage, true );
 
     myPreviewViewManager =
       dynamic_cast<GraphicsView_ViewManager*>( anApp->createViewManager( GraphicsView_Viewer::Type() ) );
@@ -511,29 +649,48 @@ void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage )
 
           aViewPort->addItem( myPreviewPrs );
           aViewPort->fitAll();
-
+          
+          if ( myEditedObject ) {
+            size_t aViewId = (size_t)aViewer;
+            module()->setObjectVisible( aViewId, myEditedObject, true );
+          }
+          
           myPreviewPrs->setIsTransformationPointPreview( true );
+          myPreviewPrs->setTransformationPointCursorShape( module()->getPrefEditCursor().shape() );
         }
         connect( aViewer, SIGNAL( selectionChanged( GV_SelectionChangeStatus ) ),
                  this, SLOT( onPointSelected() ) );
       }
     }
+  }
 
-    QString anImageName;
-    if( myIsEdit )
-    {
-      if( !myEditedObject.IsNull() )
-        anImageName = myEditedObject->GetName();
+  // Set the image name in the dialog
+  QString anImageName = aPanel->getImageName().simplified();
+  // If edit mode and the name was not set yet then get from the edited object
+  if( myIsEdit && anImageName.isEmpty() )
+  {
+    if( !myEditedObject.IsNull() )
+      anImageName = myEditedObject->GetName();
+  }
+  // If the name was not set then initialize it from the selected file name
+  if ( anImageName.isEmpty() )
+  {
+    anImageName = aPanel->getFileName();
+    if ( !anImageName.isEmpty() ) {
+        anImageName = QFileInfo( anImageName ).baseName();
+    }
+    // If no file name then generate a new image name
+    if ( anImageName.isEmpty() ) {
+      anImageName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_IMAGE_NAME" ) );
     }
-    else
-      anImageName = HYDROGUI_Tool::GenerateObjectName( module(), "Image" );
-    aPanel->setImageName( anImageName );
   }
+  aPanel->setImageName( anImageName );
 
   aPanel->setImageSize( myImage.size() );
 
   aPanel->initializePointSelection();
   onPointSelected( false );
+  onSetCIsUsed( !aPanel->isByTwoPoints() );
 }
 
 void HYDROGUI_ImportImageOp::onActivatePointSelection( int thePointType )
@@ -579,6 +736,12 @@ void HYDROGUI_ImportImageOp::onModeActivated( int theMode )
 
 void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName )
 {
+  if( theName.isEmpty() ) {
+    if( myRefViewManager )
+      closeView( myRefViewManager );
+    return;
+  }
+
   GraphicsView_ViewPort* aViewPort = 0;
 
   LightApp_Application* anApp = module()->getApp();
@@ -615,9 +778,13 @@ void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName )
   if( !aViewPort )
     return;
 
+  size_t aViewId = (size_t)myRefViewManager->getViewer();
+
   // Remove the old presentation of the reference image if any
   if( myRefPreviewPrs )
   {
+    module()->setObjectVisible( aViewId, myRefPreviewPrs->getObject(), false );
+
     myRefPreviewPrs->setCaption( QString() );
     aViewPort->removeItem( myRefPreviewPrs );
 
@@ -629,19 +796,25 @@ void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName )
   QImage anImage;
   Handle(HYDROData_Image) anImageObj = Handle(HYDROData_Image)::DownCast(
     HYDROGUI_Tool::FindObjectByName( module(), theName, KIND_IMAGE ) );
+  HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
   if( !anImageObj.IsNull() )
   {
     anImage = anImageObj->Image();
 
     myRefPreviewPrs = new HYDROGUI_PrsImage( anImageObj );
-    myRefPreviewPrs->setImage( anImage );
-    myRefPreviewPrs->compute();
+    myRefPreviewPrs->setImage( anImage, true );
 
     myRefPreviewPrs->setIsTransformationPointPreview( true );
     myRefPreviewPrs->setTransformationPointType( myPointType );
 
+    myRefPreviewPrs->setIsByTwoPoints( aPanel->isByTwoPoints() );
+
+    myRefPreviewPrs->setTransformationPointCursorShape( module()->getPrefEditCursor().shape() );
+
     // Add the new reference image presentation to the appropriate view
     aViewPort->addItem( myRefPreviewPrs );
+
+    module()->setObjectVisible( aViewId, anImageObj, true );
   }
 
   aViewPort->fitAll();
@@ -658,7 +831,6 @@ void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName )
   }
 
   // Initialize the dialog
-  HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
   aPanel->setImageSize( anImage.size(), true );
   aPanel->initializePointSelection();
   onPointSelected( true );
@@ -689,6 +861,7 @@ void HYDROGUI_ImportImageOp::onPointSelected( bool theIsRefImage )
 
   const HYDROGUI_PrsImage::TransformationPointMap& aPointMap =
     aPrs->getTransformationPointMap();
+  
   HYDROGUI_PrsImage::TransformationPointMapIterator anIter( aPointMap );
   while( anIter.hasNext() )
   {
@@ -749,3 +922,22 @@ void HYDROGUI_ImportImageOp::closeView( GraphicsView_ViewManager* &aViewMgr )
     aViewMgr = 0;
   }
 }
+
+void HYDROGUI_ImportImageOp::onFilesSelected( const QStringList& theFileNames )
+{
+  myFiles = theFileNames;
+  myFileIndex = -1;
+  SetNextFile();
+}
+
+bool HYDROGUI_ImportImageOp::SetNextFile()
+{
+  myFileIndex++;
+  bool isEnabledEdit = myFiles.count()==1 || myFileIndex==myFiles.count();
+  bool isValid = ( myFileIndex>=0 && myFileIndex<myFiles.count() );
+  QString aFile = isValid ? myFiles[myFileIndex] : "";
+
+  HYDROGUI_ImportImageDlg* aPanel = dynamic_cast<HYDROGUI_ImportImageDlg*>( inputPanel() );
+  aPanel->ActivateFile( aFile, isEnabledEdit );
+  return isValid;
+}