X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMGUI%2FGeometryGUI.h;h=7477ac6007cc12ea0ff54b4c70ff6ea2588cd2cd;hb=2dbe613765884256942925d8a95293e3c473caec;hp=f6e93644abc93ba577f221fe0016170fa4cbc297;hpb=611ec94e27c211452a3098d014709d519b954e51;p=modules%2Fgeom.git

diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h
index f6e93644a..7477ac600 100644
--- a/src/GEOMGUI/GeometryGUI.h
+++ b/src/GEOMGUI/GeometryGUI.h
@@ -1,46 +1,43 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+// GEOM GEOMGUI : GUI for Geometry component
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// File   : GeometryGUI.h
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
-//
-//  File   : GeometryGUI.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
 
 #ifndef GEOMETRYGUI_H
 #define GEOMETRYGUI_H
 
 #include "GEOM_GEOMGUI.hxx"
 
-#include "SalomeApp_Module.h"
+#include <SalomeApp_Module.h>
 
-#include "GEOMGUI.h"
-#include "GEOM_Client.hxx"
-#include "SALOME_InteractiveObject.hxx"
+#include <GEOM_Client.hxx>
+#include <SALOME_InteractiveObject.hxx>
+#include <SALOMEDSClient.hxx>
 
-#include "SALOMEDSClient.hxx"
+#include "GEOMGUI.h"
 
 // QT Includes
-#include <qmap.h>
+#include <QMap>
 
 // OCCT Includes
 #include <gp_Ax3.hxx>
@@ -52,7 +49,7 @@
 typedef QMap<QString, GEOMGUI*> GUIMap;
 
 class QDialog;
-class QPopupMenu;
+class QMenu;
 class GEOMGUI_OCCSelector;
 class LightApp_VTKSelector;
 class LightApp_Selection;
@@ -106,7 +103,7 @@ public:
   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
@@ -117,10 +114,11 @@ 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* );
@@ -166,10 +164,11 @@ private:
   gp_Ax3                      myWorkingPlane;
   QMap<int,QString>           myRules;           // popup rules
 
-  QPtrList<GEOMGUI_OCCSelector>   myOCCSelectors;
-  QPtrList<LightApp_VTKSelector> myVTKSelectors;
+  QList<GEOMGUI_OCCSelector*>  myOCCSelectors;
+  QList<LightApp_VTKSelector*> myVTKSelectors;
 
   LightApp_Displayer*         myDisplayer;
+  int                         myLocalSelectionMode; //Select Only
 
 friend class DisplayGUI;
 };