no message

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002
index b1974049f0097cd6735bbce6e54af46d711ddc60..b027d3eab09e35e37a6ef12fa0969dd1ebea43e0 100644 (file)
--- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002
+++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002
@@ -1,6 +1,6 @@
 format 73
 "wxVtkViwer" // wxVtkViwer
-  revision 11
+  revision 12
   modified_by 2 "davila"
   // class settings
   //class diagram settings
@@ -1420,5 +1420,35 @@ ${inlines}
          b parent class_ref 131074 // InteractorStyleMaracas
       end
     end
+
+    class 161282 "wxVtkRenderWindowInteractorPlus"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 181506 // <generalisation>
+       relation 181378 ---|>
+         a public
+           cpp default "${type}"
+           classrelation_ref 181506 // <generalisation>
+         b parent class_ref 128898 // wxVtkRenderWindowInteractor
+      end
+
+      classrelation 181634 // <unidirectional association>
+       relation 181506 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 181634 // <unidirectional association>
+         b parent class_ref 128258 // wxVtkBaseView
+      end
+    end
   end
 end

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram
index e430b493ffc23a7132bb6939ad837e7b2500769e..7e17bca5ba8caf62a6b4bb8889c2824e0a5c72cb 100644 (file)
--- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram
+++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram
@@ -2,197 +2,201 @@ format 73
 
 classcanvas 128002 class_ref 128002 // vtkInfoTextImage
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 263.2 625.6 2000
+  xyz 263.6 625.8 2000
 end
 classcanvas 128130 class_ref 128130 // wxVtk2DBaseView
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 329.5 741.9 2000
+  xyz 329.7 741.3 2000
 end
 classcanvas 128386 class_ref 128258 // wxVtkBaseView
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 516.3 405.2 2000
+  xyz 516.9 405.4 2000
 end
 classcanvas 128642 class_ref 128386 // vtkImageViewer2_XYZ
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 154.1 807.7 2000
+  xyz 154.5 807.3 2000
 end
 classcanvas 128898 class_ref 128514 // vtkBaseData
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 199.4 679.2 2000
+  xyz 199.6 679.2 2000
 end
 classcanvas 129026 class_ref 128642 // vtkInfoTextImageInteractor
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 27.5 208.4 2000
+  xyz 27.9 208.2 2000
 end
 classcanvas 129410 class_ref 128770 // wxWindow
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color lightorange
-  xyz 430.8 393 2005
+  xyz 430.4 393.8 2005
 end
 classcanvas 129666 class_ref 128898 // wxVtkRenderWindowInteractor
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 650.2 370.1 2000
+  xyz 650.6 370.3 2000
 end
 classcanvas 129922 class_ref 129026 // vtkInteractorStyleImage
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color magenta
-  xyz 387.4 28.4 2000
+  xyz 387.8 28.2 2000
 end
 classcanvas 131202 class_ref 129282 // wxVtkClipping3DView
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 488.1 798.1 2000
+  xyz 488.1 798.9 2000
 end
 classcanvas 131842 class_ref 129410 // wxPanel
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color lightorange
-  xyz 500.1 740.7 2000
+  xyz 500.5 740.9 2000
 end
 classcanvas 132226 class_ref 129538 // vtkClipping3DDataViewer
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 457.5 690.7 2000
+  xyz 457.5 690.9 2000
 end
 classcanvas 132482 class_ref 129666 // vtkBoxWidget
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color magenta
-  xyz 461.3 882.3 2000
+  xyz 461.3 882.9 2000
 end
 classcanvas 133122 class_ref 129794 // wxVtkClipping3DViewCntrlPanel
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 658.9 1070.7 3005
+  xyz 649.3 1027.9 3005
 end
 classcanvas 133250 class_ref 129922 // wxVtkMPR2DView
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 332.5 954.3 2000
+  xyz 332.1 954.3 2000
 end
 classcanvas 133506 class_ref 130050 // vtkPoints
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color magenta
-  xyz 545.2 1005.2 2000
+  xyz 545.6 1005.4 2000
 end
 classcanvas 133762 class_ref 130178 // vtkActor
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color magenta
-  xyz 464 1144.9 2000
+  xyz 464.2 1144.9 2000
 end
 classcanvas 133890 class_ref 130306 // vtkPolyDataMapper
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color magenta
-  xyz 155.4 1131 2000
+  xyz 155 1131.4 2000
 end
 classcanvas 134274 class_ref 130434 // vtkPolyData
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color magenta
-  xyz 128.9 984.9 2000
+  xyz 128.7 984.9 2000
 end
 classcanvas 135554 class_ref 130562 // vtkInteractorStyleMPRView
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 25.3 159.1 2000
+  xyz 25.5 159.1 2000
 end
 classcanvas 136194 class_ref 130690 // vtkImageViewer2
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color magenta
-  xyz 60.1 751.6 2005
+  xyz 60.9 751 2005
 end
 classcanvas 136450 class_ref 130818 // marImageData
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 112.8 623.6 2000
+  xyz 112.2 623.4 2000
 end
 classcanvas 137090 class_ref 130946 // vtkTextActor
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color magenta
-  xyz 227.6 554.3 2007
+  xyz 227.4 554.3 2007
 end
 note 137346 "_vtkText_WindowLevel
 _vtkText_ColorLevel
 _vtkText_position
 _vtkText_Intensity"
