Merge remote-tracking branch 'remotes/origin/BR_v14_rc' into BR_SHP_FORMAT

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

diff --git a/src/HYDROGUI/HYDROGUI_ImportImageOp.h b/src/HYDROGUI/HYDROGUI_ImportImageOp.h
index ade485174bfb2a39eef581023540da042ee0a346..e6b68ce85138609f7883d2f2108c25fc548af757 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,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 );
@@ -57,13 +60,14 @@ protected slots:
   void                       onPointCoordChanged( bool, int, bool, int );
   void                       onModeActivated( int );
   void                       onRefImageActivated( const QString& );
-  void                       onSetIsByTwoPoints( bool theIsSetByTwoPoints );
+  void                       onSetCIsUsed( bool theCIsUsed );
 
   void                       onLastViewClosed( SUIT_ViewManager* );
 
   void                       onPointSelected();
   void                       onRefPointSelected();
   void                       onPointSelected( bool theIsRefImage );
+  void                       onFilesSelected( const QStringList& );
 
 private:
   void                       closePreview();
@@ -100,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;
@@ -114,6 +126,8 @@ private:
   QImage                     myImage;              //!< The loaded image to import
 
   int                        myPointType;
+  QStringList                myFiles;
+  int                        myFileIndex;
 };
 
 #endif