X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.h;h=8eb18c1463deed01f16d76e1f63768623db0b2d2;hb=c16caee6b6e61dffbc739dce6639215b24a459d3;hp=c7c92fdef2637b7c71473da147521a34f0c9b231;hpb=4b82ec592a58884d56d7637ab16c3cff757f4b8f;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index c7c92fde..8eb18c14 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.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
@@ -20,6 +16,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+
 #ifndef HYDROGUI_CALCULATIONOP_H
 #define HYDROGUI_CALCULATIONOP_H
 
@@ -52,11 +49,21 @@ 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();
 
+  void setAvailableBoundaryPolygons();
+
 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.
    */
@@ -75,21 +82,25 @@ protected slots:
    */
   void                            onRemoveGroups();
 
+  void                            onAddBoundaryPolygons();
+
+  void                            onRemoveBoundaryPolygons();
+
   /**
-   * Set the given bathymetry merge type to the current zone.
+   * Set the given bathymetry/type merge type to the current zone.
    */
-  void                            onSetMergeType( int theMergeType, QString& theBathymetryName );
+  void                            onSetMergeType( int theMergeType, QString& theMergeObjectName );
   /**
    * Selected zones are moved to the existing region.
    */
   void                            onMoveZones( SUIT_DataObject* theRegionItem, 
-                                               const QList<SUIT_DataObject*>& theZonesList );
+                                               const QList<SUIT_DataObject*>& theZonesList);
   /**
    * Selected zones are moved to the new region to be created.
    */
   void                            onCreateRegion( const QList<SUIT_DataObject*>& theZonesList );
   /**
-   * Case objects must be splitted to zones if the case has been modified or new.
+   * Case objects must be split to zones if the case has been modified or new.
    */
   void                            onNext( const int );
   void                            onLastViewClosed( SUIT_ViewManager* );
@@ -98,35 +109,63 @@ protected slots:
    */
   void                            onClickedInZonesBrowser( SUIT_DataObject* theItem );
   /**
-   * Hide zones in the viewer.
+   * Slot called on back button click.
    */
-  void                            onHideZones();
+  void                            onHideZones( const int );
   /** 
    * Geometry object is selected in the list on the first wizard page
    */
   void                            onObjectsSelected();
+  /** 
+   * Land cover map is selected in the list on the third wizard page
+   */
+  void                            onLandCoverMapSelected( const QString & theObjName );
   /** 
    * Boundary polyline is selected in the list on the first wizard page
    */
-  void                            onBoundarySelected ( const QString & theObjName );
+  void                            onBoundarySelected( const QString & theObjName );
+  /** 
+   * Strickler table name is selected in the list on the third wizard page
+   */
+  void                            onStricklerTableSelected( const QString & theObjName );
+
+  void onOrderChanged( bool& isConfirmed );
+
+  void onRuleChanged( bool& isConfirmed );
+
+  void onRegenerateColors();
 
 private:
-  void                            createPreview();
-  void                            closePreview();
-  void                            showObject( Handle(HYDROData_Entity) theEntity, Handle(AIS_InteractiveContext) theCtx );
+  void                            createPreview( const bool theLandCoverMap, bool fitAllFlag = true, bool onTopViewAndFit = true);
+  void                            closePreview( bool theRemoveViewManager = true );
+  void                            setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible );
   void                            setZonesVisible( bool theIsVisible );
+  void                            setGeomObjectsVisible( bool theIsVisible );
+  void                            setLandCoverMapVisible( 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.
-   * \return true if confirmed
+   * Internal method that used to assign unique default colors for zones
    */
-  bool                            confirmRegionsChange() const;
+  void                            AssignDefaultZonesColors();
+  void                            setRules( HYDROData_CalculationCase::DataTag theDataTag );
+
+  bool                            createRegion( const QList<SUIT_DataObject*>& theZonesList );
+
+  void                            AddInterPolylinesToList(QStringList& theList, QStringList& theEntryList);
+
+  bool confirmRegionsChange() const;
+  bool confirmModeChange() const;
+  bool confirmOrderChange() const;
+  bool confirmRuleChange() const;
+  bool confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const;
 
 private:
   bool                            myIsEdit;
   bool                            myShowZones;
+  bool                            myShowGeomObjects;
+  bool                            myShowLandCoverMap;
   Handle(HYDROData_CalculationCase) myEditedObject;
 
   SUIT_ViewManager*               myActiveViewManager;