-  xyzwh 38.9 534.6 2013 177 78
+  xyzwh 38.1 535.2 2013 177 78
 classcanvas 137602 class_ref 131074 // InteractorStyleMaracas
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 176.1 25.8 2006
+  xyz 193.3 43 2006
 end
 classcanvas 137986 class_ref 132098 // wxVtkMPR3DView
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 642.6 797.8 2000
+  xyz 642.2 797.4 2000
 end
 classcanvas 138242 class_ref 133634 // wxVtk3DDataViewer
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 644.7 658.3 2000
+  xyz 644.3 658.1 2000
 end
 classcanvas 138626 class_ref 133762 // wxVtkMPR3DViewCntrlPanel
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 684.6 574.4 2000
+  xyz 684.2 574.4 2000
 end
 classcanvas 139778 class_ref 130434 // vtkPolyData
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color magenta
-  xyz 768.9 758.1 2000
+  xyz 768.7 758.9 2000
 end
 classcanvas 140034 class_ref 130178 // vtkActor
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color magenta
-  xyz 778.2 800.7 2000
+  xyz 778.2 800.9 2000
 end
 classcanvas 140290 class_ref 133890 // vtkPlaneWidget
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color magenta
-  xyz 755.7 847.8 3010
+  xyz 755.1 847.4 3010
 end
 classcanvas 140546 class_ref 134018 // vtkPointWidget
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color magenta
-  xyz 753.8 887.8 2000
+  xyz 753.6 887.4 2000
 end
 classcanvas 140930 class_ref 130306 // vtkPolyDataMapper
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color magenta
-  xyz 746.7 936.5 2000
+  xyz 746.5 936.9 2000
 end
 classcanvas 141314 class_ref 131458 // vtkMPRBaseData
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 189.1 733 2010
+  xyz 189.9 733.8 2010
 end
 classcanvas 142082 class_ref 132226 // wxVtk3DBaseView
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 542.2 523.6 2005
+  xyz 542 523.4 2005
 end
 classcanvas 142978 class_ref 140546 // vtkInteractorStyleBaseView
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 374.9 110.7 2000
+  xyz 374.1 110.9 2000
 end
 classcanvas 143234 class_ref 140674 // vtkInteractorStyleBaseView2D
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 282.5 232.7 2006
+  xyz 282.1 232.3 2006
 end
 classcanvas 143490 class_ref 140802 // vtkInteractorStyleBaseView3D
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 450.2 233 2000
+  xyz 450.4 233.8 2000
 end
 note 144002 "All Controlers herite from this class Ex. manualControles"
