X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMGUI%2FGeometryGUI.h;h=8046544798e0ed3868e980b6c887b992b62d8f51;hb=49047f7d298f22733ce9bb55676486c1e7115855;hp=860cd795caee3826cbb4169a2cfc78d353104806;hpb=131a4abe500d60f9a8771655794cd5f8d5da75a9;p=modules%2Fgeom.git

diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h
index 860cd795c..804654479 100644
--- a/src/GEOMGUI/GeometryGUI.h
+++ b/src/GEOMGUI/GeometryGUI.h
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -29,6 +29,8 @@
 #ifndef GEOMETRYGUI_H
 #define GEOMETRYGUI_H
 
+#include "GEOM_GEOMGUI.hxx"
+
 #include "SalomeApp_Module.h"
 
 #include "GEOMGUI.h"
@@ -38,7 +40,7 @@
 #include "SALOMEDSClient.hxx"
 
 // QT Includes
-#include <qmap.h>
+#include <QMap>
 
 // OCCT Includes
 #include <gp_Ax3.hxx>
@@ -47,26 +49,20 @@
 #include "SALOMEconfig.h"
 #include CORBA_CLIENT_HEADER(SALOMEDS)
 
-#ifdef WNT
-#include <SALOME_WNT.hxx>
-#else
-#define SALOME_WNT_EXPORT
-#endif
-
 typedef QMap<QString, GEOMGUI*> GUIMap;
 
 class QDialog;
-class QPopupMenu;
+class QMenu;
 class GEOMGUI_OCCSelector;
-class SalomeApp_VTKSelector;
+class LightApp_VTKSelector;
+class LightApp_Selection;
 class SUIT_ViewManager;
 
-
 //=================================================================================
 // class    : GeometryGUI
 // purpose  :
 //=================================================================================
-class SALOME_WNT_EXPORT GeometryGUI : public SalomeApp_Module
+class  GEOMGUI_EXPORT GeometryGUI : public SalomeApp_Module
 {
   Q_OBJECT;
 
@@ -77,12 +73,13 @@ public:
   // Destructor
   ~GeometryGUI();
 
+  virtual LightApp_Displayer* displayer();
   virtual void                initialize( CAM_Application* );
   virtual QString             engineIOR() const;
 
   static bool                 InitGeomGen();   //BugID IPAL9186: SRN: To be called by Python scripts
 
-  static GEOM::GEOM_Gen_var   GetGeomGen()        { return myComponentGeom; }
+  static  GEOM::GEOM_Gen_var  GetGeomGen();//        { return GeometryGUI::myComponentGeom; }
 
   static CORBA::Object_var    ClientSObjectToObject (_PTR(SObject) theSObject);
   static SALOMEDS::Study_var  ClientStudyToStudy (_PTR(Study) theStudy);
@@ -104,16 +101,12 @@ public:
 
   void                        OnGUIEvent( int id );
 
-  virtual bool                OnKeyPress( QKeyEvent*, SUIT_ViewWindow* );
-  virtual bool                OnMousePress( QMouseEvent*, SUIT_ViewWindow* );
-  virtual bool                OnMouseMove( QMouseEvent*, SUIT_ViewWindow* );
-
 //  virtual bool                SetSettings();
 //  virtual void                SupportedViewType ( int* buffer, int bufferSize );
   virtual void                BuildPresentation( const Handle(SALOME_InteractiveObject)&, SUIT_ViewWindow* = 0 );
 
 //  virtual void                DefinePopup( QString & theContext, QString & theParent, QString & theObject);
-//  virtual bool                CustomPopup( QAD_Desktop* parent, QPopupMenu* popup, const QString& theContext,
+//  virtual bool                CustomPopup( QAD_Desktop* parent, QMenu* popup, const QString& theContext,
 //			                   const QString& theParent, const QString& theObject );
 
   // The Working Plane management
@@ -124,19 +117,25 @@ public:
   virtual void                windows( QMap<int, int>& ) const;
   virtual void                viewManagers( QStringList& ) const;
 
-  virtual void                contextMenuPopup( const QString&, QPopupMenu*, QString& );
+  virtual void                contextMenuPopup( const QString&, QMenu*, QString& );
   virtual void                createPreferences();
   virtual void                preferencesChanged( const QString&, const QString& );
-
+  int                         getLocalSelectionMode() const;
+  void                        setLocalSelectionMode(const int mode);
 
 public slots:
   virtual bool                deactivateModule( SUIT_Study* );
   virtual bool                activateModule( SUIT_Study* );
+  virtual void                OnKeyPress  ( SUIT_ViewWindow*, QKeyEvent*   );
+  virtual void                OnMousePress( SUIT_ViewWindow*, QMouseEvent* );
+  virtual void                OnMouseMove ( SUIT_ViewWindow*, QMouseEvent* );
+
+protected slots:
+  virtual void                onViewManagerAdded( SUIT_ViewManager* );
+  virtual void                onViewManagerRemoved( SUIT_ViewManager* );
 
 private slots:
   void                        OnGUIEvent();
-  void                        onViewManagerAdded( SUIT_ViewManager* );
-  void                        onViewManagerRemoved( SUIT_ViewManager* );
   void                        onWindowActivated( SUIT_ViewWindow* );
 
 signals :
@@ -145,7 +144,7 @@ signals :
   void                        SignalDefaultStepValueChanged( double newVal );
 
 protected:
-  virtual SalomeApp_Selection* createSelection() const;
+  virtual LightApp_Selection* createSelection( const QString&, LightApp_SelectionMgr* ) const;
 
 private:
   GEOMGUI*                    getLibrary( const QString& libraryName );
@@ -157,9 +156,9 @@ private:
 					       const bool isExpandAll = false, const bool isOCC = false,
 					       const int parentId = -1 );
 
-private:
-  static GEOM::GEOM_Gen_var   myComponentGeom;   // GEOM engine
-
+public:
+  static GEOM::GEOM_Gen_var   myComponentGeom;   // GEOM engine!!!
+private:  
   GUIMap                      myGUIMap;          // GUI libraries map
   QDialog*                    myActiveDialogBox; // active dialog box
   GEOM_Client                 myShapeReader;     // geom shape reader
@@ -168,8 +167,13 @@ private:
   gp_Ax3                      myWorkingPlane;
   QMap<int,QString>           myRules;           // popup rules
 
-  QPtrList<GEOMGUI_OCCSelector>   myOCCSelectors;
-  QPtrList<SalomeApp_VTKSelector> myVTKSelectors;
+  QList<GEOMGUI_OCCSelector*>  myOCCSelectors;
+  QList<LightApp_VTKSelector*> myVTKSelectors;
+
+  LightApp_Displayer*         myDisplayer;
+  int                         myLocalSelectionMode; //Select Only
+
+friend class DisplayGUI;
 };
 
 #endif