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

diff --git a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
index 5f73b4b0..625d2636 100644
--- a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
@@ -30,9 +30,7 @@
 #include "HYDROGUI_UpdateFlags.h"
 
 #include <HYDROData_Iterator.h>
-#include <HYDROData_Lambert93.h>
-
-#include <HYDROOperations_Factory.h>
+#include <HYDROData_Tool.h>
 
 #include <GraphicsView_ViewManager.h>
 #include <GraphicsView_ViewPort.h>
@@ -41,6 +39,13 @@
 #include <LightApp_Application.h>
 #include <LightApp_UpdateFlags.h>
 
+#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 )
 : HYDROGUI_Operation( theModule ),
@@ -48,6 +53,7 @@ HYDROGUI_ImportImageOp::HYDROGUI_ImportImageOp( HYDROGUI_Module* theModule,
   myEditedObject( 0 ),
   myActiveViewManager( 0 ),
   myPreviewViewManager( 0 ),
+  myRefViewManager( 0 ),
   myPreviewPrs( 0 ),
   myRefPreviewPrs( 0 ),
   myPointType( HYDROGUI_PrsImage::None )
@@ -67,52 +73,101 @@ void HYDROGUI_ImportImageOp::startOperation()
   aPanel->reset();
   aPanel->setIsEdit( myIsEdit );
 
+  QString aRefImageName;
+
   if( myIsEdit )
   {
     myEditedObject = Handle(HYDROData_Image)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
     if( !myEditedObject.IsNull() )
     {
       QImage anImage = myEditedObject->Image();
+      bool anIsByTwoPoints = myEditedObject->IsByTwoPoints();
 
-      int aTransformationMode = myEditedObject->TrsfMode();
-      if( aTransformationMode == HYDROGUI_ImportImageDlg::RefImage )
-        aTransformationMode = HYDROGUI_ImportImageDlg::ManualCartesian;
-      aPanel->setTransformationMode( aTransformationMode );
-
-      QPoint aPointA1, aPointB1, aPointC1;
-      QPointF aPointA2, aPointB2, aPointC2;
-      QPointF aPointA3, aPointB3, aPointC3;
-      myEditedObject->TrsfPoints( aPointA1, aPointB1, aPointC1,
-                                  aPointA2, aPointB2, aPointC2,
-                                  aPointA3, aPointB3, aPointC3 );
+      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 = aPointA1;
-          aPointMap[ HYDROGUI_PrsImage::PointB ].Point = aPointB1;
-          aPointMap[ HYDROGUI_PrsImage::PointC ].Point = aPointC1;
-          myPreviewPrs->setTransformationPointMap( aPointMap );
+          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 )
+          {
+            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 );
+      }
 
-      HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap;
-      aDataMap[ HYDROGUI_PrsImage::PointA ] =
-        HYDROGUI_ImportImageDlg::TransformationData( aPointA1, aPointA2, aPointA3 );
-      aDataMap[ HYDROGUI_PrsImage::PointB ] =
-        HYDROGUI_ImportImageDlg::TransformationData( aPointB1, aPointB2, aPointB3 );
-      aDataMap[ HYDROGUI_PrsImage::PointC ] =
-        HYDROGUI_ImportImageDlg::TransformationData( aPointC1, aPointC2, aPointC3 );
+      // 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 of the reference image
+      if ( aTrsfMode == HYDROData_Image::ReferenceImage )
+      {
+        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 );
+
+          // 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() );
+          if ( !anIsByTwoPoints )
+            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() )
@@ -120,29 +175,77 @@ void HYDROGUI_ImportImageOp::startOperation()
     Handle(HYDROData_Image) anImageObj = Handle(HYDROData_Image)::DownCast( anIterator.Current() );
     if( !anImageObj.IsNull() )
     {
-      if( myIsEdit && HYDROGUI_Tool::IsEqual( anImageObj, myEditedObject ) )
+      if( myIsEdit && IsEqual( anImageObj, myEditedObject ) )
         continue;
 
-      QPoint aPointA1, aPointB1, aPointC1;
-      QPointF aPointA2, aPointB2, aPointC2;
-      QPointF aPointA3, aPointB3, aPointC3;
-      anImageObj->TrsfPoints( aPointA1, aPointB1, aPointC1,
-                              aPointA2, aPointB2, aPointC2,
-                              aPointA3, aPointB3, aPointC3 );
+      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;
-      aDataMap[ HYDROGUI_PrsImage::PointA ] =
-        HYDROGUI_ImportImageDlg::TransformationData( aPointA1, aPointA2, aPointA3 );
-      aDataMap[ HYDROGUI_PrsImage::PointB ] =
-        HYDROGUI_ImportImageDlg::TransformationData( aPointB1, aPointB2, aPointB3 );
-      aDataMap[ HYDROGUI_PrsImage::PointC ] =
-        HYDROGUI_ImportImageDlg::TransformationData( aPointC1, aPointC2, aPointC3 );
+      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()
@@ -162,19 +265,80 @@ 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,
+                                          const bool     theIsByTwoPoints,
+                                          const QString& theLineErrMsg,
+                                          const QString& thePoinErrMsg,
+                                          QString&       theErrorMsg,
+                                          const bool     theIsToCheckInvertibles ) const
+{
+  double xa = thePointA.x();
+  double ya = thePointA.y();
+  double xb = thePointB.x();
+  double yb = thePointB.y();
+  double xc = thePointC.x();
+  double yc = thePointC.y();
+
+  if ( !theIsByTwoPoints )
+  {
+    // check that three input points don't belong to a single line
+    if ( ValuesEquals( ( yb - ya ) * ( xc - xa ), ( yc - ya ) * ( xb - xa ) ) )
+    {
+      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, xb ) && ValuesEquals( ya, yb ) )
+    {
+      theErrorMsg = thePoinErrMsg;
+      return false;
+    }
+  }
+
+  return true;
+}
+
 bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags,
                                            QString& theErrorMsg )
 {
@@ -187,7 +351,7 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags,
   if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != anImageName ) )
   {
     // check that there are no other objects with the same name in the document
-    Handle(HYDROData_Object) anObject = HYDROGUI_Tool::FindObjectByName( module(), anImageName );
+    Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( module(), anImageName );
     if( !anObject.IsNull() )
     {
       theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( anImageName );
@@ -195,91 +359,85 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags,
     }
   }
 
