Merge branch 'BR_MULTI_BATHS' into HEAD

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

diff --git a/src/HYDROGUI/HYDROGUI_ImportGeomObjectOp.h b/src/HYDROGUI/HYDROGUI_ImportGeomObjectOp.h
index 4b18258499033bb00d8cf399c261eeea88f63130..b68ded797f816a17bb65ffd907687817a09d63c8 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ImportGeomObjectOp.h
+++ b/src/HYDROGUI/HYDROGUI_ImportGeomObjectOp.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
@@ -45,7 +41,7 @@ public:
 public:
   HYDROGUI_ImportGeomObjectOp( HYDROGUI_Module* theModule,
                                const int theOpType,
-                               const bool theIsToShowPanel = true );
+                               const int theGEOMOp = -1 );
   virtual ~HYDROGUI_ImportGeomObjectOp();
 
   static QList<GEOM::shape_type> getObstacleTypes();
@@ -58,12 +54,23 @@ protected:
 
   virtual HYDROGUI_InputPanel* createInputPanel() const;
 
-  virtual bool               processApply( int& theUpdateFlags, QString& theErrorMsg );
+  virtual bool               processApply( int& theUpdateFlags, QString& theErrorMsg,
+                                           QStringList& theBrowseObjectsEntries );
+
+protected slots:
+  void                       onExternalOperationFinished( const QString&, const QString&, 
+                                                          const QStringList& );
+
+private:
+  void updateDefaultName();
+  void closeExternalOperationDlg();
 
 private:
   QStringList myGeomObjects; ///< the list of GEOM object entries
   bool myIsToShowPanel; ///< indicates if obstacle panel to be shown
   int  myOpType; ///< operation type (to import selected GEOM objects or the objects just created by GEOM )
+  int  myGEOMOp; ///< GEOM module operation to be called to create GEOM object for import
+  QString myGEOMOpName; ///< the name of the called GEOM module operation
 };
 
 #endif
\ No newline at end of file