Name validator is added to the Calculation Case dialog.

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_CalculationOp.h

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index bc58e6f5d6f85b04e9f6fb707f88ccf42394273d..ecdd145d1c62a19f140ef6caa4c47dbba72690f7 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.h
@@ -25,11 +25,11 @@
 
 #include "HYDROGUI_Operation.h"
 
-#include "HYDROGUI_SplitZonesTool.h"
+#include "HYDROData_SplitToZonesTool.h"
 #include "HYDROGUI_Shape.h"
 
-#include <HYDROData_Calculation.h>
-#include <HYDROData_Zone.h>
+#include <HYDROData_CalculationCase.h>
+#include <HYDROData_Region.h>
 
 class SUIT_ViewManager;
 class OCCViewer_ViewManager;
@@ -38,23 +38,22 @@ class HYDROGUI_CalculationOp : public HYDROGUI_Operation
 {
   Q_OBJECT
 
-  struct SplittedZone
+  struct Region
   {
-    QString                            ZoneName;
-    QString                            PolylineName;
+    QString                            RegionName;
     QColor                             FillingColor;
     QColor                             BorderColor;
-    HYDROGUI_SplitZonesTool::SplitData SplitData;
+    HYDROData_SplitToZonesTool::SplitData SplitData;
     HYDROGUI_Shape*                    Shape;
-    Handle(HYDROData_Zone)             DataZone;
+    Handle(HYDROData_Region)           DataRegion;
 
-    SplittedZone()
+    Region()
     : Shape( NULL ),
       FillingColor( Qt::green ),
       BorderColor( Qt::transparent )
     { }
 
-    ~SplittedZone()
+    ~Region()
     {
       if ( Shape )
       {
@@ -64,7 +63,7 @@ class HYDROGUI_CalculationOp : public HYDROGUI_Operation
     }
   };
 
-  typedef QList<SplittedZone>         SplittedZonesList;
+  typedef QList<Region>         RegionsList;
 
 public:
   HYDROGUI_CalculationOp( HYDROGUI_Module* theModule, bool theIsEdit );
@@ -77,6 +76,7 @@ protected:
 
   virtual HYDROGUI_InputPanel*    createInputPanel() const;
 
+  virtual void                    onApply();
   virtual bool                    processApply( int& theUpdateFlags, QString& theErrorMsg );
 
 protected slots:
@@ -89,12 +89,12 @@ private:
 
 private:
   bool                            myIsEdit;
-  Handle(HYDROData_Calculation)   myEditedObject;
+  Handle(HYDROData_CalculationCase) myEditedObject;
 
   SUIT_ViewManager*               myActiveViewManager;
 
   OCCViewer_ViewManager*          myPreviewViewManager;
-  SplittedZonesList               mySplittedZones;
+  RegionsList                     myRegionsList;
 };
 
 #endif