-  int aTransformationMode = aPanel->getTransformationMode();
-  bool anIsRefImage = aTransformationMode == HYDROGUI_ImportImageDlg::RefImage;
-
-  HYDROGUI_ImportImageDlg::TransformationDataMap aMap;
-  if( !aPanel->getTransformationDataMap( aMap ) )
-    return false;
-
-  HYDROGUI_ImportImageDlg::TransformationDataMap aRefMap;
-  if( anIsRefImage && !aPanel->getTransformationDataMap( aRefMap, true ) )
-    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;
 
-  QPoint aPointA = aMap[ HYDROGUI_PrsImage::PointA ].ImagePoint;
-  QPoint aPointB = aMap[ HYDROGUI_PrsImage::PointB ].ImagePoint;
-  QPoint aPointC = aMap[ HYDROGUI_PrsImage::PointC ].ImagePoint;
+  if ( aTransformationMode != HYDROData_Image::CartesianFromFile ) {
+    HYDROGUI_ImportImageDlg::TransformationDataMap aMap;
+    if( !aPanel->getTransformationDataMap( aMap ) )
+      return false;
 
-  QPointF aLPointA = aMap[ HYDROGUI_PrsImage::PointA ].LambertPoint;
-  QPointF aLPointB = aMap[ HYDROGUI_PrsImage::PointB ].LambertPoint;
-  QPointF aLPointC = aMap[ HYDROGUI_PrsImage::PointC ].LambertPoint;
+    bool anIsByTwoPoints = aPanel->isByTwoPoints();
 
-  QPointF aCPointA = aMap[ HYDROGUI_PrsImage::PointA ].CartesianPoint;
-  QPointF aCPointB = aMap[ HYDROGUI_PrsImage::PointB ].CartesianPoint;
-  QPointF aCPointC = aMap[ HYDROGUI_PrsImage::PointC ].CartesianPoint;
+    aPointA = aMap[ HYDROGUI_PrsImage::PointA ].ImagePoint;
+    aPointB = aMap[ HYDROGUI_PrsImage::PointB ].ImagePoint;
+    aPointC = anIsByTwoPoints ? QPoint( INT_MIN, INT_MIN ) :
+                                aMap[ HYDROGUI_PrsImage::PointC ].ImagePoint;
 
-  QPoint aRefPointA, aRefPointB, aRefPointC;
-  if( anIsRefImage )
-  {
-    aRefPointA = aRefMap[ HYDROGUI_PrsImage::PointA ].ImagePoint;
-    aRefPointB = aRefMap[ HYDROGUI_PrsImage::PointB ].ImagePoint;
-    aRefPointC = aRefMap[ HYDROGUI_PrsImage::PointC ].ImagePoint;
-  }
+    // 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;
 
-  int xa = aPointA.x();
-  int ya = aPointA.y();
-  int xb = aPointB.x();
-  int yb = aPointB.y();
-  int xc = aPointC.x();
-  int yc = aPointC.y();
-
-  double xca = aCPointA.x();
-  double yca = aCPointA.y();
-  double xcb = aCPointB.x();
-  double ycb = aCPointB.y();
-  double xcc = aCPointC.x();
-  double ycc = aCPointC.y();
-
-  int xra = aRefPointA.x();
-  int yra = aRefPointA.y();
-  int xrb = aRefPointB.x();
-  int yrb = aRefPointB.y();
-  int xrc = aRefPointC.x();
-  int yrc = aRefPointC.y();
-
-  // first, check that three input points don't belong to a single line
-  if( ( yb - ya ) * ( xc - xa ) == ( yc - ya ) * ( xb - xa ) )
-  {
-    theErrorMsg = tr( "POINTS_A_B_C_BELONG_TO_SINGLE_LINE" );
-    return false;
-  }
+    if ( aTransformationMode == HYDROData_Image::ReferenceImage )
+    {
+      QString aRefImageName = aPanel->getRefImageName();
+      if( aRefImageName.isEmpty() )
+      {
+        theErrorMsg = tr( "REFERENCE_IMAGE_IS_NOT_SELECTED" );
+        return false;
+      }
 
-  // the same check for the reference points
-  if( anIsRefImage &&
-      ( ( yrb - yra ) * ( xrc - xra ) == ( yrc - yra ) * ( xrb - xra ) ) )
-  {
-    theErrorMsg = tr( "REFERENCE_POINTS_A_B_C_BELONG_TO_SINGLE_LINE" );
-    return false;
-  }
+      HYDROGUI_ImportImageDlg::TransformationDataMap aRefMap;
+      if( !aPanel->getTransformationDataMap( aRefMap, true ) )
+        return false;
 
-  QTransform aTransform1( xa, ya, 1, xb, yb, 1, xc, yc, 1 );
-  QTransform aTransform2( xca, yca, 1, xcb, ycb, 1, xcc, ycc, 1 );
-  QTransform aTransform3( xra, yra, 1, xrb, yrb, 1, xrc, yrc, 1 );
+      aRefImageObj = Handle(HYDROData_Image)::DownCast(
+        HYDROGUI_Tool::FindObjectByName( module(), aRefImageName, KIND_IMAGE ) );
+      if( aRefImageObj.IsNull() ) {
+        return false;
+      }
+      else if ( !isReferenceCorrect() ) {
+        aRefImageObj->RemoveAllReferences();
+      }
 
-  bool anIsInvertible = false;
-  QTransform aTransform1Inverted = aTransform1.inverted( &anIsInvertible );
-  if( !anIsInvertible )
-  {
-    theErrorMsg = tr( "TRANSFORMATION_MATRIX_CANNOT_BE_COMPUTED" );
-    return false;
+      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;
+      }
+      else
+      {
+        aTrsfPointA = aMap[ HYDROGUI_PrsImage::PointA ].CartesianPoint;
+        aTrsfPointB = aMap[ HYDROGUI_PrsImage::PointB ].CartesianPoint;
+        if ( !anIsByTwoPoints )
+          aTrsfPointC = aMap[ HYDROGUI_PrsImage::PointC ].CartesianPoint;
+      }
+    }
   }
 
