X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ImportImageOp.cxx;h=625d263612f4ab2b9f8578523314c326200820c8;hb=17f7f1768ec576845662eba383627385c46d718e;hp=ffd893a79f48684993c27fa98144fc7deaf3b419;hpb=c874fabf131c86df3f867c094ed3a2a0813a784e;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
index ffd893a7..625d2636 100644
--- a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
@@ -41,8 +41,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 )
@@ -84,78 +86,88 @@ void HYDROGUI_ImportImageOp::startOperation()
       QPoint aLocalPointA, aLocalPointB, aLocalPointC;
       myEditedObject->GetLocalPoints( aLocalPointA, aLocalPointB, aLocalPointC );
 
+      // Create the edited image preview presentation in the viewer
       onCreatePreview( anImage );
 
-      if( myPreviewPrs )
+      // Set transformation local points A,B,C to the image preview presentation
+      setPresentationTrsfPoints( myPreviewPrs, anIsByTwoPoints, aLocalPointA, 
+        aLocalPointB, aLocalPointC );
+
+      // Build the existing image local and global points mapping 
+      // according to the current transformation mode.
+      HYDROData_Image::TransformationMode aTrsfMode = myEditedObject->GetTrsfMode();
+      QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC;
+      HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap;
+      if ( aTrsfMode == HYDROData_Image::ReferenceImage )
       {
-        HYDROGUI_PrsImage::TransformationPointMap aPointMap =
-          myPreviewPrs->getTransformationPointMap();
-        if( !aPointMap.isEmpty() )
+        // Compute global points using the transformation matrix of the reference image
+        Handle(HYDROData_Image) aRefImage = myEditedObject->GetTrsfReferenceImage();
+        if ( !aRefImage.IsNull() )
         {
-          aPointMap[ HYDROGUI_PrsImage::PointA ].Point = aLocalPointA;
-          aPointMap[ HYDROGUI_PrsImage::PointB ].Point = aLocalPointB;
+          QTransform aRefTrsf = aRefImage->Trsf(); // The reference image transformation matrix
+          aTrsfPointA = aRefTrsf.map( aLocalPointA ); // Compute the global point A
+          aTrsfPointB = aRefTrsf.map( aLocalPointB ); // Compute the global point B
           if ( !anIsByTwoPoints )
-            aPointMap[ HYDROGUI_PrsImage::PointC ].Point = aLocalPointC;
-
-          myPreviewPrs->setTransformationPointMap( aPointMap );
+          {
+            aTrsfPointC = aRefTrsf.map( aLocalPointC ); // Compute the global point C if used
+          }
+          // Build the local-global points map
+          // Use the reference image transformation mode for interpreting global points
+          computeTrsfData( aRefImage->GetTrsfMode(), anIsByTwoPoints, aLocalPointA, aLocalPointB, aLocalPointC,
+            aTrsfPointA, aTrsfPointB, aTrsfPointC, aDataMap );
         }
       }
+      else
+      {
+        // Get global points from the edited image
+        myEditedObject->GetGlobalPoints( aTrsfMode, aTrsfPointA, aTrsfPointB, aTrsfPointC );
+        // Build the local-global points map
+        computeTrsfData( aTrsfMode, anIsByTwoPoints, aLocalPointA, aLocalPointB, aLocalPointC,
+          aTrsfPointA, aTrsfPointB, aTrsfPointC, aDataMap );
+      }
 
-      HYDROData_Image::TransformationMode aTrsfMode;
-      QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC;
-      myEditedObject->GetGlobalPoints( aTrsfMode,
-                                       aTrsfPointA, aTrsfPointB, aTrsfPointC );
-
-      HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap;
-      aDataMap[ HYDROGUI_PrsImage::PointA ] = 
-        HYDROGUI_ImportImageDlg::ComputeTrsfData( aTrsfMode, aLocalPointA, aTrsfPointA );
-      aDataMap[ HYDROGUI_PrsImage::PointB ] =
-        HYDROGUI_ImportImageDlg::ComputeTrsfData( aTrsfMode, aLocalPointB, aTrsfPointB );
-      if ( !anIsByTwoPoints )
-        aDataMap[ HYDROGUI_PrsImage::PointC ] =
-          HYDROGUI_ImportImageDlg::ComputeTrsfData( aTrsfMode, aLocalPointC, aTrsfPointC );
-
+      // Initialize the dialog mode, local and global coordinates 
+      // except coordinates on the reference image
       aPanel->setTransformationMode( aTrsfMode );
       aPanel->setTransformationDataMap( aDataMap );
       aPanel->setByTwoPoints( anIsByTwoPoints );
 