-  xyzwh 30.7 449.4 2000 145 63
+  xyzwh 30.1 449.4 2000 145 63
 classcanvas 147330 class_ref 154114 // vtkInteractorStyleSphere
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 36 116 2012
+  xyz 36.6 116.4 2012
 end
 classcanvas 147586 class_ref 154242 // vtkInteractorStylePlane2D
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 32 73 2018
+  xyz 32.2 73.8 2018
 end
 classcanvas 148994 class_ref 154370 // vtkInteractorStyle3DView
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 33 260 2007
+  xyz 33.2 260.2 2007
 end
 classcanvas 149378 class_ref 154498 // vtkInteractorScrollZ
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 59 306 2011
+  xyz 59.6 306.4 2011
 end
 classcanvas 149762 class_ref 154626 // manualInteractorWindowLevel
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 27 351 2000
+  xyz 27.6 351.4 2000
 end
 classcanvas 150274 class_ref 154754 // manualContourBaseControler
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 23 395 2016
+  xyz 23.6 395.2 2016
+end
+classcanvas 151938 class_ref 161282 // wxVtkRenderWindowInteractorPlus
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 642.4 440.4 2000
 end
 relationcanvas 128514 relation_ref 128130 // <generalisation>
   from ref 128130 z 2001 to ref 128386
@@ -205,9 +209,9 @@ relationcanvas 128770 relation_ref 128258 // <unidirectional association>
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 129154 relation_ref 128386 // <unidirectional association>
-  from ref 128130 z 2001 to point 308 871
-  line 148610 z 2001 to point 17 870
-  line 148738 z 2001 to point 16 252
+  from ref 128130 z 2001 to point 308 871.6
+  line 148610 z 2001 to point 17.8 870.4
+  line 148738 z 2001 to point 16.6 252.8
   line 148866 z 2001 to ref 129026
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
@@ -228,8 +232,8 @@ relationcanvas 129794 relation_ref 128770 // <unidirectional association>
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 130818 relation_ref 128898 // <unidirectional association>
-  from ref 128386 z 2001 to point 635 338
-  line 145666 z 2001 to point 635 66
+  from ref 128386 z 2001 to point 635.4 338
+  line 145666 z 2001 to point 635.4 66.6
   line 143746 z 2001 to ref 129922
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
@@ -249,7 +253,7 @@ end
 relationcanvas 132610 relation_ref 129666 // _boxWidgetS1
   decenter_begin 769
   decenter_end 538
-  from ref 131202 z 2001 label "_boxWidgetS1" italic xyz 551 866 2001 to point 563 889
+  from ref 131202 z 2001 label "_boxWidgetS1" italic xyz 551 866 2001 to point 563 889.2
   line 132866 z 2001 to ref 132482
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
@@ -270,7 +274,7 @@ relationcanvas 133634 relation_ref 130050 // _ptsB
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 134018 relation_ref 130178 // _lineAActor
-  from ref 133250 z 2001 label "_lineAActor" italic xyz 386 1106 2001 to point 386 1122
+  from ref 133250 z 2001 label "_lineAActor" italic xyz 386 1106 2001 to point 386.6 1122.8
   line 135810 z 2001 to ref 133762
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
@@ -281,13 +285,13 @@ relationcanvas 134146 relation_ref 130306 // _lineBMapper
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 134402 relation_ref 130434 // _pdB
-  from ref 133250 z 2001 label "_pdB" italic xyz 241 1006 2001 to point 253 1025
+  from ref 133250 z 2001 label "_pdB" italic xyz 241 1006 2001 to point 253 1025.4
   line 135426 z 2001 to ref 134274
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 134530 relation_ref 130562 // _ptsA
-  from ref 133250 z 2001 label "_ptsA" italic xyz 471 959 2001 to point 482 972
+  from ref 133250 z 2001 label "_ptsA" italic xyz 471 959 2001 to point 482.8 972.8
   line 134658 z 2001 to ref 133506
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
@@ -298,7 +302,7 @@ relationcanvas 134786 relation_ref 130690 // _lineBActor
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 135042 relation_ref 130818 // _lineAMapper
-  from ref 133250 z 2001 label "_lineAMapper" italic xyz 268 1112 2001 to point 329 1089
+  from ref 133250 z 2001 label "_lineAMapper" italic xyz 268 1112 2001 to point 329.2 1089.2
   line 135170 z 2001 to ref 133890
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
@@ -309,8 +313,8 @@ relationcanvas 135298 relation_ref 130946 // _pdA
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 135682 relation_ref 131074 // <unidirectional association>
-  from ref 133250 z 2001 to point 6 951
-  line 148354 z 2001 to point 6 207
+  from ref 133250 z 2001 to point 6.6 951.6
+  line 148354 z 2001 to point 6.6 207.8
   line 148482 z 2001 to ref 135554
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
@@ -331,13 +335,13 @@ relationcanvas 137218 relation_ref 131458 // <unidirectional association>
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 137730 relation_ref 131586 // <generalisation>
-  from ref 135554 z 2007 to point 236 188
+  from ref 135554 z 2007 to point 236.6 188
   line 147842 z 2007 to ref 137602
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 137858 relation_ref 131714 // <generalisation>
-  from ref 129026 z 2007 to point 236 244
+  from ref 129026 z 2007 to point 236.6 244.2
   line 148226 z 2007 to ref 137602
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
@@ -348,7 +352,7 @@ relationcanvas 138498 relation_ref 136450 // <unidirectional association>
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 138882 relation_ref 136706 // <unidirectional association>
-  from ref 137986 z 2001 to point 787 692
+  from ref 137986 z 2001 to point 787.8 692.8
   line 139650 z 2001 to ref 138626
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
@@ -369,13 +373,13 @@ relationcanvas 140418 relation_ref 137090 // <unidirectional association>
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 140674 relation_ref 137218 // <unidirectional association>
-  from ref 137986 z 2001 to point 697 877
+  from ref 137986 z 2001 to point 697.8 877.8
   line 140802 z 2001 to ref 140546
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 141058 relation_ref 137346 // <unidirectional association>
-  from ref 137986 z 2001 to point 678 939
+  from ref 137986 z 2001 to point 678 939.2
   line 141186 z 2001 to ref 140930
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
@@ -397,14 +401,14 @@ relationcanvas 142338 relation_ref 140418 // <generalisation>
 end
 relationcanvas 142466 relation_ref 140546 // <unidirectional association>
   decenter_end 697