-  QTransform aTransform;
-  if( anIsRefImage )
-    aTransform = aTransform1Inverted * aTransform3 * myRefTransform;
-  else
-    aTransform = aTransform1Inverted * aTransform2;
-
   Handle(HYDROData_Image) anImageObj;
   if( myIsEdit )
     anImageObj = myEditedObject;
@@ -290,38 +448,36 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags,
     return false;
 
   anImageObj->SetName( anImageName );
-
   anImageObj->SetImage( myImage );
-  anImageObj->SetTrsf( aTransform );
+  
+  if ( aTransformationMode == HYDROData_Image::CartesianFromFile ) {
+    QString aGeoreferencementFileName = aPanel->getGeoreferencementFileName();
+    if ( aGeoreferencementFileName.isEmpty() ) {
+      return false;
+    }
 
-  if( anIsRefImage )
-  {
-    aCPointA = QPointF( aTransform.map( aPointA ) );
-    aCPointB = QPointF( aTransform.map( aPointB ) );
-    aCPointC = QPointF( aTransform.map( aPointC ) );
-
-    // compute Lambert93 points
-    xca = aCPointA.x();
-    yca = aCPointA.y();
-    xcb = aCPointB.x();
-    ycb = aCPointB.y();
-    xcc = aCPointC.x();
-    ycc = aCPointC.y();
-
-    double xla = 0, yla = 0, xlb = 0, ylb = 0, xlc = 0, ylc = 0;
-    HYDROData_Lambert93::toGeo( xca, yca, yla, xla );
-    HYDROData_Lambert93::toGeo( xcb, ycb, ylb, xlb );
-    HYDROData_Lambert93::toGeo( xcc, ycc, ylc, xlc );
-
-    aLPointA = QPointF( xla * 3600.0, yla * 3600.0 ); // convert degrees to seconds
-    aLPointB = QPointF( xlb * 3600.0, ylb * 3600.0 ); // convert degrees to seconds
-    aLPointC = QPointF( xlc * 3600.0, ylc * 3600.0 ); // convert degrees to seconds
-  }
+    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 );
 
