Merge with version on tag OCC-V2_1_0d

[modules/geom.git] / src / PrimitiveGUI / PrimitiveGUI.h

diff --git a/src/PrimitiveGUI/PrimitiveGUI.h b/src/PrimitiveGUI/PrimitiveGUI.h
index f85e688158d0c623798044fdab71e657275b061c..3276c5ed6986d70d1cd1dcbf26d707e8f301164a 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI.h
+++ b/src/PrimitiveGUI/PrimitiveGUI.h
@@ -24,40 +24,33 @@
 //  File   : PrimitiveGUI.h
 //  Author : Damien COQUERET
 //  Module : GEOM
-//  $Header: 
+//  $Header$
 
 #ifndef PRIMITIVEGUI_H
 #define PRIMITIVEGUI_H
 
-#include "GEOMBase.h"
+#include "GEOMGUI.h"
 
+  
 //=================================================================================
 // class    : PrimitiveGUI
 // purpose  :
 //=================================================================================
-class PrimitiveGUI : public QObject
+class PrimitiveGUI : public GEOMGUI
 {
-  Q_OBJECT /* for QT compatibility */
+protected:
+  PrimitiveGUI(); // hide constructor to avoid direct creation
 
 public :
-  PrimitiveGUI();
   ~PrimitiveGUI();
 
-  static bool OnGUIEvent(int theCommandID, QAD_Desktop* parent);
+  // Get the only PrimitiveGUI object
+  static PrimitiveGUI* GetPrimitiveGUI();
 
-  void MakeBoxAndDisplay(const gp_Pnt P1, const gp_Pnt P2);
-  void MakeCylinderAndDisplay(const gp_Pnt BasePoint, const gp_Dir aDir,
-                             const double Radius, const double aHeight);
-  void MakeSphereAndDisplay(const gp_Pnt aCenterPoint, const double aRadius);
-  void MakeTorusAndDisplay(const gp_Pnt BasePoint, const gp_Dir aDir,
-                          const double Radius1, const double Radius2); 
-  void MakeConeAndDisplay(const gp_Pnt BasePoint, const gp_Dir aDir,
-                         const double Radius1, const double Radius2, const double aHeight);
-
-  GEOMBase* myGeomBase;
-  GEOMContext* myGeomGUI;
-  GEOM::GEOM_Gen_var myGeom;   /* Current Geom Component */
+  bool OnGUIEvent(int theCommandID, QAD_Desktop* parent);
 
+private:
+  static PrimitiveGUI* myGUIObject;    // the only PrimitiveGUI object
 };
 
 #endif