-  from ref 137986 z 2006 to point 618 729
+  from ref 137986 z 2006 to point 618 729.2
   line 142850 z 2006 to ref 142082
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 142594 relation_ref 140674 // <unidirectional association>
   decenter_end 387
-  from ref 131202 z 2006 to point 602 730
+  from ref 131202 z 2006 to point 602.8 730.4
   line 142722 z 2006 to ref 142082
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
@@ -415,13 +419,13 @@ relationcanvas 143106 relation_ref 147202 // <generalisation>
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 143362 relation_ref 147330 // <generalisation>
-  from ref 143234 z 2007 to point 445 190
+  from ref 143234 z 2007 to point 445.4 190.4
   line 145154 z 2007 to ref 142978
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 143618 relation_ref 147458 // <generalisation>
-  from ref 143490 z 2001 to point 445 191
+  from ref 143490 z 2001 to point 445.4 191.6
   line 145282 z 2001 to ref 142978
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
@@ -432,60 +436,70 @@ relationcanvas 146178 relation_ref 154242 // <unidirectional association>
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 147202 relation_ref 161026 // <unidirectional association>
-  from ref 142978 z 2007 to point 325 40
+  from ref 142978 z 2007 to point 325.4 40.4
   line 151170 z 2007 to ref 137602
   no_role_a no_role_b
-  multiplicity_a_pos 312 48 3000 no_multiplicity_b
+  multiplicity_a_pos 287 53 3000 no_multiplicity_b
 end
 relationcanvas 147458 relation_ref 161154 // <generalisation>