-  anImageObj->SetTrsfMode( aTransformationMode );
-  anImageObj->SetTrsfPoints( aPointA, aPointB, aPointC,
-                             aLPointA, aLPointB, aLPointC,
-                             aCPointA, aCPointB, aCPointC );
+    if ( aTransformationMode == HYDROData_Image::ReferenceImage )
+    {
+      anImageObj->SetReferencePoints( aRefImageObj,
+                                    aTrsfPointA, aTrsfPointB, aTrsfPointC );
+    }
+    else
+    {
+      anImageObj->SetGlobalPoints( aTransformationMode,
+                                 aTrsfPointA, aTrsfPointB, aTrsfPointC );
+    }
+  }
 
   if( !myIsEdit )
   {
@@ -336,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;
+  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();
@@ -401,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 );
   }
 
@@ -416,6 +631,7 @@ void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage )
 
   aPanel->initializePointSelection();
   onPointSelected( false );
+  onSetCIsUsed( !aPanel->isByTwoPoints() );
 }
 
 void HYDROGUI_ImportImageOp::onActivatePointSelection( int thePointType )
@@ -443,30 +659,65 @@ void HYDROGUI_ImportImageOp::onModeActivated( int theMode )
   HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
 
   QString aRefImageName;
-  if( theMode == HYDROGUI_ImportImageDlg::RefImage )
+  if( theMode == HYDROData_Image::ReferenceImage )
   {
     aRefImageName = aPanel->getRefImageName();
     if( aRefImageName.isEmpty() )
       return; // do nothing in this case to avoid visual moving of preview prs
+    onRefImageActivated( aRefImageName );
+  }
+  else
+  {
+    if( myRefViewManager )
+    {
+      closeView( myRefViewManager );
+    }
   }
