X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.h;h=993f2c17df7f290e5943cacb77130b34de587bd6;hb=adf1c2cc49502c366a2637adfcda9c1c71b11887;hp=274f144c3e6f3d8b79f519a4ba32065762633726;hpb=676ac06ae10f045ffae7a56aacbd20f694b9a993;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index 274f144c..993f2c17 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -6,7 +6,7 @@
 // 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
@@ -20,6 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+
 #ifndef HYDROGUI_CALCULATIONOP_H
 #define HYDROGUI_CALCULATIONOP_H
 
@@ -52,9 +53,19 @@ protected:
   virtual HYDROGUI_InputPanel*    createInputPanel() const;
 
   virtual void                    onApply();
-  virtual bool                    processApply( int& theUpdateFlags, QString& theErrorMsg );
+  virtual bool                    processApply( int& theUpdateFlags, QString& theErrorMsg,
+                                                QStringList& theBrowseObjectsEntries );
+
+  void setAvailableGroups();
 
 protected slots:
+
+  /**
+   * Change the creation mode.
+   * @param theMode the mode to set
+   */
+  void                            onChangeMode( int theMode );
+
   /**
    * Add geometry objects selected in the module browser to the calculation case.
    */
@@ -63,6 +74,16 @@ protected slots:
    * Remove selected objects from the calculation case.
    */
   void                            onRemoveObjects();
+
+  /**
+   * Add geometry groups selected in the module browser to the calculation case.
+   */
+  void                            onAddGroups();
+  /**
+   * Remove selected groups from the calculation case.
+   */
+  void                            onRemoveGroups();
+
   /**
    * Set the given bathymetry merge type to the current zone.
    */
@@ -79,7 +100,7 @@ protected slots:
   /**
    * Case objects must be splitted to zones if the case has been modified or new.
    */
-  void                            onSplitZones();
+  void                            onNext( const int );
   void                            onLastViewClosed( SUIT_ViewManager* );
   /**
    * The zone is selected in the browser on the second page of the wizard.
@@ -92,7 +113,7 @@ protected slots:
   /** 
    * Geometry object is selected in the list on the first wizard page
    */
-  void                            onObjectSelected ( const QString & theObjName );
+  void                            onObjectsSelected();
   /** 
    * Boundary polyline is selected in the list on the first wizard page
    */
@@ -101,10 +122,29 @@ protected slots:
 private:
   void                            createPreview();
   void                            closePreview();
-  void                            showObject( Handle(HYDROData_Entity) theEntity, Handle(AIS_InteractiveContext) theCtx );
+  void                            setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible );
   void                            setZonesVisible( bool theIsVisible );
   void                            getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq, 
-                                                QStringList& theNames, QStringList& theEntries ) const;
+                                                      QStringList& theNames, QStringList& theEntries ) const;
+
+  /**
+   * Ask user to confirm splitting zones recalculation after regions list modification.
+   * \return true if confirmed
+   */
+  bool                            confirmRegionsChange() const;
+
+  /**
+   * Ask user to confirm splitting zones recalculation after mode change.
+   * \return true if confirmed
+   */
+  bool                            confirmModeChange() const;
+
+  /**
+   * Ask user to confirm the operation continuation with warning.
+   * @param theWarning the warning
+   * \return true if confirmed
+   */
+  bool                            confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const;
 
 private:
   bool                            myIsEdit;