-      // Set points on reference image
-      if ( aTrsfMode = HYDROData_Image::ReferenceImage )
+      // Set points of the reference image
+      if ( aTrsfMode == HYDROData_Image::ReferenceImage )
       {
-        Handle(HYDROData_Image) aRefImage = myEditedObject->GetTrsfReferenceImage();
+        Handle(HYDROData_Image) aRefImage;
+        myEditedObject->GetReferencePoints( aRefImage,
+                                         aTrsfPointA, aTrsfPointB, aTrsfPointC );
         if ( !aRefImage.IsNull() )
         {
           aRefImageName = aRefImage->GetName();
 
+          // Create the reference image presentation in the viewer
           onRefImageActivated( aRefImageName );
-          if( myRefPreviewPrs )
-          {
-            HYDROGUI_PrsImage::TransformationPointMap aRefPointMap =
-              myRefPreviewPrs->getTransformationPointMap();
-            if( !aRefPointMap.isEmpty() )
-            {
-              aRefPointMap[ HYDROGUI_PrsImage::PointA ].Point = aTrsfPointA.toPoint();
-              aRefPointMap[ HYDROGUI_PrsImage::PointB ].Point = aTrsfPointB.toPoint();
-              if ( !anIsByTwoPoints )
-                aRefPointMap[ HYDROGUI_PrsImage::PointC ].Point = aTrsfPointC.toPoint();
-
-              myRefPreviewPrs->setTransformationPointMap( aRefPointMap );
-            }
-          }
 
+          // Set transformation points A,B,C to the reference image presentation
+          setPresentationTrsfPoints( myRefPreviewPrs, anIsByTwoPoints, aTrsfPointA.toPoint(), 
+            aTrsfPointB.toPoint(), aTrsfPointC.toPoint() );
+
+          // Prepare A, B, C points on the reference image
           HYDROGUI_ImportImageDlg::TransformationDataMap aRefDataMap;
-          aRefDataMap[ HYDROGUI_PrsImage::PointA ] = HYDROGUI_ImportImageDlg::TransformationData( aTrsfPointA.toPoint() );
-          aRefDataMap[ HYDROGUI_PrsImage::PointB ] = HYDROGUI_ImportImageDlg::TransformationData( aTrsfPointB.toPoint() );
+          aRefDataMap[ HYDROGUI_PrsImage::PointA ] = 
+            HYDROGUI_ImportImageDlg::TransformationData( aTrsfPointA.toPoint() );
+          aRefDataMap[ HYDROGUI_PrsImage::PointB ] = 
+            HYDROGUI_ImportImageDlg::TransformationData( aTrsfPointB.toPoint() );
           if ( !anIsByTwoPoints )
-            aRefDataMap[ HYDROGUI_PrsImage::PointC ] = HYDROGUI_ImportImageDlg::TransformationData( aTrsfPointC.toPoint() );
+            aRefDataMap[ HYDROGUI_PrsImage::PointC ] = 
+            HYDROGUI_ImportImageDlg::TransformationData( aTrsfPointC.toPoint() );
 
+          // Initialize the dialog's A, B, C points coordinates of the reference image
           aPanel->setTransformationDataMap( aRefDataMap, true, true );
         }
       }
     }
   }
 
-  // collect information about existing images
+  // 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() )
@@ -175,22 +187,67 @@ void HYDROGUI_ImportImageOp::startOperation()
                                    aTrsfPointA, aTrsfPointB, aTrsfPointC );
 
       HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap;
-      aDataMap[ HYDROGUI_PrsImage::PointA ] = 
-        HYDROGUI_ImportImageDlg::ComputeTrsfData( aImgTrsfMode, aLocalPointA, aTrsfPointA );
-      aDataMap[ HYDROGUI_PrsImage::PointB ] =
-        HYDROGUI_ImportImageDlg::ComputeTrsfData( aImgTrsfMode, aLocalPointB, aTrsfPointB );
-      aDataMap[ HYDROGUI_PrsImage::PointC ] =
-        HYDROGUI_ImportImageDlg::ComputeTrsfData( aImgTrsfMode, aLocalPointC, aTrsfPointC );
+      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
   aPanel->setPrsPointDataList( aPrsPointDataList );
+  // Select the current reference image in the dialog combobox
   aPanel->setRefImageName( aRefImageName );
 }
 
