X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.h;h=bf449bde2826ab0514c550fa7f69fe3ccdd41ba2;hb=de7cf9bb0a7a41d6487013c87f4a54d0664cd303;hp=394afcd9bc306ae1b074cb869d5bcedc4ce6d79c;hpb=84f8b4a57d3cdad820bc1333a5066699cd1c8ae3;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index 394afcd9..bf449bde 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.h
@@ -28,43 +28,18 @@
 #include "HYDROData_SplitToZonesTool.h"
 #include "HYDROGUI_Shape.h"
 
-#include <HYDROData_Calculation.h>
+#include <HYDROData_CalculationCase.h>
 #include <HYDROData_Region.h>
 
 class SUIT_ViewManager;
 class OCCViewer_ViewManager;
+class HYDROGUI_CalculationDlg;
+class SUIT_DataObject;
 
 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();
@@ -76,24 +51,73 @@ protected:
 
   virtual HYDROGUI_InputPanel*    createInputPanel() const;
 
+  virtual void                    onApply();
   virtual bool                    processApply( int& theUpdateFlags, QString& theErrorMsg );
 
 protected slots:
+  /**
+   * Add geometry objects selected in the module browser to the calculation case.
+   */
+  void                            onAddObjects();
+  /**
+   * Remove selected objects from the calculation case.
+   */
+  void                            onRemoveObjects();
+  /**
+   * 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 );
+  /**
+   * Case objects must be splitted to zones if the case has been modified or new.
+   */
   void                            onSplitZones();
   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                            onObjectSelected ( const QString & theObjName );
+  /** 
+   * Boundary polyline is selected in the list on the first wizard page
+   */
+  void                            onBoundarySelected ( const QString & theObjName );
 
 private:
   void                            createPreview();
   void                            closePreview();
+  void                            showObject( Handle(HYDROData_Entity) theEntity, Handle(AIS_InteractiveContext) theCtx );
+  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;
-  Handle(HYDROData_Calculation)   myEditedObject;
+  bool                            myShowZones;
+  Handle(HYDROData_CalculationCase) myEditedObject;
 
   SUIT_ViewManager*               myActiveViewManager;
-
   OCCViewer_ViewManager*          myPreviewViewManager;
-  RegionsList                     myRegionsList;
 };
 
 #endif