-  from ref 147330 z 2013 to point 236 151
+  from ref 147330 z 2013 to point 236.6 151.6
   line 147970 z 2013 to ref 137602
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 147714 relation_ref 161282 // <generalisation>
-  from ref 147586 z 2019 to point 236 103
+  from ref 147586 z 2019 to point 236.6 103
   line 148098 z 2019 to ref 137602
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 149122 relation_ref 161410 // <generalisation>
-  from ref 148994 z 2008 to point 236 297
+  from ref 148994 z 2008 to point 236.6 297.8
   line 149250 z 2008 to ref 137602
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 149506 relation_ref 161538 // <generalisation>
-  from ref 149378 z 2012 to point 236 323
-  line 149634 z 2012 to point 236 293
+  from ref 149378 z 2012 to point 236.6 323
+  line 149634 z 2012 to point 236.6 293
   line 150146 z 2012 to ref 137602
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 149890 relation_ref 161666 // <generalisation>
-  from ref 149762 z 2007 to point 236 366
+  from ref 149762 z 2007 to point 236.6 366.6
   line 150018 z 2007 to ref 137602
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 150402 relation_ref 161794 // <generalisation>
-  from ref 150274 z 2017 to point 236 403
+  from ref 150274 z 2017 to point 236.6 403
   line 150530 z 2017 to ref 137602
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 151426 relation_ref 168322 // <unidirectional association>
-  from ref 137602 z 2007 to point 287 91
+  from ref 137602 z 2007 to point 287.8 91.6
   line 151554 z 2007 to ref 142978
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 151682 relation_ref 174850 // <unidirectional association>
-  from ref 129026 z 2001 to point 308 302
+  from ref 129026 z 2001 to point 308 302.8
   line 151810 z 2001 to ref 128002
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
+relationcanvas 152066 relation_ref 181378 // <generalisation>
+  from ref 151938 z 2001 to ref 129666
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 152194 relation_ref 181506 // <unidirectional association>
+  from ref 151938 z 2001 to ref 128386
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
 line 137474 -_-_
   from ref 137346 z 2014 to ref 137218
 line 150786 -_-_

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session
index d24ed4136c1b2866e005c40a25d40c8eecf70534..2c3e215ec202f8c86ac30d464f8fd84b14b59ee3 100644 (file)
--- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session
+++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session
@@ -1,8 +1,8 @@
-window_sizes 1333 818 293 1030 634 104
+window_sizes 1379 841 293 1076 1 799
 motif_style
 diagrams
   active  classdiagram_ref 128002 // wxVtkViewer class Diagram 1
-    1030 634 100 4 173 0
+    1030 634 120 4 760 0
   classdiagram_ref 128130 // wxVtkViewer class Diagram 2
     870 699 100 4 255 0
 end

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj
index be7904b23505c87c1314f48ec1500c1f2ace4eca..e3c86ab89c814cf96ff1153a3087a2ed2aa4457e 100644 (file)
--- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj
+++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj
@@ -1,6 +1,6 @@
 format 73
 "wxVtkViewer"
-  revision 11
+  revision 12
   modified_by 2 "davila"
 
 
@@ -37,6 +37,6 @@ format 73
   mark_for_import
   
   ncouples 1
