From 1a9ac35ccdb38656a2c13922748d2e5ab85af5ed Mon Sep 17 00:00:00 2001
From: apo <apo@opencascade.com>
Date: Thu, 6 Oct 2005 11:13:21 +0000
Subject: [PATCH] To customize SpaceMause interaction (introduce magnification
 functionality)

---
 src/OBJECT/Makefile.in                         |  1 +
 src/{VVTK/VVTK_Event.h => OBJECT/VISU_Event.h} |  8 ++++----
 src/OBJECT/VISU_GaussPtsAct.cxx                | 16 ++++++++++++++--
 src/VVTK/Makefile.in                           |  1 -
 src/VVTK/VVTK_InteractorStyle.cxx              | 14 +++++++-------
 5 files changed, 26 insertions(+), 14 deletions(-)
 rename src/{VVTK/VVTK_Event.h => OBJECT/VISU_Event.h} (93%)

diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in
index 963db782..e73a5816 100644
--- a/src/OBJECT/Makefile.in
+++ b/src/OBJECT/Makefile.in
@@ -36,6 +36,7 @@ EXPORT_HEADERS = \
 	VISU_ActorFactory.h \
 	VISU_GaussPtsSettings.h \
 	VISU_GaussPtsActorFactory.h \
+	VISU_Event.h \
 	VISU_Actor.h \
 	VISU_MeshAct.h \
 	VISU_ScalarMapAct.h \
diff --git a/src/VVTK/VVTK_Event.h b/src/OBJECT/VISU_Event.h
similarity index 93%
rename from src/VVTK/VVTK_Event.h
rename to src/OBJECT/VISU_Event.h
index 793f9b4c..e9850df9 100644
--- a/src/VVTK/VVTK_Event.h
+++ b/src/OBJECT/VISU_Event.h
@@ -22,16 +22,16 @@
 //
 //
 //  File   : 
-//  Author : Alexander SLADKOV
+//  Author : 
 //  Module : SALOME
 //  $Header$
 
-#ifndef VVTK_Event_h
-#define VVTK_Event_h
+#ifndef VISU_Event_h
+#define VISU_Event_h
 
 #include "SVTK_Event.h"
 
-namespace VVTK
+namespace VISU
 {
   enum Event 
   {
diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx
index 0a829cad..dcf909df 100644
--- a/src/OBJECT/VISU_GaussPtsAct.cxx
+++ b/src/OBJECT/VISU_GaussPtsAct.cxx
@@ -35,6 +35,7 @@
 #include "VISU_ScalarBarCtrl.hxx"
 #include "VISU_ScalarBarActor.hxx"
 
+#include "VISU_Event.h" 
 #include "SVTK_Actor.h"
 
 #include <vtkCamera.h>
@@ -427,11 +428,17 @@ VISU_GaussPtsAct
   if(myInteractor)
     myInteractor->RemoveObserver(myEventCallbackCommand.GetPointer());
   
-  if(theInteractor)
+  if(theInteractor){
     theInteractor->AddObserver(vtkCommand::CharEvent, 
 			       myEventCallbackCommand.GetPointer(), 
 			       myPriority);
-  
+    theInteractor->AddObserver(VISU::SetSMDecreaseMagnificationEvent, 
+			       myEventCallbackCommand.GetPointer(), 
+			       myPriority);
+    theInteractor->AddObserver(VISU::SetSMIncreaseMagnificationEvent, 
+			       myEventCallbackCommand.GetPointer(), 
+			       myPriority);
+  }
   Superclass::SetInteractor(theInteractor);
 
   Modified();
@@ -470,6 +477,11 @@ VISU_GaussPtsAct
     myUpdatePrs3dSignal(this);
     break;
   }
+  case VISU::SetSMDecreaseMagnificationEvent: 
+  case VISU::SetSMIncreaseMagnificationEvent: 
+    myChangeMagnification = theEvent == VISU::SetSMIncreaseMagnificationEvent;
+    myUpdatePrs3dSignal(this);
+    break;
   default:
     break;
   }
diff --git a/src/VVTK/Makefile.in b/src/VVTK/Makefile.in
index 331be56e..1516f7dc 100755
--- a/src/VVTK/Makefile.in
+++ b/src/VVTK/Makefile.in
@@ -14,7 +14,6 @@ VPATH=.:@srcdir@
 # header files
 EXPORT_HEADERS = \
 	VVTK.h \
-	VVTK_Event.h \
 	VVTK_ViewManager.h \
 	VVTK_ViewModel.h \
 	VVTK_InteractorStyle.h \
diff --git a/src/VVTK/VVTK_InteractorStyle.cxx b/src/VVTK/VVTK_InteractorStyle.cxx
index 841b5f0d..c66ab7c2 100644
--- a/src/VVTK/VVTK_InteractorStyle.cxx
+++ b/src/VVTK/VVTK_InteractorStyle.cxx
@@ -30,7 +30,7 @@
 #include "VVTK_InteractorStyle.h"
 #include "VISU_GaussPtsSettings.h"
 #include "SVTK_Selector.h"
-#include "VVTK_Event.h" 
+#include "VISU_Event.h" 
 
 #include <vtkObjectFactory.h>
 #include <vtkRenderWindowInteractor.h>
@@ -228,8 +228,8 @@ VVTK_InteractorStyle
   Superclass::SetInteractor( theInteractor );
  
   if(theInteractor){ 
-    theInteractor->AddObserver( VVTK::SetSMDecreaseMagnificationEvent, EventCallbackCommand, Priority );
-    theInteractor->AddObserver( VVTK::SetSMIncreaseMagnificationEvent, EventCallbackCommand, Priority );
+    theInteractor->AddObserver( VISU::SetSMDecreaseMagnificationEvent, EventCallbackCommand, Priority );
+    theInteractor->AddObserver( VISU::SetSMIncreaseMagnificationEvent, EventCallbackCommand, Priority );
   }
 }
 
@@ -256,10 +256,10 @@ VVTK_InteractorStyle
     VVTK_InteractorStyle* self = dynamic_cast<VVTK_InteractorStyle*>( anObject );
     if( self ){
       switch ( event ) {
-      case VVTK::SetSMDecreaseMagnificationEvent:
+      case VISU::SetSMDecreaseMagnificationEvent:
 	self->mySMDecreaseMagnificationBtn = *((int*)callData);
 	return;
-      case VVTK::SetSMIncreaseMagnificationEvent:
+      case VISU::SetSMIncreaseMagnificationEvent:
 	self->mySMIncreaseMagnificationBtn = *((int*)callData);
 	return;
       }
@@ -288,7 +288,7 @@ void
 VVTK_InteractorStyle
 ::DecreaseGaussPointMagnification()
 {
-  printf( "\n--DecreaseGaussPointMagnification() NOT IMPLEMENTED--\n" );
+  Interactor->InvokeEvent(VISU::SetSMDecreaseMagnificationEvent,NULL);
 }
 
 //----------------------------------------------------------------------------
@@ -296,5 +296,5 @@ void
 VVTK_InteractorStyle
 ::IncreaseGaussPointMagnification()
 {
-  printf( "\n--IncreaseGaussPointMagnification() NOT IMPLEMENTED--\n" );
+  Interactor->InvokeEvent(VISU::SetSMIncreaseMagnificationEvent,NULL);
 }
-- 
2.39.2