Minor change for vertices ids.

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

diff --git a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
index 06836f638f52c697baa5436b02043b12b9f631b9..383c7448cd06ef6e06ec24993d728f0579dd9710 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
@@ -359,77 +359,82 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags,
     }
   }
 
-  HYDROGUI_ImportImageDlg::TransformationDataMap aMap;
-  if( !aPanel->getTransformationDataMap( aMap ) )
-    return false;
-
-  bool anIsByTwoPoints = aPanel->isByTwoPoints();
+  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 = anIsByTwoPoints ? QPoint( INT_MIN, INT_MIN ) :
-                                     aMap[ HYDROGUI_PrsImage::PointC ].ImagePoint;
+  if ( aTransformationMode != HYDROData_Image::CartesianFromFile ) {
+    HYDROGUI_ImportImageDlg::TransformationDataMap aMap;
+    if( !aPanel->getTransformationDataMap( aMap ) )
+      return false;
 
-  // 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;
+    bool anIsByTwoPoints = aPanel->isByTwoPoints();
 
-  Handle(HYDROData_Image) aRefImageObj;
-  QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC( INT_MIN, INT_MIN );
+    aPointA = aMap[ HYDROGUI_PrsImage::PointA ].ImagePoint;
+    aPointB = aMap[ HYDROGUI_PrsImage::PointB ].ImagePoint;
+    aPointC = anIsByTwoPoints ? QPoint( INT_MIN, INT_MIN ) :
+                                aMap[ HYDROGUI_PrsImage::PointC ].ImagePoint;
 
-  HYDROData_Image::TransformationMode aTransformationMode = 
-    (HYDROData_Image::TransformationMode)aPanel->getTransformationMode();
-  if ( aTransformationMode == HYDROData_Image::ReferenceImage )
-  {
-    QString aRefImageName = aPanel->getRefImageName();
-    if( aRefImageName.isEmpty() )
-    {
-      theErrorMsg = tr( "REFERENCE_IMAGE_IS_NOT_SELECTED" );
+    // 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;
-    }
 
-    HYDROGUI_ImportImageDlg::TransformationDataMap aRefMap;
-    if( !aPanel->getTransformationDataMap( aRefMap, true ) )
-      return false;
+    if ( aTransformationMode == HYDROData_Image::ReferenceImage )
+    {
+      QString aRefImageName = aPanel->getRefImageName();
+      if( aRefImageName.isEmpty() )
+      {
+        theErrorMsg = tr( "REFERENCE_IMAGE_IS_NOT_SELECTED" );
+        return false;
+      }
 
-    aRefImageObj = Handle(HYDROData_Image)::DownCast(
-      HYDROGUI_Tool::FindObjectByName( module(), aRefImageName, KIND_IMAGE ) );
-    if( aRefImageObj.IsNull() )
-      return false;
+      HYDROGUI_ImportImageDlg::TransformationDataMap aRefMap;
+      if( !aPanel->getTransformationDataMap( aRefMap, true ) )
+        return false;
 
-    else if ( !isReferenceCorrect() )
-      aRefImageObj->RemoveAllReferences();
+      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;
+      }
     }
   }
 
@@ -444,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 )