X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMGUI%2FGEOMGUI.cxx;h=b87f89833a6a9a41a4b1d0f9ea78112e0de498ba;hb=08a90cb03f6d2befe6f0b923bd690182ded48378;hp=8159278750c777d6cd36bc98a9f26b4d5378485a;hpb=d3dd282390888d7dc091ba2c2ffe7923bd7458e6;p=modules%2Fgeom.git

diff --git a/src/GEOMGUI/GEOMGUI.cxx b/src/GEOMGUI/GEOMGUI.cxx
index 815927875..b87f89833 100644
--- a/src/GEOMGUI/GEOMGUI.cxx
+++ b/src/GEOMGUI/GEOMGUI.cxx
@@ -1,44 +1,42 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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 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 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// Copyright (C) 2003-2007  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 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
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//  File   : GEOMGUI.cxx
-//  Author : Vadim SANDLER
-//  Module : GEOM
-//  $Header$
+
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMGUI.cxx
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 
 #include "GEOMGUI.h"
+#include "GeometryGUI.h"
 
-#include "QAD_Desktop.h"
-#include "QAD_StudyFrame.h"
-#include "QAD_Application.h"
-#include <qevent.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ViewWindow.h>
 
 //=================================================================================
 // class    : GEOMGUI::GEOMGUI
 // purpose  : Constructor
 //=================================================================================
-GEOMGUI::GEOMGUI( QObject* parent ) : 
-  QObject ( parent )
+GEOMGUI::GEOMGUI( GeometryGUI* parent ) : 
+QObject ( parent ),
+myGeometryGUI( parent )
 {
 }
 
@@ -54,7 +52,7 @@ GEOMGUI::~GEOMGUI()
 // class    : GEOMGUI::OnGUIEvent
 // purpose  : Main/popup menu events processing
 //=================================================================================
-bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, QAD_Desktop* /*parent*/ )
+bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, SUIT_Desktop* /*parent*/ )
 {
   return TRUE;
 }
@@ -64,7 +62,7 @@ bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, QAD_Desktop* /*parent*/ )
 // purpose  : Mouse press event processing. Should return FALSE to let the event 
 //            be processed further.
 //=================================================================================
-bool GEOMGUI::OnMousePress( QMouseEvent* /*pe*/, QAD_Desktop* /*parent*/, QAD_StudyFrame* /*studyFrame*/ )
+bool GEOMGUI::OnMousePress( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
 {
   return FALSE;
 }
@@ -73,7 +71,16 @@ bool GEOMGUI::OnMousePress( QMouseEvent* /*pe*/, QAD_Desktop* /*parent*/, QAD_St
 // class    : GEOMGUI::OnMouseMove
 // purpose  : Mouse move event processing
 //=================================================================================
-bool GEOMGUI::OnMouseMove( QMouseEvent* /*pe*/, QAD_Desktop* /*parent*/, QAD_StudyFrame* /*studyFrame*/ )
+bool GEOMGUI::OnMouseMove( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
+{
+  return TRUE;
+}
+
+//=================================================================================
+// class    : GEOMGUI::OnMouseMove
+// purpose  : Mouse move event processing
+//=================================================================================
+bool GEOMGUI::OnMouseRelease( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
 {
   return TRUE;
 }
@@ -82,7 +89,7 @@ bool GEOMGUI::OnMouseMove( QMouseEvent* /*pe*/, QAD_Desktop* /*parent*/, QAD_Stu
 // class    : GEOMGUI::OnKeyPress
 // purpose  : Key press event processing
 //=================================================================================
-bool GEOMGUI::OnKeyPress( QKeyEvent* /*pe*/, QAD_Desktop* /*parent*/, QAD_StudyFrame* /*studyFrame*/ )
+bool GEOMGUI::OnKeyPress( QKeyEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
 {
   return TRUE;
 }
@@ -91,25 +98,23 @@ bool GEOMGUI::OnKeyPress( QKeyEvent* /*pe*/, QAD_Desktop* /*parent*/, QAD_StudyF
 // class    : GEOMGUI::SetSettings
 // purpose  : Called when GEOM component is activated
 //=================================================================================
-bool GEOMGUI::SetSettings( QAD_Desktop* /*parent*/ )
+void GEOMGUI::activate( SUIT_Desktop* /*parent*/ )
 {
-  return TRUE;
 }
 
 //=================================================================================
 // class    : GEOMGUI::Deactivate
 // purpose  : Called when GEOM component is deactivated
 //=================================================================================
-void GEOMGUI::Deactivate()
+void GEOMGUI::deactivate()
 {
 }
 
 //=================================================================================
-// class    : GEOMGUI::ActiveStudyChanged
-// purpose  : Called when active study changed
+// class    : GEOMGUI::Deactivate
+// purpose  : Called when GEOM component is deactivated
 //=================================================================================
-bool GEOMGUI::ActiveStudyChanged( QAD_Desktop* /*parent*/ )
+GeometryGUI* GEOMGUI::getGeometryGUI()
 {
-  return TRUE;
+  return myGeometryGUI;
 }
-