-  onRefImageActivated( aRefImageName );
 }
 
 void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName )
 {
-  myRefTransform.reset();
-
   GraphicsView_ViewPort* aViewPort = 0;
-  if( myPreviewViewManager )
-    if( GraphicsView_Viewer* aViewer = myPreviewViewManager->getViewer() )
+
+  LightApp_Application* anApp = module()->getApp();
+  ///// Get a view port for the reference image preview
+  if( myRefViewManager )
+  {
+    if( theName.isEmpty() )
+    {
+      closeView( myRefViewManager );
+    }
+    else if( GraphicsView_Viewer* aViewer = myRefViewManager->getViewer() )
+    {
       aViewPort = aViewer->getActiveViewPort();
+    }
+  }
+  else
+  {
+    anApp = module()->getApp();
+    // Init reference image preview
+    myRefViewManager =
+      dynamic_cast<GraphicsView_ViewManager*>( anApp->createViewManager( GraphicsView_Viewer::Type() ) );
+    if( myRefViewManager )
+    {
+      connect( myRefViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
+               this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) );
+
+      module()->setViewManagerRole( myRefViewManager, HYDROGUI_Module::VMR_ReferenceImage );
+      myRefViewManager->setTitle( tr( "REFERENCE_IMAGE" ) );
+      if( GraphicsView_Viewer* aViewer = myRefViewManager->getViewer() )
+      {
+        aViewPort = aViewer->getActiveViewPort();
+        connect( aViewer, SIGNAL( selectionChanged( GV_SelectionChangeStatus ) ),
+                 this, SLOT( onRefPointSelected() ) );
+      }
+    }
+  }
 
   if( !aViewPort )
     return;
 
-  if( myPreviewPrs )
-    myPreviewPrs->setCaption( QString() );
-
+  // Remove the old presentation of the reference image if any
   if( myRefPreviewPrs )
   {
     myRefPreviewPrs->setCaption( QString() );
@@ -476,13 +727,13 @@ void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName )
     myRefPreviewPrs = 0;
   }
 
+  // Create a new reference image presentation
   QImage anImage;
   Handle(HYDROData_Image) anImageObj = Handle(HYDROData_Image)::DownCast(
     HYDROGUI_Tool::FindObjectByName( module(), theName, KIND_IMAGE ) );
   if( !anImageObj.IsNull() )
   {
     anImage = anImageObj->Image();
-    myRefTransform = anImageObj->Trsf();
 
     myRefPreviewPrs = new HYDROGUI_PrsImage( anImageObj );
     myRefPreviewPrs->setImage( anImage );
@@ -491,25 +742,26 @@ void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName )
     myRefPreviewPrs->setIsTransformationPointPreview( true );
     myRefPreviewPrs->setTransformationPointType( myPointType );
 
-    // vertically shift the reference prs relatively to the main prs
-    if( myPreviewPrs )
-    {
-      myPreviewPrs->setCaption( tr( "IMPORTED_IMAGE" ) );
-
-      QImage anImage = myPreviewPrs->getImage();
-      myRefPreviewPrs->moveBy( 0, anImage.height() + 60 );
-      myRefPreviewPrs->setCaption( tr( "REFERENCE_IMAGE" ) );
-    }
-
+    // Add the new reference image presentation to the appropriate view
     aViewPort->addItem( myRefPreviewPrs );
   }
 
   aViewPort->fitAll();
 
-  HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
+  // Split views horizontally
+  if( anApp->desktop()->inherits( "STD_TabDesktop" ) )
+  {
+    qApp->processEvents();
+    QtxWorkstack* aWorkstack = ( (STD_TabDesktop*)anApp->desktop() )->workstack();
+    aViewPort->activateWindow();
+    aViewPort->show();
+    aViewPort->setFocus(Qt::ActiveWindowFocusReason);
+    aWorkstack->splitHorizontal();
+  }
 
