From: Eduardo Davila Date: Sat, 2 Jun 2012 13:31:09 +0000 (+0000) Subject: v1.0.3 Feature: 1397 X-Git-Tag: v1.0.4~20 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=fb1552ad2e189e96d1def08450ff2fabca991e6a;p=creaMaracasVisu.git v1.0.3 Feature: 1397 - Update BOUML documentation - ViewerNV: Stereo visualisation --- diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 index ddad83e..9a5b23d 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 @@ -1,6 +1,6 @@ format 75 "wxVtkViwer" // wxVtkViwer - revision 14 + revision 15 modified_by 2 "davila" // class settings //class diagram settings @@ -1244,6 +1244,14 @@ ${inlines} idl_decl "" explicit_switch_type "" + classrelation 196098 // + relation 195970 ---> + a role_name "" private + cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; +" + classrelation_ref 196098 // + b parent class_ref 132098 // wxVtkMPR3DView + end end class 133890 "vtkPlaneWidget" diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram index 6de950f..5a4f060 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram @@ -2,82 +2,82 @@ format 75 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_context 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.6 625.2 2000 + xyz 263.6 625.6 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_context 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 275.3 687.5 2000 + xyz 275.9 687.7 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_context 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 549.7 294 2000 + xyz 549.5 294 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_context 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.5 807.5 2000 + xyz 154.5 807.7 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_context 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.2 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_context 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.7 208.8 2000 + xyz 27.5 208.4 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_context 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 480 293.4 2005 + xyz 480 294 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_context 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 689.6 206.1 2000 + xyz 689.6 206.9 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_context 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.8 28.8 2000 + xyz 387.8 28.4 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_context 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 362.3 842.1 2000 + xyz 362.5 842.3 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_context 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 348.5 768.5 2000 + xyz 348.5 768.1 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_context 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 417.5 766.7 2000 + xyz 417.5 766.5 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_context 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 368.5 903.5 2000 + xyz 368.7 903.1 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_context 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 649.9 1027.1 3005 + xyz 649.5 1027.3 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_context 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 266.7 951.1 2000 + xyz 266.3 951.9 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_context 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.4 1005.8 2000 + xyz 545.2 1005.2 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_context 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.6 1144.9 2000 + xyz 464 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_context 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 1131.2 2000 + xyz 155 1131 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_context 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 @@ -86,145 +86,145 @@ classcanvas 134274 class_ref 130434 // vtkPolyData 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_context 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.7 159.1 2000 + xyz 25.9 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_context 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.7 751.8 2005 + xyz 60.5 751.6 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_context 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 624 2000 + xyz 112.4 624 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_context 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.8 554.3 2007 + xyz 227.2 554.3 2007 end note 137346 "_vtkText_WindowLevel _vtkText_ColorLevel _vtkText_position _vtkText_Intensity" - xyzwh 39.7 529.8 2013 111 61 + xyzwh 39.3 529.4 2013 111 61 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_context 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 193.9 43.6 2006 + xyz 193.5 43.2 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_context 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 665.4 794.4 2000 + xyz 665.6 794.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_context 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.1 676.9 2000 + xyz 644.9 676.7 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_context 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 714.6 731.2 2000 + xyz 714.4 731.8 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_context 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 769.1 772.1 2000 + xyz 769.5 772.3 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_context 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.3 2000 + xyz 778.2 800.7 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_context 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 756.7 828 3010 + xyz 756.3 828.6 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_context 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.8 859.4 2000 + xyz 756 859.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_context 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 740.5 887.1 2000 + xyz 740.5 887.3 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_context 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.5 733.4 2010 + xyz 189.1 733 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_context 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 570.6 391.2 2005 + xyz 570.2 391 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_context 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.3 110.3 2000 + xyz 374.5 110.7 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_context 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.5 2006 + xyz 282.9 232.7 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_context 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 451 233.4 2000 + xyz 451 233 2000 end note 144002 "All Controlers herite from this class Ex. manualControles" - xyzwh 31.5 449.2 2000 132 38 + xyzwh 32.3 449 2000 132 38 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_context 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.2 2012 + xyz 36.4 116 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_context 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.8 73.4 2018 + xyz 32.4 73 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_context 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.8 260.6 2007 + xyz 33.4 260 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_context 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.6 306.2 2011 + xyz 59.6 307 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_context 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.4 351.2 2000 + xyz 27.2 352 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_context 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.6 2016 + xyz 23.4 395 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_context 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 673.2 290.8 2000 + xyz 673 290.2 2000 end classcanvas 152322 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_context 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 518.2 839 3016 + xyz 518.4 839 3016 end classcanvas 152706 class_ref 167810 // wxVtkClipping3DViewVolCntrlPanel 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_context 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 485 925.4 2007 + xyz 485 925.8 2007 end classcanvas 153858 class_ref 167938 // boxSurfaceObserver 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_context 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 462.4 685.8 2000 + xyz 463 685.2 2000 end classcanvas 154114 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_context 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 526 645.2 2011 + xyz 526.4 645.6 2011 end classcanvas 154370 class_ref 168066 // VolumeRendererData 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_context 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 362.4 686.8 2011 + xyz 362.8 686.6 2011 end classcanvas 154626 class_ref 168194 // VolumeRendererManager 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_context 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 371.4 644.8 2017 + xyz 371.2 644.8 2017 end classcanvas 155138 class_ref 168322 // VolumeRendererManagerData 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_context 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 388 602.2 2016 + xyz 388.2 602.4 2016 end classcanvas 155650 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_context 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 @@ -234,7 +234,7 @@ end classcanvas 155906 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_context 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 orange - xyz 564.4 881.8 2012 + xyz 564.8 881.6 2012 end note 157314 "vtkVolumeRayCastCompositeFunction vtkPlanes @@ -245,7 +245,7 @@ vtkColorTransferFunction vtkVolumeRayCastMIPFunction vtkBoxWidget vtkVolumeMapper " - color magenta xyzwh 675.2 352.2 2021 157 103 + color magenta xyzwh 675.4 352.4 2021 157 103 note 158082 "vtkMarchingCubes * vtkStripper * vtkPolyDataMapper * @@ -262,10 +262,10 @@ vtkVolume vtkActor * vtkVolumeRayCastCompositeFunction vtkVolumeRayCastMIPFunction " - color magenta xyzwh 660.6 486.4 2006 168 169 + color magenta xyzwh 661.2 486.4 2006 168 169 relationcanvas 128514 relation_ref 128130 // - from ref 128130 z 2001 to point 359 603 - line 158594 z 2001 to point 359 360.8 + from ref 128130 z 2001 to point 359.4 603 + line 158594 z 2001 to point 359.4 360.8 line 158722 z 2001 to point 552.6 360.8 line 158850 z 2001 to ref 128386 no_role_a no_role_b @@ -419,7 +419,8 @@ relationcanvas 138498 relation_ref 136450 // no_multiplicity_a no_multiplicity_b end relationcanvas 138882 relation_ref 136706 // - from ref 137986 z 2001 to ref 138626 + from ref 137986 z 2001 to point 741 778 + line 159362 z 2001 to ref 138626 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -527,7 +528,7 @@ relationcanvas 149122 relation_ref 161410 // no_multiplicity_a no_multiplicity_b end relationcanvas 149506 relation_ref 161538 // - from ref 149378 z 2012 to point 236.2 324 + from ref 149378 z 2012 to point 236.2 324.4 line 149634 z 2012 to point 236.2 293 line 150146 z 2012 to ref 137602 no_role_a no_role_b @@ -601,7 +602,7 @@ end relationcanvas 154242 relation_ref 188802 // decenter_begin 663 decenter_end 464 - from ref 132226 z 2012 to point 557 719.2 + from ref 132226 z 2012 to point 557.6 719.4 line 159106 z 2012 to ref 154114 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -637,6 +638,12 @@ relationcanvas 156034 relation_ref 189442 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b end +relationcanvas 159234 relation_ref 195970 // + from ref 138626 z 2001 to point 726 769 + line 159490 z 2001 to ref 137986 + 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/generation_settings b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/generation_settings index 1417434..0dd9d4a 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/generation_settings +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/generation_settings @@ -110,7 +110,7 @@ ${items} cpp_default_operation_definition "${comment}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{ ${body}} " - java_default_src_content "${comment} + cpp_indent_visibility " "java_default_src_content "${comment} ${package} ${imports} ${definition}" diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj index e3c86ab..62bf1b6 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj @@ -1,6 +1,6 @@ -format 73 +format 75 "wxVtkViewer" - revision 12 + revision 13 modified_by 2 "davila" @@ -8,13 +8,13 @@ format 73 // class settings default_attribute_visibility private default_relation_visibility private default_operation_visibility public //class diagram settings - draw_all_relations yes hide_attributes no hide_operations no hide_getset_operations no show_members_full_definition no show_members_visibility no show_members_stereotype no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab no class_drawing_mode natural drawing_language uml show_context_mode no auto_label_position yes show_relation_modifiers no show_relation_visibility no show_infonote no shadow yes show_stereotype_properties no + draw_all_relations yes hide_attributes no hide_operations no hide_getset_operations no show_members_full_definition no show_members_visibility no show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab no class_drawing_mode natural drawing_language uml show_context_mode no auto_label_position yes show_relation_modifiers no show_relation_visibility no show_infonote no shadow yes show_stereotype_properties no //use case diagram settings package_name_in_tab no show_context no auto_label_position yes draw_all_relations yes class_drawing_mode actor shadow yes show_stereotype_properties no //sequence diagram settings - show_full_operations_definition no write_horizontally yes class_drawing_mode natural drawing_language uml draw_all_relations yes shadow yes show_stereotype_properties no + show_full_operations_definition no write_horizontally yes class_drawing_mode natural drawing_language uml draw_all_relations yes shadow yes show_stereotype_properties no show_class_context_mode no show_msg_context_mode no //collaboration diagram settings - show_full_operations_definition no show_hierarchical_rank no write_horizontally yes drawing_language uml package_name_in_tab no show_context no draw_all_relations yes shadow yes show_stereotype_properties no + show_full_operations_definition no show_hierarchical_rank no write_horizontally yes drawing_language uml package_name_in_tab no show_context no show_msg_context no draw_all_relations yes shadow yes show_stereotype_properties no //object diagram settings write_horizontally yes package_name_in_tab no show_context no auto_label_position yes draw_all_relations yes shadow yes show_stereotype_properties no //component diagram settings @@ -34,9 +34,11 @@ format 73 font_size 7 diagram_format A4 + image_root_dir "" + mark_for_import ncouples 1 - key "html dir" value "/Users/davila/Creatis/All3/creatools_source/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/" + key "html dir" value "/Users/davila/Creatis/All5/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/classdiagrams.html b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/classdiagrams.html index 7d00566..9297ac9 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/classdiagrams.html +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/classdiagrams.html @@ -1,5 +1,5 @@ - + @@ -16,7 +16,7 @@ - +
wxVtkViewer class Diagram 1
wxVtkViewer class Diagram 1
diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/classes_list.html b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/classes_list.html index f124784..ab34184 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/classes_list.html +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/classes_list.html @@ -1,5 +1,5 @@ - + @@ -17,7 +17,7 @@ - +
diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/fig128002.png b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/fig128002.png index 229777f..23ebf0e 100644 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 f9853ce..e99b6d5 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index-withframe.html +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index-withframe.html @@ -1,19 +1,24 @@ - - + + -/Users/davila/Creatis/All3/creatools_source/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index-withframe +/Users/davila/Creatis/All5/creatools_source/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index-withframe - - - - - - - - -<H2>Frame Alert</H2><P>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.<BR>Link to <A HREF="index.html">Non-frame version.</A> - + + + <body> + <h2>Frame Alert</h2> + <p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.</p> + <p>Link to <a href="index.html">Non-frame version.</a></p> + </body> + + + + + + + + \ No newline at end of file diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index.html b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index.html index a5ac4dc..929cce3 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index.html +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index.html @@ -1,5 +1,5 @@ - + @@ -16,7 +16,7 @@ Documentation - +