+void HYDROGUI_ImportImageOp::setPresentationTrsfPoints( HYDROGUI_PrsImage* thePrs, 
+                                                        bool theIsByTwoPoints,
+                                                        const QPoint theLocalPointA, 
+                                                        const QPoint theLocalPointB, 
+                                                        const QPoint theLocalPointC )
+{
+  // Set transformation points A,B,C to the image presentation
+  if( thePrs )
+  {
+    HYDROGUI_PrsImage::TransformationPointMap aPointMap =
+      thePrs->getTransformationPointMap();
+    if( !aPointMap.isEmpty() )
+    {
+      aPointMap[ HYDROGUI_PrsImage::PointA ].Point = theLocalPointA;
+      aPointMap[ HYDROGUI_PrsImage::PointB ].Point = theLocalPointB;
+      if ( !theIsByTwoPoints )
+        aPointMap[ HYDROGUI_PrsImage::PointC ].Point = theLocalPointC;
+
+      thePrs->setIsByTwoPoints( theIsByTwoPoints );
+      thePrs->setTransformationPointMap( aPointMap );
+    }
+  }
+}
+
+void HYDROGUI_ImportImageOp::computeTrsfData( HYDROData_Image::TransformationMode theTrsfMode,
+                                              bool theIsByTwoPoints,
+                                              const QPoint& theLocalPointA,
+                                              const QPoint& theLocalPointB,
+                                              const QPoint& theLocalPointC,
+                                              const QPointF& theGlobalPointA,
+                                              const QPointF& theGlobalPointB,
+                                              const QPointF& theGlobalPointC,
+                                              HYDROGUI_ImportImageDlg::TransformationDataMap& theDataMap ) const
+{
+  // Build the local-global points map
+  HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap;
+  theDataMap[ HYDROGUI_PrsImage::PointA ] = 
+    HYDROGUI_ImportImageDlg::ComputeTrsfData( theTrsfMode, theLocalPointA, theGlobalPointA );
+  theDataMap[ HYDROGUI_PrsImage::PointB ] =
+    HYDROGUI_ImportImageDlg::ComputeTrsfData( theTrsfMode, theLocalPointB, theGlobalPointB );
+  if ( !theIsByTwoPoints )
+  {
+    theDataMap[ HYDROGUI_PrsImage::PointC ] =
+      HYDROGUI_ImportImageDlg::ComputeTrsfData( theTrsfMode, theLocalPointC, theGlobalPointC );
+  }
+}
+
 void HYDROGUI_ImportImageOp::abortOperation()
 {
   closePreview();
@@ -208,19 +265,29 @@ 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 ) ) );
   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,
@@ -245,30 +312,30 @@ 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;
 }
 
@@ -292,74 +359,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;
+      }
     }
   }
 
@@ -374,17 +449,34 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags,
 
   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 )
@@ -400,13 +492,59 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags,
   if( !myIsEdit )
     module()->setObjectVisible( HYDROGUI_Tool::GetActiveGraphicsViewId( module() ), anImageObj, true );
 
-  if( myIsEdit )
-    anImageObj->Update();
+  anImageObj->Update();
 
   theUpdateFlags = UF_Model | UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced;
   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::onApply()
+{
+  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::onApply();
+  else {
+    aPanel->setRefImageName( "" );
+    onRefImageActivated( aPanel->getRefImageName() );
+  }
+}
+
 void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage )
 {
   HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
@@ -465,14 +603,27 @@ void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage )
       }
     }
 
-    QString anImageName;
-    if( myIsEdit )
+    // 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();
     }
-    else
-      anImageName = HYDROGUI_Tool::GenerateObjectName( module(), "Image" );
+    // 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" ) );
+      }
+    }
+
     aPanel->setImageName( anImageName );
   }
 
@@ -480,6 +631,7 @@ void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage )
 
   aPanel->initializePointSelection();
   onPointSelected( false );
+  onSetCIsUsed( !aPanel->isByTwoPoints() );
 }
 
 void HYDROGUI_ImportImageOp::onActivatePointSelection( int thePointType )
@@ -531,7 +683,11 @@ void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName )
   ///// Get a view port for the reference image preview
   if( myRefViewManager )
   {
-    if( GraphicsView_Viewer* aViewer = myRefViewManager->getViewer() )
+    if( theName.isEmpty() )
+    {
+      closeView( myRefViewManager );
+    }
+    else if( GraphicsView_Viewer* aViewer = myRefViewManager->getViewer() )
     {
       aViewPort = aViewer->getActiveViewPort();
     }
@@ -557,7 +713,6 @@ void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName )
       }
     }
   }
-  qApp->processEvents();
 
   if( !aViewPort )
     return;
@@ -596,6 +751,7 @@ void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName )
   // Split views horizontally
   if( anApp->desktop()->inherits( "STD_TabDesktop" ) )
   {
+    qApp->processEvents();
     QtxWorkstack* aWorkstack = ( (STD_TabDesktop*)anApp->desktop() )->workstack();
     aViewPort->activateWindow();
     aViewPort->show();
@@ -635,6 +791,7 @@ void HYDROGUI_ImportImageOp::onPointSelected( bool theIsRefImage )
 
   const HYDROGUI_PrsImage::TransformationPointMap& aPointMap =
     aPrs->getTransformationPointMap();
+  
   HYDROGUI_PrsImage::TransformationPointMapIterator anIter( aPointMap );
   while( anIter.hasNext() )
   {