+  // Initialize the dialog
+  HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
   aPanel->setImageSize( anImage.size(), true );
-
   aPanel->initializePointSelection();
   onPointSelected( true );
 }
@@ -524,6 +776,11 @@ void HYDROGUI_ImportImageOp::onPointSelected()
   onPointSelected( myRefPreviewPrs && myRefPreviewPrs->isSelected() );
 }
 
+void HYDROGUI_ImportImageOp::onRefPointSelected()
+{
+  onPointSelected( true );
+}
+
 void HYDROGUI_ImportImageOp::onPointSelected( bool theIsRefImage )
 {
   HYDROGUI_PrsImage* aPrs = theIsRefImage ? myRefPreviewPrs : myPreviewPrs;
@@ -534,6 +791,7 @@ void HYDROGUI_ImportImageOp::onPointSelected( bool theIsRefImage )
 
   const HYDROGUI_PrsImage::TransformationPointMap& aPointMap =
     aPrs->getTransformationPointMap();
+  
   HYDROGUI_PrsImage::TransformationPointMapIterator anIter( aPointMap );
   while( anIter.hasNext() )
   {
@@ -550,35 +808,47 @@ void HYDROGUI_ImportImageOp::onPointSelected( bool theIsRefImage )
 
 void HYDROGUI_ImportImageOp::closePreview()
 {
-  // It's very strange, but without calling this method (it's quite safe) a crash is stably reproduced.
-  // Scenario: create any non-Graphics view, activate import op, click apply.
-  // Result: a few SIGSEGVs coming from processEvents(), then crash.
-  if( myPreviewViewManager )
-    if( GraphicsView_Viewer* aViewer = myPreviewViewManager->getViewer() )
-      if( GraphicsView_ViewPort* aViewPort = aViewer->getActiveViewPort() )
-        aViewPort->onBoundingRectChanged();
+  closeView( myPreviewViewManager );
+  closeView( myRefViewManager );
 
-  if( myPreviewPrs )
-  {
-    delete myPreviewPrs;
-    myPreviewPrs = 0;
-  }
-
-  if( myRefPreviewPrs )
-  {
-    delete myRefPreviewPrs;
-    myRefPreviewPrs = 0;
-  }
+  if( myActiveViewManager )
+    HYDROGUI_Tool::SetActiveViewManager( module(), myActiveViewManager );
+}
 
-  if( myPreviewViewManager )
+void HYDROGUI_ImportImageOp::closeView( GraphicsView_ViewManager* &aViewMgr )
+{
+  if( aViewMgr )
   {
-    disconnect( myPreviewViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
+    GraphicsView_ViewPort* aViewPort = 0;
+    if( GraphicsView_Viewer* aViewer = aViewMgr->getViewer() )
+    {
+      aViewPort = aViewer->getActiveViewPort();
+    }
+    disconnect( aViewMgr, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
                 this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) );
 
-    module()->getApp()->removeViewManager( myPreviewViewManager ); // myPreviewViewManager is deleted here
-    myPreviewViewManager = 0;
-  }
+    // Nullify appropriate presentation pointer
+    HYDROGUI_PrsImage* aPrs = 0;
+    switch ( module()->getViewManagerRole( aViewMgr ) )
+    {
+      case HYDROGUI_Module::VMR_ReferenceImage:
+        aPrs = myRefPreviewPrs;
+        myRefPreviewPrs = 0;
+        break;
+      case HYDROGUI_Module::VMR_TransformImage:
+        aPrs = myPreviewPrs;
+        myPreviewPrs = 0;
+    }
 
-  if( myActiveViewManager )
-    HYDROGUI_Tool::SetActiveViewManager( module(), myActiveViewManager );
+    // Remove the appropriate presentation from the view
+    if( aPrs && aViewPort )
+    {
+      aViewPort->removeItem( aPrs );
+      delete aPrs;
+    }
+
+    // Delete the view
+    module()->getApp()->removeViewManager( aViewMgr ); // aViewMgr is deleted here
+    aViewMgr = 0;
+  }
 }