-  key "html dir" value "/home/davila/Creatis/All2/creatools_source/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/"
+  key "html dir" value "/Users/davila/Creatis/All3/creatools_source/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/"
   package_ref 128002 // wxVtkViwer
 end

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/fig128002.png b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/fig128002.png
index 3135d7b64ebf49872acc0e81ad1de6fbf7aee59a..229777f1da70457b55f004db5c334230434caab9 100644 (file)
Binary files a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/fig128002.png and b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/fig128002.png differ

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index-withframe.html b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index-withframe.html
index 5e90f12ce33c8fa07f44bc08f089754834b31b11..f9853ce1336bf87e9c715e61d003d205be4fde93 100644 (file)
--- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index-withframe.html
+++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index-withframe.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<title>/home/davila/Creatis/All2/creatools_source/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index-withframe</title>
+<title>/Users/davila/Creatis/All3/creatools_source/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index-withframe</title>
 <link rel="stylesheet" href="style.css" type="text/css" />
 </head>
 <FRAMESET cols="20%,80%">

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig.html b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig.html
index 4d76ccfc4feddbbe69e3ecb0aa9be1513eff9181..fa5ce9f2a58280ef18968c028c7f3531cec1e427 100644 (file)
--- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig.html
+++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<title>/home/davila/Creatis/All2/creatools_source/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig</title>
+<title>/Users/davila/Creatis/All3/creatools_source/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig</title>
 <link rel="stylesheet" href="style.css" type="text/css" />
 </head>
 <body bgcolor="#ffffff">

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.cxx
index dc80df295e2ef13ccbd00651d9ca4cb0846f5b30..d748d073f6f56d5928f2170ec0e526f0efb24002 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.cxx
@@ -34,62 +34,77 @@ void InteractorStyleMaracas::CopyAttributesTo( InteractorStyleMaracas * cloneObj
 
 
 //---------------------------------------------------------------------------
-bool InteractorStyleMaracas::OnChar()
+bool InteractorStyleMaracas::OnChar() //virtual
 {
        return true;
 }
 //---------------------------------------------------------------------------
-bool InteractorStyleMaracas::OnMouseMove()
+bool InteractorStyleMaracas::OnMouseMove() //virtual
 {
        return true;
 }
 //---------------------------------------------------------------------------
-bool InteractorStyleMaracas::OnLeftButtonDown()
+bool InteractorStyleMaracas::OnLeftButtonDown() //virtual
 {
        return true;
 }
 //---------------------------------------------------------------------------
-bool InteractorStyleMaracas::OnLeftButtonUp()
+bool InteractorStyleMaracas::OnLeftButtonUp() //virtual
 {
        return true;
 }
 //---------------------------------------------------------------------------
-bool  InteractorStyleMaracas::OnLeftDClick()
+bool  InteractorStyleMaracas::OnLeftDClick() //virtual
 {
        return true;
 }
 //---------------------------------------------------------------------------
-bool InteractorStyleMaracas::OnMiddleButtonDown() 
+bool InteractorStyleMaracas::OnMiddleButtonDown()  //virtual
 {
        return true;
 }
 //---------------------------------------------------------------------------
-bool InteractorStyleMaracas::OnMiddleButtonUp()
+bool InteractorStyleMaracas::OnMiddleButtonUp() //virtual
 {
        return true;
 }
 //---------------------------------------------------------------------------
-bool InteractorStyleMaracas::OnMiddleDClick()
+bool InteractorStyleMaracas::OnMiddleDClick() //virtual
 {
        return true;
 }
 //---------------------------------------------------------------------------
-bool InteractorStyleMaracas::OnRightButtonDown()
+bool InteractorStyleMaracas::OnRightButtonDown() //virtual
 {
        return true;
 }
 //---------------------------------------------------------------------------
-bool InteractorStyleMaracas::OnRightButtonUp()
+bool InteractorStyleMaracas::OnRightButtonUp() //virtual
 {
        return true;
 }
 //---------------------------------------------------------------------------
-bool InteractorStyleMaracas::OnRightDClick()
+bool InteractorStyleMaracas::OnRightDClick() //virtual
 {
        return true;
 }
+
+
+//EED ?????  27Juillet2011     
+//---------------------------------------------------------------------------
+bool InteractorStyleMaracas::OnMouseWheel() //virtual
+{
+       return true;
+}
+
+//---------------------------------------------------------------------------
+bool InteractorStyleMaracas::OnMouseWheelForward() //virtual
+{
+       return true;
+}
+
 //---------------------------------------------------------------------------
-bool InteractorStyleMaracas::OnMouseWheel()
+bool InteractorStyleMaracas::OnMouseWheelBackward()  //virtual
 {
        return true;
 }

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.h
index 9931956414cdeff5096f5846a14f378e56461512..863e017746fa55c8a6e06b1f4732f4453447b68d 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.h
@@ -32,8 +32,13 @@ public:
        virtual bool  OnLeftDClick();
        virtual bool  OnRightDClick();   
        virtual bool  OnMiddleDClick();  
+       
+//EED ?????  27Juillet2011     
        virtual bool  OnMouseWheel();    
-
+       
+       virtual bool  OnMouseWheelForward();
+       virtual bool  OnMouseWheelBackward();
+       
        void  SetVtkInteractorStyleBaseView(vtkInteractorStyleBaseView* _vtkInteractorStyleBaseView);   
        void  RemoveVtkInteractorStyleBaseView();
        

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
index 3a1918bb45bdce8289ebb1ba84e02d8a3ac6cd73..89aee7044a585291e338a9306db000adccbc0f12 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
@@ -17,6 +17,9 @@ vtkInteractorStyleBaseView::vtkInteractorStyleBaseView()
        _refresh_waiting                = false;
        _parent_refresh_waiting = false;
        _blockRefresh                   = false;
+       
+       //EED27Juillet2011
+       SetMouseWheelMotionFactor(0.5);
 }
 //---------------------------------------------------------------------------
 vtkInteractorStyleBaseView::~vtkInteractorStyleBaseView()
@@ -76,10 +79,28 @@ void vtkInteractorStyleBaseView::OnRightDClick()  // virtual
        CallLstInteractorStyleMaracas( 12 );
 }
 //---------------------------------------------------------------------------
