From: Eduardo Davila Date: Sat, 16 Oct 2010 18:34:33 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: ManualPaint~24 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f38984f56e3dbccb5d3a8392aa3e5cbb698bf2d8;p=creaMaracasVisu.git *** empty log message *** --- diff --git a/CMakeLists.txt b/CMakeLists.txt index e58ea0b..7a8b9d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,24 @@ MARK_AS_ADVANCED( LIBRARY_OUTPUT_PATH ) +IF (WIN32) + SET(CREAMARACASVISU_LIB_PATH bin) +ELSE (WIN32) + if( NOT APPLE ) + # check 64 bit + if( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 ) + set( HAVE_64_BIT 0 ) + SET(CREAMARACASVISU_LIB_PATH lib) + else( ${CMAKE_SIZEOF_VOID_P}EQUAL 4 ) + set( HAVE_64_BIT 1 ) + SET(CREAMARACASVISU_LIB_PATH lib64) + endif( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 ) + endif( NOT APPLE ) +ENDIF(WIN32) + + + + SUBDIRS(install) #SUBDIRS(appli) SUBDIRS(lib) diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 index f2afeca..ea4947e 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 @@ -1,6 +1,6 @@ format 73 "wxVtkViwer" // wxVtkViwer - revision 8 + revision 10 modified_by 2 "davila" // class settings //class diagram settings @@ -629,6 +629,14 @@ ${inlines} idl_decl "" explicit_switch_type "" + classrelation 168450 // + relation 168322 ---> + a role_name "" private + cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; +" + classrelation_ref 168450 // + b parent class_ref 140546 // vtkInteractorStyleBaseView + end end classdiagram 128130 "wxVtkViewer class Diagram 2" @@ -1225,6 +1233,15 @@ ${inlines} classrelation_ref 147714 // b parent class_ref 131074 // InteractorStyleMaracas end + + classrelation 161154 // + relation 161026 ---> + a role_name "" multiplicity "*" private + cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; +" + classrelation_ref 161154 // + b parent class_ref 131074 // InteractorStyleMaracas + end end class 140674 "vtkInteractorStyleBaseView2D" @@ -1269,7 +1286,112 @@ ${inlines} end end - class 147330 "manualInteractorWindowLevel" + class 154114 "vtkInteractorStyleSphere" + 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 161282 // + relation 161154 ---|> + a public + cpp default "${type}" + classrelation_ref 161282 // + b parent class_ref 131074 // InteractorStyleMaracas + end + end + + class 154242 "vtkInteractorStylePlane2D" + 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 161410 // + relation 161282 ---|> + a public + cpp default "${type}" + classrelation_ref 161410 // + b parent class_ref 131074 // InteractorStyleMaracas + end + end + + class 154370 "vtkInteractorStyle3DView" + 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 161538 // + relation 161410 ---|> + a public + cpp default "${type}" + classrelation_ref 161538 // + b parent class_ref 131074 // InteractorStyleMaracas + end + end + + class 154498 "vtkInteractorScrollZ" + 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 161666 // + relation 161538 ---|> + a public + cpp default "${type}" + classrelation_ref 161666 // + b parent class_ref 131074 // InteractorStyleMaracas + end + end + + class 154626 "manualInteractorWindowLevel" + 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 161794 // + relation 161666 ---|> + a public + cpp default "${type}" + classrelation_ref 161794 // + b parent class_ref 131074 // InteractorStyleMaracas + end + end + + class 154754 "manualContourBaseControler" visibility package cpp_decl "${comment}${template}class ${name}${inherit} { ${members}}; @@ -1281,11 +1403,11 @@ ${inlines} idl_decl "" explicit_switch_type "" - classrelation 154242 // - relation 154114 ---|> + classrelation 161922 // + relation 161794 ---|> a public cpp default "${type}" - classrelation_ref 154242 // + classrelation_ref 161922 // b parent class_ref 131074 // InteractorStyleMaracas end end diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram index bdf0024..392ee32 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram @@ -2,181 +2,197 @@ 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 179 608 2000 + xyz 191.2 729.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_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 323 609 2000 + xyz 329.5 741.9 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 482 400 2000 + xyz 516.3 405.2 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 188 545 2000 + xyz 211.1 666.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_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 234 340 2000 + xyz 246.4 494.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 196 804 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_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 330 396 2005 + xyz 430.8 393 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 616 353 2000 + xyz 650.2 370.1 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 333 24 2000 + xyz 387.4 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_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 440 793 2000 + xyz 488.1 798.1 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 482 735 2000 + xyz 500.1 740.7 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 402 685 2000 + xyz 457.5 690.7 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 431 877 2000 + xyz 461.3 882.3 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 588 1065 3005 + xyz 658.9 1070.7 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 325 957 2000 + xyz 332.5 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 525 1000 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_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 445 1139 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_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 112 1126 2000 + xyz 155.4 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_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 102 979 2000 + xyz 128.9 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 31 853 2000 + xyz 25.3 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 183 488 2005 + xyz 194.1 609.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_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 54 428 2000 + xyz 68.8 609.6 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 37 637 2007 + xyz 40.6 758.3 2007 end note 137346 "_vtkText_WindowLevel _vtkText_ColorLevel _vtkText_position _vtkText_Intensity" - xyzwh 5 694 2013 177 78 + xyzwh 105.9 809.6 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 185 672 2006 + xyz 176.1 25.8 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 602 792 2000 + xyz 642.6 797.8 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 621 647 2000 + xyz 644.7 658.3 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 644 574 2000 + xyz 684.6 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 742 753 2000 + xyz 768.9 758.1 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 759 795 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_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 721 842 3010 + xyz 755.7 847.8 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 720 882 2000 + xyz 753.8 887.8 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 703 931 2000 + xyz 746.7 936.5 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 171 416 2010 + xyz 234.1 549 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 502 518 2005 + xyz 542.2 523.6 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 321 105 2000 + xyz 374.9 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_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 210 235 2006 + xyz 282.5 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_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 419 236 2000 + xyz 450.2 233 2000 end note 144002 "All Controlers herite from this class Ex. manualControles" - xyzwh 7 147 2000 145 63 -classcanvas 144642 class_ref 131074 // InteractorStyleMaracas + xyzwh 52.7 445.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 88 73 2000 + xyz 36 116 2012 end -classcanvas 145410 class_ref 147330 // manualInteractorWindowLevel +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 164 154 2000 + xyz 32 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_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 +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 +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 +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 end relationcanvas 128514 relation_ref 128130 // from ref 128130 z 2001 to ref 128386 @@ -189,12 +205,16 @@ relationcanvas 128770 relation_ref 128258 // no_multiplicity_a no_multiplicity_b end relationcanvas 129154 relation_ref 128386 // - from ref 128130 z 2001 to ref 129026 + 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 + line 148866 z 2001 to ref 129026 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 129282 relation_ref 128514 // - from ref 128130 z 2001 to ref 128898 + from ref 128130 z 2001 to point 341 518 + line 151298 z 2001 to ref 128898 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -209,8 +229,8 @@ relationcanvas 129794 relation_ref 128770 // no_multiplicity_a no_multiplicity_b end relationcanvas 130818 relation_ref 128898 // - from ref 128386 z 2001 to point 633 256 - line 145666 z 2001 to point 633 40 + from ref 128386 z 2001 to point 635 338 + line 145666 z 2001 to point 635 66 line 143746 z 2001 to ref 129922 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -230,13 +250,13 @@ end relationcanvas 132610 relation_ref 129666 // _boxWidgetS1 decenter_begin 769 decenter_end 538 - from ref 131202 z 2001 label "_boxWidgetS1" italic xyz 520 860 2001 to point 563 889 + from ref 131202 z 2001 label "_boxWidgetS1" italic xyz 551 866 2001 to point 563 889 line 132866 z 2001 to ref 132482 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 132738 relation_ref 129794 // _boxWidgetVolume - from ref 131202 z 2001 label "_boxWidgetVolume" italic xyz 412 842 2001 to ref 132482 + from ref 131202 z 2001 label "_boxWidgetVolume" italic xyz 453 848 2001 to ref 132482 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -246,51 +266,53 @@ relationcanvas 133378 relation_ref 129922 // no_multiplicity_a no_multiplicity_b end relationcanvas 133634 relation_ref 130050 // _ptsB - from ref 133250 z 2001 label "_ptsB" italic xyz 462 1003 2001 to ref 133506 + from ref 133250 z 2001 label "_ptsB" italic xyz 458 1005 2001 to ref 133506 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 134018 relation_ref 130178 // _lineAActor - from ref 133250 z 2001 label "_lineAActor" italic xyz 375 1104 2001 to point 386 1122 + from ref 133250 z 2001 label "_lineAActor" italic xyz 386 1106 2001 to point 386 1122 line 135810 z 2001 to ref 133762 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 134146 relation_ref 130306 // _lineBMapper - from ref 133250 z 2001 label "_lineBMapper" italic xyz 206 1067 2001 to ref 133890 + from ref 133250 z 2001 label "_lineBMapper" italic xyz 218 1069 2001 to ref 133890 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 134402 relation_ref 130434 // _pdB - from ref 133250 z 2001 label "_pdB" italic xyz 244 1002 2001 to point 253 1025 + from ref 133250 z 2001 label "_pdB" italic xyz 241 1006 2001 to point 253 1025 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 475 954 2001 to point 482 972 + from ref 133250 z 2001 label "_ptsA" italic xyz 471 959 2001 to point 482 972 line 134658 z 2001 to ref 133506 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 134786 relation_ref 130690 // _lineBActor - from ref 133250 z 2001 label "_lineBActor" italic xyz 422 1058 2001 to ref 133762 + from ref 133250 z 2001 label "_lineBActor" italic xyz 430 1060 2001 to ref 133762 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 135042 relation_ref 130818 // _lineAMapper - from ref 133250 z 2001 label "_lineAMapper" italic xyz 253 1110 2001 to point 329 1089 + from ref 133250 z 2001 label "_lineAMapper" italic xyz 268 1112 2001 to point 329 1089 line 135170 z 2001 to ref 133890 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 135298 relation_ref 130946 // _pdA - from ref 133250 z 2001 label "_pdA" italic xyz 240 972 2001 to ref 134274 + from ref 133250 z 2001 label "_pdA" italic xyz 235 974 2001 to ref 134274 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 135682 relation_ref 131074 // - from ref 133250 z 2001 to ref 135554 + from ref 133250 z 2001 to point 6 951 + line 148354 z 2001 to point 6 207 + line 148482 z 2001 to ref 135554 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -300,7 +322,7 @@ relationcanvas 136322 relation_ref 131202 // no_multiplicity_a no_multiplicity_b end relationcanvas 136578 relation_ref 131330 // - from ref 128002 z 2001 to point 101 602 + from ref 128002 z 2001 to point 128 676 line 136706 z 2001 to ref 136450 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -311,12 +333,14 @@ relationcanvas 137218 relation_ref 131458 // no_multiplicity_a no_multiplicity_b end relationcanvas 137730 relation_ref 131586 // - from ref 135554 z 2007 to ref 137602 + from ref 135554 z 2007 to point 236 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 // - from ref 129026 z 2007 to ref 137602 + from ref 129026 z 2007 to point 236 244 + line 148226 z 2007 to ref 137602 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -364,7 +388,7 @@ relationcanvas 141698 relation_ref 138754 // no_multiplicity_a no_multiplicity_b end relationcanvas 141826 relation_ref 138882 // - from ref 128898 z 2001 to point 101 356 + from ref 128898 z 2001 to point 158 543 line 141954 z 2001 to ref 136450 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -383,7 +407,7 @@ relationcanvas 142466 relation_ref 140546 // end relationcanvas 142594 relation_ref 140674 // decenter_end 387 - from ref 131202 z 2006 to point 592 733 + from ref 131202 z 2006 to point 602 730 line 142722 z 2006 to ref 142082 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -394,34 +418,73 @@ relationcanvas 143106 relation_ref 147202 // no_multiplicity_a no_multiplicity_b end relationcanvas 143362 relation_ref 147330 // - from ref 143234 z 2007 to point 411 170 + from ref 143234 z 2007 to point 445 190 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 // - from ref 143490 z 2001 to point 411 171 + from ref 143490 z 2001 to point 445 191 line 145282 z 2001 to ref 142978 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 144770 relation_ref 147586 // - from ref 142978 z 2001 to ref 144642 +relationcanvas 146178 relation_ref 154242 // + from ref 128130 z 2001 to ref 128002 no_role_a no_role_b - multiplicity_a_pos 252 110 3000 no_multiplicity_b + no_multiplicity_a no_multiplicity_b end -relationcanvas 145538 relation_ref 154114 // - from ref 145410 z 2001 to ref 144642 +relationcanvas 147202 relation_ref 161026 // + from ref 142978 z 2007 to point 325 40 + line 151170 z 2007 to ref 137602 + no_role_a no_role_b + multiplicity_a_pos 312 48 3000 no_multiplicity_b +end +relationcanvas 147458 relation_ref 161154 // + from ref 147330 z 2013 to point 236 151 + line 147970 z 2013 to ref 137602 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 146178 relation_ref 154242 // - from ref 128130 z 2001 to ref 128002 +relationcanvas 147714 relation_ref 161282 // + from ref 147586 z 2019 to point 236 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 // + from ref 148994 z 2008 to point 236 297 + 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 // + from ref 149378 z 2012 to point 236 323 + line 149634 z 2012 to point 236 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 // + from ref 149762 z 2007 to point 236 366 + 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 // + from ref 150274 z 2017 to point 236 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 // + from ref 137602 z 2007 to point 287 91 + line 151554 z 2007 to ref 142978 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end line 137474 -_-_ from ref 137346 z 2014 to ref 137218 -line 144898 -_-_ - from ref 144002 z 2001 to ref 144642 +line 150786 -_-_ + from ref 144002 z 2017 to ref 150274 end diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128130.diagram b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128130.diagram index a546aa5..17ae2f1 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128130.diagram +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128130.diagram @@ -3,103 +3,103 @@ format 73 classcanvas 128002 class_ref 131202 // wxMaracas_N_ViewersWidget 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 mediumyellow - xyz 601 736 2000 + xyz 665.5 741 2000 end classcanvas 128130 class_ref 131330 // wxMaracas_ViewerWidget 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 mediumyellow - xyz 615 472 2000 + xyz 670.3 477.8 2000 end note 128386 "wxwindow1 wxwindow2 wxwindow3 wxwindow4 " - xyzwh 574 633 2005 118 92 + xyzwh 573.6 633.4 2005 118 92 classcanvas 128642 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 379 470 2000 + xyz 417.5 475.2 2000 end classcanvas 128898 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 409 216 2000 + xyz 449.3 221 2000 end classcanvas 129154 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 407 297 2006 + xyz 447.1 302.3 2006 end note 129538 "mvtkmpr2Dview_x mvtkmpr2Dview_y mvtkmpr2Dview_z " - xyzwh 571 248 2000 133 60 + xyzwh 571.1 248.1 2000 133 60 classcanvas 129794 class_ref 131586 // wxWidgetMesure2D_Plane_inMPR 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 338 375 2000 + xyz 412.6 380.7 2000 end classcanvas 130178 class_ref 131714 // wxPlane2DView 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 390 423 2000 + xyz 424.7 428.1 2000 end classcanvas 130434 class_ref 131842 // wxSphereView 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 390 515 2000 + xyz 422.2 520.7 2000 end classcanvas 130946 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 380 674 2000 + xyz 420 679.4 2000 end classcanvas 131202 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 381 631 2000 + xyz 421.9 636.5 2000 end classcanvas 131458 class_ref 132354 // vtkMPRBaseDataViewer 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 363 719 2000 + xyz 415 724.9 2000 end classcanvas 131714 class_ref 132482 // wxMPRWidget 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 mediumyellow - xyz 71 516 2000 + xyz 102.9 521 2000 end classcanvas 132226 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 44 420 2000 + xyz 75.8 425.2 2000 end note 133506 "_vtkmpr2Dview[3] _vtkmpr2Dview_B[3]" - xyzwh 94 159 2012 153 52 + xyzwh 94 159.2 2012 153 52 note 133762 "_vtkplane2Dview _vtkplane2Dview_B " - xyzwh 20 219 2000 153 48 + xyzwh 20.8 218.6 2000 153 48 note 134402 "_wxvtk3Dbaseview_MPRClipping3D _wxvtk3Dbaseview_Clipping3D_BB " - xyzwh 71 786 3005 238 51 + xyzwh 70.7 786.3 3005 238 51 note 134658 "_wxvtkmpr3Dview_B _wxvtkmpr3Dview_BB " - xyzwh 95 713 2000 176 49 + xyzwh 94.6 713.1 2000 176 49 note 134914 "_wxvtkclipping3Dview _wxvtkclipping3Dview_BB " - xyzwh 24 636 2013 201 53 + xyzwh 24.2 636.6 2013 201 53 classcanvas 135682 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 374 557 2006 + xyz 422.3 562.3 2006 end note 136706 "_widgetMesure _widgetMesure_BB" - xyzwh 162 102 2012 137 45 + xyzwh 162 102.2 2012 137 45 fragment 139266 "" - color green xyzwh 316 196 1995 251 573 + color green xyzwh 316.3 196.6 1995 251 573 end note 140930 "see wxVtkViewer class Diagram 1" - xyzwh 429 127 2000 232 36 + xyzwh 429.2 127.2 2000 232 36 classcanvas 142210 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 716 382 2000 + xyz 754.6 387.8 2000 end relationcanvas 128258 relation_ref 131842 // from ref 128002 z 2001 to ref 128130 @@ -113,7 +113,7 @@ relationcanvas 128770 relation_ref 131970 // end relationcanvas 129026 relation_ref 132098 // decenter_begin 537 - from ref 128130 z 2001 to point 706 233 + from ref 128130 z 2001 to point 706.4 233.5 line 132994 z 2001 to ref 128898 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -126,13 +126,13 @@ relationcanvas 129282 relation_ref 129922 // end relationcanvas 129410 relation_ref 132226 // decenter_end 488 - from ref 128130 z 2007 to point 586 314 + from ref 128130 z 2007 to point 586.4 314.8 line 140802 z 2007 to ref 129154 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 129922 relation_ref 132354 // mwidgetMesure - from ref 128130 z 2001 label "mwidgetMesure" italic xyz 532 427 2001 to ref 129794 + from ref 128130 z 2001 label "mwidgetMesure" italic xyz 566 433 2001 to ref 129794 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -157,13 +157,13 @@ relationcanvas 132482 relation_ref 133506 // no_multiplicity_a no_multiplicity_b end relationcanvas 132610 relation_ref 133634 // - from ref 131714 z 2007 to point 300 313 + from ref 131714 z 2007 to point 300.6 313.5 line 137986 z 2007 to ref 129154 no_role_a no_role_b - multiplicity_a_pos 390 322 3000 no_multiplicity_b + multiplicity_a_pos 432 324 3000 no_multiplicity_b end relationcanvas 133250 relation_ref 133762 // - from ref 131714 z 2001 to point 280 439 + from ref 131714 z 2001 to point 280.6 439.3 line 138242 z 2001 to ref 130178 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -195,7 +195,7 @@ relationcanvas 136194 relation_ref 134402 // no_multiplicity_a no_multiplicity_b end relationcanvas 136834 relation_ref 134658 // - from ref 131714 z 2001 to point 279 391 + from ref 131714 z 2001 to point 279.3 391.9 line 139010 z 2001 to ref 129794 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -217,7 +217,7 @@ relationcanvas 142082 relation_ref 136066 // end relationcanvas 142338 relation_ref 139010 // decenter_end 710 - from ref 128002 z 2001 to point 800 717 + from ref 128002 z 2001 to point 800.6 717.7 line 142594 z 2001 to ref 142210 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -236,16 +236,16 @@ line 133634 -_-_ decenter_end 264 line 133890 -_-_ from ref 133762 z 2002 to ref 133250 line 134530 -_-_ decenter_end 581 - from ref 134402 z 3006 to point 282 772 + from ref 134402 z 3006 to point 282.2 772.2 line 141314 z 3006 to ref 134018 line 134786 -_-_ decenter_end 760 - from ref 134658 z 2003 to point 250 688 + from ref 134658 z 2003 to point 250.6 688 line 141186 z 2003 to ref 134146 line 136322 -_-_ from ref 134914 z 2008 to ref 136194 line 136962 -_-_ - from ref 136706 z 2002 to point 271 165 - line 139778 z 2002 to point 277 392 + from ref 136706 z 2002 to point 271.9 165.1 + line 139778 z 2002 to point 277.7 392.2 line 141698 z 2002 to ref 136834 line 141058 -_-_ from ref 140930 z 2001 to ref 139266 diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session index 9fee40b..479fa14 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session @@ -1,9 +1,10 @@ -window_sizes 1385 855 293 1086 728 70 +window_sizes 1386 821 293 1083 628 104 +motif_style diagrams active classdiagram_ref 128002 // wxVtkViewer class Diagram 1 - 1082 708 100 4 168 0 + 1080 630 100 4 0 0 classdiagram_ref 128130 // wxVtkViewer class Diagram 2 - 870 691 100 4 255 0 + 870 699 100 4 255 0 end show_stereotypes selected classdiagram_ref 128002 // wxVtkViewer class Diagram 1 diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj index 78b7bf9..1de09d1 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj @@ -1,6 +1,6 @@ format 73 "wxVtkViewer" - revision 8 + revision 10 modified_by 2 "davila" @@ -31,12 +31,12 @@ format 73 show_infonote yes drawing_language uml show_stereotype_properties no class_color yellow duration_color transparent continuation_color gray note_color blue fragment_color transparent subject_color transparent usecase_color yellow package_color transparent component_color green artifact_color green deploymentnode_color gray state_color yellow stateaction_color transparent activity_color transparent activityregion_color transparent activitypartition_color transparent activityaction_color transparent parameterpin_color white - font_size 13 + font_size 7 diagram_format A4 mark_for_import ncouples 1 - key "html dir" value "/Users/davila/Creatis/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/" + key "html dir" value "/home/davila/Creatis/All2/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 ad6ccb5..eb4f553 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 49edbc4..5e90f12 100644 --- 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 @@ -/Users/davila/Creatis/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index-withframe +/home/davila/Creatis/All2/creatools_source/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/index-withframe diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig.html b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig.html index b2a215e..4d76ccf 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig.html +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig.html @@ -4,7 +4,7 @@ -/Users/davila/Creatis/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig +/home/davila/Creatis/All2/creatools_source/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/navig diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt index 133c8b7..21bd898 100644 --- a/lib/maracasVisuLib/CMakeLists.txt +++ b/lib/maracasVisuLib/CMakeLists.txt @@ -188,9 +188,14 @@ ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} ) ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} ) IF(UNIX) - SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS - ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}) - SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib) + SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}) +message("EED cmakelist creamaracasvisu -------------------------------") +message("EED cmakelist creamaracasvisu -------------------------------") +message("EED cmakelist creamaracasvisu -------------------------------") +message("EED cmakelist creamaracasvisu -------------------------------") +message("EED cmakelist creamaracasvisu -------------------------------") +message("EED cmakelist creamaracasvisu ${CREAMARACASVISU_LIB_PATH} -------------------------------") + SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${CREAMARACASVISU_LIB_PATH} ) ELSE(UNIX) SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}) @@ -220,7 +225,7 @@ IF(WIN32) ELSE(WIN32) INSTALL( TARGETS ${LIBRARY_NAME} - DESTINATION lib) + DESTINATION ${CREAMARACASVISU_LIB_PATH}) ENDIF(WIN32) #----------------------------------------------------------------------------