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

diff --git a/src/HYDROGUI/HYDROGUI_ImportImageOp.h b/src/HYDROGUI/HYDROGUI_ImportImageOp.h
index 5a7e858f..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
@@ -49,12 +45,16 @@ 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;
 
-protected slots:
-  virtual void               onApply();
+  /**
+   * Apply changes done by this operation.
+   */
+  virtual void               apply();
 
+protected slots:
   void                       onCreatePreview( QImage );
   void                       onActivatePointSelection( int );
   void                       onPointCoordChanged( bool, int, bool, int );
@@ -67,6 +67,7 @@ protected slots:
   void                       onPointSelected();
   void                       onRefPointSelected();
   void                       onPointSelected( bool theIsRefImage );
+  void                       onFilesSelected( const QStringList& );
 
 private:
   void                       closePreview();
@@ -103,6 +104,14 @@ private:
                                                         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;
@@ -117,6 +126,8 @@ private:
   QImage                     myImage;              //!< The loaded image to import
 
   int                        myPointType;
+  QStringList                myFiles;
+  int                        myFileIndex;
 };
 
 #endif