+//EED27Juillet2011
 void vtkInteractorStyleBaseView::OnMouseWheel()  // virtual
 {
+       printf("EED vtkInteractorStyleBaseView::OnMouseWheel\n");
        CallLstInteractorStyleMaracas( 14 );
 }
+
+void  vtkInteractorStyleBaseView::OnMouseWheelForward()  // virtual
+{
+       printf("EED.. vtkInteractorStyleBaseView::OnMouseWheelForward\n");
+       CallLstInteractorStyleMaracas( 15 );
+}
+
+void vtkInteractorStyleBaseView::OnMouseWheelBackward() // virtual
+{
+       printf("EED.. vtkInteractorStyleBaseView::OnMouseWheelBackward\n");
+       CallLstInteractorStyleMaracas( 16 );
+}
+
+
+
+
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::AddInteractorStyleMaracas(InteractorStyleMaracas* interactorStyleMaracas)
 {
@@ -215,6 +236,8 @@ void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type)
                                        i=size;
                                }
                        }
+                       
+                       //EED ?????  27Juillet2011      
                        if (type==14)
                        {  // OnMouseWheel
                                if (intStyMar->OnMouseWheel()==false)
@@ -222,6 +245,22 @@ void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type)
                                        i=size;
                                }
                        }
+                       if (type==15)
+                       {  // OnMouseWheelForward
+                               if (intStyMar->OnMouseWheelForward()==false)
+                               {
+                                       i=size;
+                               }
+                       }
+                       if (type==16)
+                       {  // OnMouseWheelBackward
+                               if (intStyMar->OnMouseWheelBackward()==false)
+                               {
+                                       i=size;
+                               }
+                       }
+                       
+                       
                } // if active
        } // for
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.h
index 9e224cc42e8dd78cb5ddf95a1d20c3c846e5a86b..8687dc8e818bac2085de83bdcca6d56e37374406 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.h
@@ -29,7 +29,12 @@ public:
        virtual void  OnLeftDClick();
        virtual void  OnRightDClick();
        virtual void  OnMiddleDClick();
+       
+
        virtual void  OnMouseWheel();
+       
+       virtual void  OnMouseWheelForward();
+       virtual void  OnMouseWheelBackward();
 
        virtual void  TransformCoordinate(double &X, double &Y, double &Z);
        

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx
index 688ea9750d63c5ae6790e5e5b1886bbb06cc899a..5971990bd1adda41d4618b7da269478202d8d5bb 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx
@@ -100,3 +100,25 @@ void vtkInteractorStyleBaseView2D::OnMiddleButtonUp () // virtual
                this->vtkInteractorStyleImage::OnLeftButtonUp();
        }
 }
+
+//---------------------------------------------------------------------------
+void vtkInteractorStyleBaseView2D::OnMouseWheelForward () // virtual
+{
+       vtkInteractorStyleBaseView::OnMouseWheelForward();      
+       if ((GetInteractor()->GetControlKey()==0) || (GetInteractor()->GetShiftKey()==0) )
+       {
+               this->vtkInteractorStyleImage::OnMouseWheelForward();
+       }
+}
+
+//---------------------------------------------------------------------------
+void vtkInteractorStyleBaseView2D::OnMouseWheelBackward () // virtual
+{
+       vtkInteractorStyleBaseView::OnMouseWheelBackward();     
+       if ((GetInteractor()->GetControlKey()==0) || (GetInteractor()->GetShiftKey()==0) )
+       {
+               this->vtkInteractorStyleImage::OnMouseWheelBackward();
+       }
+}
+
+

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.h
index 5a7e760a00c210ee7daa1d36bf3f36d03276e9dc..965e40ff39b7819159b30df637bd02015c1837be 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.h
@@ -18,13 +18,16 @@ public:
        void  SetInteractorScrollZ(vtkInteractorScrollZ* interactorScroll);
        void  SetInteractorWindowLevel(manualInteractorWindowLevel* interactorWindowLevel);
 
-       virtual void  OnMouseMove();
-       virtual void  OnLeftButtonDown(); 
-       virtual void  OnLeftButtonUp();
-       virtual void  OnMiddleButtonDown(); 
-       virtual void  OnMiddleButtonUp();
-       virtual void  OnRightButtonDown();
-       virtual void  OnRightButtonUp();
+       virtual void OnMouseMove();
+       virtual void OnLeftButtonDown(); 
+       virtual void OnLeftButtonUp();
+       virtual void OnMiddleButtonDown(); 
+       virtual void OnMiddleButtonUp();
+       virtual void OnRightButtonDown();
+       virtual void OnRightButtonUp();
+       virtual void OnMouseWheelForward();
+       virtual void OnMouseWheelBackward();
+       
 
 protected:
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx
index 8a23bd6a75b336280cf1e468228b8ee15e0d8067..067ceb91c0bc842400221c19aa2694cb4f2793cd 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx
@@ -123,12 +123,22 @@ void vtkInteractorStyleBaseView3D::OnLeftButtonDown()
     return;
     }
 
+       
+       if ((GetInteractor()->GetControlKey()==0) && (GetInteractor()->GetShiftKey()==1) )
+       {
+               this->vtkInteractorStyleImage::OnLeftButtonDown();
+       }
+       
+       
   if (this->Interactor->GetControlKey()) {
       this->StartPan();
   } else {
       this->StartRotate();
   }
 
+       
+       
+
  /* 
   if (this->Interactor->GetShiftKey()) 
     {
@@ -193,3 +203,24 @@ void  vtkInteractorStyleBaseView3D::OnMiddleButtonUp ()
 
        //              this->vtkInteractorStyleTrackballCamera::OnMiddleButtonUp();
 }
+
+
+//---------------------------------------------------------------------------
+void vtkInteractorStyleBaseView3D::OnMouseWheelForward () // virtual
+{
+       vtkInteractorStyleBaseView::OnMouseWheelForward();      
+       if ((GetInteractor()->GetControlKey()==0) || (GetInteractor()->GetShiftKey()==0) )
+       {
+               this->vtkInteractorStyleImage::OnMouseWheelForward();
+       }
+}
+
+//---------------------------------------------------------------------------
+void vtkInteractorStyleBaseView3D::OnMouseWheelBackward () // virtual
+{
+       vtkInteractorStyleBaseView::OnMouseWheelBackward();     
+       if ((GetInteractor()->GetControlKey()==0) || (GetInteractor()->GetShiftKey()==0) )
+       {
+               this->vtkInteractorStyleImage::OnMouseWheelBackward();
+       }
+}

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.h
index 672e0c117cd1c0d34c5087cc3f627a1e3ab5f795..616dc6803f25fc3494e91ba10a156908a40486bc 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.h
@@ -20,6 +20,8 @@ public:
        virtual void  OnMiddleButtonUp () ;
        virtual void  OnRightButtonDown () ;
        virtual void  OnRightButtonUp () ;
+       virtual void OnMouseWheelForward();
+       virtual void OnMouseWheelBackward();
 
 private:
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorPlus.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorPlus.cxx
index ecf26846b0d61c3b7fee0754c10c97af1b1ecce5..3b67abc55064a0fff93fc7f7bc6bfc9ab79f11fc 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorPlus.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorPlus.cxx
@@ -71,7 +71,26 @@ void wxVTKRenderWindowInteractorPlus::OnMouseWheel( wxMouseEvent& event )
                 
        _wxvtkbaseview->GetInteractorStyleBaseView()->OnMouseWheel();
        */
-       ((vtkInteractorStyleBaseView*)_wxvtkbaseview->GetInteractorStyleBaseView())->OnMouseWheel();
+       
+       
+//EED ????  this is just a maracasvisu EED old mechanism to be erased ..
+       ((vtkInteractorStyleBaseView*)_wxvtkbaseview->GetInteractorStyleBaseView())->OnMouseWheel();
+       
+       
+       if(event.GetWheelRotation() > 0)
+    {
+               //Send event to VTK
+               //EED InvokeEvent(vtkCommand::MouseWheelForwardEvent, NULL);
+               ((vtkInteractorStyleBaseView*)_wxvtkbaseview->GetInteractorStyleBaseView())->OnMouseWheelForward();
+    }
+       else
+    {
+               //Send event to VTK
+               //EED InvokeEvent(vtkCommand::MouseWheelBackwardEvent, NULL);
+               ((vtkInteractorStyleBaseView*)_wxvtkbaseview->GetInteractorStyleBaseView())->OnMouseWheelBackward();
+    }
+       
+       
 }