X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ImportImageOp.cxx;h=58ca39f3bcef537c399e36802742ff456b55668e;hb=a4583c5dce2b21c67fb215131ff02243ca4811f1;hp=06836f638f52c697baa5436b02043b12b9f631b9;hpb=55e2bdba4efe12717a2d49be73046acc1b50c29d;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
index 06836f63..58ca39f3 100644
--- a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
@@ -166,36 +166,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 );
@@ -225,6 +197,38 @@ void HYDROGUI_ImportImageOp::setPresentationTrsfPoints( HYDROGUI_PrsImage* thePr
   }
 }
 
+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,
@@ -359,77 +363,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 +453,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 )
@@ -531,9 +557,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() )
@@ -553,8 +590,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() ) );
@@ -580,30 +616,29 @@ void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage )
                  this, SLOT( onPointSelected() ) );
       }
     }
+  }
 
-    // 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();
+  // 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 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" ) );
-      }
+    // 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 );
   }
+  aPanel->setImageName( anImageName );
 
   aPanel->setImageSize( myImage.size() );
 
@@ -655,6 +690,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();
@@ -705,17 +746,19 @@ 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() );
+
     // Add the new reference image presentation to the appropriate view
     aViewPort->addItem( myRefPreviewPrs );
   }
@@ -734,7 +777,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 );