X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.h;h=a74d7b0648400955661c3ab34b5efec43c96a06a;hb=4d7943ad749b1b6345aa54907d859dc4b3606900;hp=993f2c17df7f290e5943cacb77130b34de587bd6;hpb=474c2cd65280d793f1c81ca528bc92e1cff988e6;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index 993f2c17..a74d7b06 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.h
@@ -1,8 +1,4 @@
-// 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
-//
+// 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
@@ -85,14 +81,14 @@ protected slots:
   void                            onRemoveGroups();
 
   /**
-   * 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.
    */
@@ -107,48 +103,77 @@ 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                            createPreview( const bool theLandCoverMap);
+  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;
 
   /**
-   * Ask user to confirm splitting zones recalculation after regions list modification.
-   * \return true if confirmed
+   * Internal method that used to assign unique default colors for zones
    */
-  bool                            confirmRegionsChange() const;
-
+  void                            AssignDefaultZonesColors();
   /**
-   * 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;
+   * Internal method that used to generate default color for zone
+   * @param theIndex the index of color to be generated
+   * @param theSaturation the saturation of the color in the range 0 to 1,
+   * and the bigger it is, the stronger the color is. Grayish colors have
+   * saturation near 0, very strong colors have saturation near 1.
+   * The defalt value is 0.5.
+   * @param theValue the value in the range 0 to 1, represents lightness or
+   * brightness of the color. 0 is black, 1 is as far from black as possible.
+   * The defalt value is 0.95.
+   * \return the generated color
+   */
+  QColor                          GenerateDefaultZonesColor( int theIndex,
+                                                             float theSaturation = 0.5,
+                                                             float theValue = 0.95 ) const;
+
+  void                            setRules( HYDROData_CalculationCase::DataTag theDataTag );
+
+  bool                            createRegion( const QList<SUIT_DataObject*>& theZonesList );
+
+  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;