X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ImportImageOp.h;h=e6b68ce85138609f7883d2f2108c25fc548af757;hb=d6e19029f8b41f295db878e9aecf451c2edda4af;hp=ad45664edab7f1b025326372048b95cc786f8cf8;hpb=5cae7e874afd2fc1b6f61023e8ebd33a933db3c7;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_ImportImageOp.h b/src/HYDROGUI/HYDROGUI_ImportImageOp.h
index ad45664e..e6b68ce8 100644
--- a/src/HYDROGUI/HYDROGUI_ImportImageOp.h
+++ b/src/HYDROGUI/HYDROGUI_ImportImageOp.h
@@ -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
@@ -24,15 +20,14 @@
 #define HYDROGUI_IMPORTIMAGEOP_H
 
 #include "HYDROGUI_Operation.h"
+#include "HYDROGUI_ImportImageDlg.h"
 
 #include <HYDROData_Image.h>
 
 #include <QImage>
 
 class GraphicsView_ViewManager;
-
 class SUIT_ViewManager;
-
 class HYDROGUI_PrsImage;
 
 class HYDROGUI_ImportImageOp : public HYDROGUI_Operation
@@ -50,7 +45,14 @@ protected:
 
   virtual HYDROGUI_InputPanel* createInputPanel() const;
 
-  virtual bool               processApply( int& theUpdateFlags, QString& theErrorMsg );
+  virtual bool               processApply( int& theUpdateFlags, QString& theErrorMsg,
+                                           QStringList& theBrowseObjectsEntries );
+  bool                       isReferenceCorrect() const;
+
+  /**
+   * Apply changes done by this operation.
+   */
+  virtual void               apply();
 
 protected slots:
   void                       onCreatePreview( QImage );
@@ -58,12 +60,14 @@ protected slots:
   void                       onPointCoordChanged( bool, int, bool, int );
   void                       onModeActivated( int );
   void                       onRefImageActivated( const QString& );
+  void                       onSetCIsUsed( bool theCIsUsed );
 
   void                       onLastViewClosed( SUIT_ViewManager* );
 
   void                       onPointSelected();
   void                       onRefPointSelected();
   void                       onPointSelected( bool theIsRefImage );
+  void                       onFilesSelected( const QStringList& );
 
 private:
   void                       closePreview();
@@ -78,6 +82,36 @@ private:
                                           QString&       theErrorMsg,
                                           const bool     theIsToCheckInvertibles ) const;
 
+  /**
+   * Build the local-global points mapping.
+   */
+  void                       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;
+
+  /**
+   * Set transformation points A,B,C to the image presentation.
+   */
+  void                       setPresentationTrsfPoints( HYDROGUI_PrsImage* thePrs, 
+                                                        bool theIsByTwoPoints,
+                                                        const QPoint theLocalPointA, 
+                                                        const QPoint theLocalPointB, 
+                                                        const QPoint theLocalPointC );
+
+  /*
+   * Initialize the combobox in the dialog with the list of available reference images
+   */
+  void                       getReferenceDataList(
+                                 HYDROGUI_ImportImageDlg::PrsPointDataList& theList ) const;
+
+  bool SetNextFile();
+
 private:
   bool                       myIsEdit;
   Handle(HYDROData_Image)    myEditedObject;
@@ -92,6 +126,8 @@ private:
   QImage                     myImage;              //!< The loaded image to import
 
   int                        myPointType;
+  QStringList                myFiles;
+  int                        myFileIndex;
 };
 
 #endif