wxVtkViewer class Diagram 1



diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index_87.html b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index_87.html index 62a75ee..07666de 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index_87.html +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index_87.html @@ -1,5 +1,5 @@ - + @@ -16,8 +16,8 @@ - - + +
NameKindDescription
wxVtkViewer class Diagram 1class diagram
NameKindDescription
wxVtkViewer class Diagram 1class diagram
diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig.html b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig.html index fa5ce9f..b9ea4b9 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig.html +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig.html @@ -1,14 +1,14 @@ - + -/Users/davila/Creatis/All3/creatools_source/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig +/Users/davila/Creatis/All5/creatools_source/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig -


+

-Top- -Class Diagrams-

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx index ecfae84..58ba013 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx @@ -47,6 +47,43 @@ void wxVtk3DBaseView::Refresh() vtkRenderWindowInteractor *vri = GetWxVTKRenderWindowInteractor(); vri->vtkRenderWindowInteractor::Render(); } + + +//------------------------------------------------------------------- +void wxVtk3DBaseView::SetStereo(int type) +{ + //EED 02/06/2012 + printf("EED wxVtk3DBaseView::SetStereo start\n"); + + if (_renWin!=NULL) + { + printf("EED wxVtk3DBaseView::SetStereo 2\n"); + if (type==0) + { + _renWin->SetStereoRender(0); // OFF + } else { + _renWin->SetStereoRender(1); // ON + _renWin->SetStereoCapableWindow(1); + _renWin->SetAnaglyphColorMask(4,3); + _renWin->SetAnaglyphColorSaturation(0.65); + + // VTK_STEREO_CRYSTAL_EYES 1 + // VTK_STEREO_RED_BLUE 2 + // VTK_STEREO_INTERLACED 3 + // VTK_STEREO_LEFT 4 + // VTK_STEREO_RIGHT 5 + // VTK_STEREO_DRESDEN 6 + // VTK_STEREO_ANAGLYPH 7 + // VTK_STEREO_CHECKERBOARD 8 + _renWin->SetStereoType(type); + + } // if type + } // _renWin + printf("EED wxVtk3DBaseView::SetStereo end\n"); + +} + + //------------------------------------------------------------------- void wxVtk3DBaseView::Configure() { @@ -64,21 +101,8 @@ void wxVtk3DBaseView::Configure() _aRenderer->SetBackground( 0.33 , 0.33 , 0.33 ); _aRenderer->SetBackground2( 0.66 , 0.66 , 0.66 ); + SetStereo(0); -// _renWin->SetStereoCapableWindow(1); -// // //renderwindow->SetStereoTypeToCrystalEyes(); -// _renWin->SetStereoTypeToRedBlue(); -// _renWin->SetStereoRender(1); - -//EED 19/10/2011 OK EED stereo -// _renWin->SetStereoCapableWindow(1); -// _renWin->SetAnaglyphColorMask(4,3); -// _renWin->SetAnaglyphColorSaturation(0.65); -// _renWin->SetStereoTypeToAnaglyph(); // OK 1. -// _renWin->SetStereoRender(1); - printf("EED wxVtk3DBaseView::Configure test Stereo ...\n"); - - GetWxVTKRenderWindowInteractor()->SetRenderWindow(_renWin); vtkInteractorStyleBaseView3D *interactorStyleBaseView3D = vtkInteractorStyleBaseView3D::New(); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.h index 55018eb..b9ef965 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.h @@ -22,6 +22,7 @@ public: void Refresh(); void Configure(); virtual void GetSpacing(double spc[3]); + void SetStereo(int type); private: bool _configure; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx index d3e3e15..d1ed9dc 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx @@ -1,6 +1,7 @@ #include "wxVtkMPR3DViewCntrlPanel.h" #include "HistogramDialog.h" +#include wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DView *wxvtkmpr3Dview, bool align ) : wxPanel(parent, -1) @@ -59,6 +60,22 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV _positionY->SetSize(400,20); _positionZ->SetSize(400,20); + // Stereo + _cbStereo = new wxComboBox(panel, -1, "", wxDefaultPosition, wxDefaultSize, 0, NULL,wxCB_READONLY ); + _cbStereo->Append(" * NO STEREO"); + _cbStereo->Append(" STEREO CRYSTAL EYES"); + _cbStereo->Append(" STEREO RED BLUE"); + _cbStereo->Append(" STEREO INTERLACED"); + _cbStereo->Append(" STEREO LEFT"); + _cbStereo->Append(" STEREO RIGHT"); + _cbStereo->Append(" STEREO DRESDEN"); + _cbStereo->Append(" * STEREO ANAGLYPH"); + _cbStereo->Append(" STEREO CHECKERBOARD"); + _cbStereo->Select(0); + + + + Connect(ckBoxX->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisX ); Connect(_positionX->GetId(), wxEVT_COMMAND_SLIDER_UPDATED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionX ); Connect(ckBoxY->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisY ); @@ -74,6 +91,9 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV Connect(_ckFreePlaneY->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneY ); Connect(_ckFreePlaneZ->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneZ ); Connect(_ckFreePlaneInteraction->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneInteraction ); + + Connect(_cbStereo->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnSetStereo ); + wxFlexGridSizer *sizer; @@ -84,9 +104,10 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV wxFlexGridSizer *sizerH4; wxFlexGridSizer *sizerH5; wxFlexGridSizer *sizerH6; + wxFlexGridSizer *sizerH7; if(align) { - sizer = new wxFlexGridSizer(3); + sizer = new wxFlexGridSizer(4); sizerH4 = new wxFlexGridSizer(2); sizerH4->Add( _positionX ,1,wxGROW , 0 ); @@ -140,7 +161,11 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV sizerH6->Add( _ckFreePlaneInteraction , 1, wxALL|wxEXPAND, 0); } + + sizerH7 = new wxFlexGridSizer(1); + sizerH7->Add( _cbStereo, 1, wxALL|wxEXPAND, 0); + //EED 28 sep 2006 // wxFlexGridSizer *sizerH6 = new wxFlexGridSizer(10); // wxFlexGridSizer *sizerH7 = new wxFlexGridSizer(10); @@ -173,6 +198,7 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV sizer->Add( sizerH4, 1, wxALL|wxGROW, 2); sizer->Add( sizerH5, 1, wxALL|wxEXPAND,2); sizer->Add( sizerH6, 1, wxALL|wxEXPAND,2); + sizer->Add( sizerH7, 1, wxALL|wxEXPAND,2); panel->SetSize(400,50); panel->SetAutoLayout(true); @@ -182,7 +208,14 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV panel->SetEventHandler((wxEvtHandler*)this); //this->UpdateControlPanel(); + } + + + + +//------------------------------------------------------------------- + void wxVtkMPR3DViewCntrlPanel::UpdateControlPanel() { vtkMPRBaseData* basedata = _wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData(); @@ -222,10 +255,12 @@ printf("EED wxVtkMPR3DViewCntrlPanel::UpdateControlPanel -- 12April2012 This m } } + //------------------------------------------------------------------- wxVtkMPR3DViewCntrlPanel::~wxVtkMPR3DViewCntrlPanel() { } + //------------------------------------------------------------------- void wxVtkMPR3DViewCntrlPanel::Refresh() { @@ -234,6 +269,7 @@ void wxVtkMPR3DViewCntrlPanel::Refresh() _positionY->SetValue( (int)(_wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData()->GetY( )) ); _positionZ->SetValue( (int)(_wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData()->GetZ( )) ); } + /* //------------------------------------------------------------------- int wxVtkMPR3DViewCntrlPanel::GetIdTissue() @@ -402,11 +438,17 @@ void wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneInteraction(wxCommandEvent& eve _wxvtkmpr3Dview->FreePlaneInteraction( event.IsChecked() ); } +//------------------------------------------------------------------- +void wxVtkMPR3DViewCntrlPanel::OnSetStereo(wxCommandEvent& event) +{ + this->_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->SetStereo( _cbStereo->GetSelection() ); +} + + //------------------------------------------------------------------- void wxVtkMPR3DViewCntrlPanel::OnVisibleAxisX(wxCommandEvent& event) -{ - +{ _wxvtkmpr3Dview->VisibleImageActor(0, event.IsChecked() ); _wxvtkmpr3Dview->Refresh(); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h index 477468b..a9880a9 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h @@ -26,7 +26,8 @@ public: void OnVisibleFreePlaneY(wxCommandEvent& event); void OnVisibleFreePlaneZ(wxCommandEvent& event); void OnVisibleFreePlaneInteraction(wxCommandEvent& event); - + void OnSetStereo(wxCommandEvent& event); + virtual void Refresh(); @@ -72,6 +73,8 @@ private: wxCheckBox *_ckFreePlaneY; wxCheckBox *_ckFreePlaneZ; wxCheckBox *_ckFreePlaneInteraction; + + wxComboBox *_cbStereo; protected: