Merge branch 'BR_H2018_3' into BR_2018_V8_5

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

diff --git a/src/HYDROGUI/HYDROGUI_ImportImageOp.h b/src/HYDROGUI/HYDROGUI_ImportImageOp.h
index 0acdd0bc9b7aa8ab8ffb01817f67747708ca3302..32b1853caed74f89f92acc423697e79a3d95c29a 100644 (file)
--- 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,13 +45,17 @@ 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();
 
-  void                       onCreatePreview( QImage );
+protected slots:
+  void                       onCreatePreview( QImage, HYDROData_Image::ECW_FileInfo* );
   void                       onActivatePointSelection( int );
   void                       onPointCoordChanged( bool, int, bool, int );
   void                       onModeActivated( int );
@@ -67,6 +67,7 @@ protected slots:
   void                       onPointSelected();
   void                       onRefPointSelected();
   void                       onPointSelected( bool theIsRefImage );
+  void                       onFilesSelected( const QStringList& );
 
 private:
   void                       closePreview();
@@ -109,6 +110,8 @@ private:
   void                       getReferenceDataList(
                                  HYDROGUI_ImportImageDlg::PrsPointDataList& theList ) const;
 
+  bool SetNextFile();
+
 private:
   bool                       myIsEdit;
   Handle(HYDROData_Image)    myEditedObject;
@@ -123,6 +126,8 @@ private:
   QImage                     myImage;              //!< The loaded image to import
 
   int                        myPointType;
+  QStringList                myFiles;
+  int                        myFileIndex;
 };
 
 #endif