X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.h;h=81c19c61dcd4142c75b9524c964d78be9a09a17f;hb=7810759dad7d7f4552ad1008af73112509256813;hp=3cf13988affa816f1adf4c57d1fd81a4d6c08db8;hpb=0676b7539aa0e59468673e1d3b44ea8a897aa9fc;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index 3cf13988..81c19c61 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.h
@@ -40,33 +40,6 @@ class HYDROGUI_CalculationOp : public HYDROGUI_Operation
 {
   Q_OBJECT
 
-  struct Region
-  {
-    QString                            RegionName;
-    QColor                             FillingColor;
-    QColor                             BorderColor;
-    HYDROData_SplitToZonesTool::SplitData SplitData;
-    HYDROGUI_Shape*                    Shape;
-    Handle(HYDROData_Region)           DataRegion;
-
-    Region()
-    : Shape( NULL ),
-      FillingColor( Qt::green ),
-      BorderColor( Qt::transparent )
-    { }
-
-    ~Region()
-    {
-      if ( Shape )
-      {
-        delete Shape;
-        Shape = NULL;
-      }
-    }
-  };
-
-  typedef QList<Region>         RegionsList;
-
 public:
   HYDROGUI_CalculationOp( HYDROGUI_Module* theModule, bool theIsEdit );
   virtual ~HYDROGUI_CalculationOp();
@@ -79,7 +52,10 @@ 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:
   /**
@@ -90,29 +66,72 @@ 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.
    */
   void                            onSetMergeType( int theMergeType, QString& theBathymetryName );
+  /**
+   * Selected zones are moved to the existing region.
+   */
   void                            onMoveZones( SUIT_DataObject* theRegionItem, 
                                                const QList<SUIT_DataObject*>& theZonesList );
+  /**
+   * Selected zones are moved to the new region to be created.
+   */
   void                            onCreateRegion( const QList<SUIT_DataObject*>& theZonesList );
-  void                            onSplitZones();
+  /**
+   * Case objects must be splitted to zones if the case has been modified or new.
+   */
+  void                            onNext( const int );
   void                            onLastViewClosed( SUIT_ViewManager* );
+  /**
+   * The zone is selected in the browser on the second page of the wizard.
+   */
+  void                            onClickedInZonesBrowser( SUIT_DataObject* theItem );
+  /**
+   * Hide zones in the viewer.
+   */
+  void                            onHideZones();
+  /** 
+   * Geometry object is selected in the list on the first wizard page
+   */
+  void                            onObjectsSelected();
+  /** 
+   * Boundary polyline is selected in the list on the first wizard page
+   */
+  void                            onBoundarySelected ( const QString & theObjName );
 
 private:
   void                            createPreview();
   void                            closePreview();
-  void                            updateGeomObjectsList( HYDROGUI_CalculationDlg* thePanel ) const;
+  void                            setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible );
+  void                            setZonesVisible( bool theIsVisible );
+  void                            getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq, 
+                                                      QStringList& theNames, QStringList& theEntries ) const;
+
+  /**
+   * Ask user to confirm splitting zones recalculation.
+   * \return true if confirmed
+   */
+  bool                            confirmRegionsChange() const;
 
 private:
   bool                            myIsEdit;
+  bool                            myShowZones;
   Handle(HYDROData_CalculationCase) myEditedObject;
 
   SUIT_ViewManager*               myActiveViewManager;
-
   OCCViewer_ViewManager*          myPreviewViewManager;
-  RegionsList                     myRegionsList;
 };
 
 #endif