.

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002
index 607e34f5c085ab57a71f1d2202f67267b76f6594..716c3f00df37f6af61c5fbec31c646a693fc824d 100644 (file)
--- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002
+++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002
@@ -1,6 +1,6 @@
 format 66
 "wxVtkViwer" // wxVtkViwer
-  revision 3
+  revision 4
   modified_by 2 "davila"
   // class settings
   //class diagram settings
@@ -794,6 +794,33 @@ ${inlines}
            classrelation_ref 134402 // <unidirectional association>
          b parent class_ref 129282 // wxVtkClipping3DView
       end
+
+      classrelation 135938 // <unidirectional association>
+       relation 135810 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 135938 // <unidirectional association>
+         b parent class_ref 132226 // wxVtk3DBaseView
+      end
+
+      classrelation 136066 // <unidirectional association>
+       relation 135938 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 136066 // <unidirectional association>
+         b parent class_ref 132098 // wxVtkMPR3DView
+      end
+
+      classrelation 136194 // <unidirectional association>
+       relation 136066 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 136194 // <unidirectional association>
+         b parent class_ref 132354 // vtkMPRBaseDataViewer
+      end
     end
 
     class 131458 "vtkMPRBaseData"
@@ -878,6 +905,95 @@ ${inlines}
       idl_decl ""
       explicit_switch_type ""
       
+      classrelation 136322 // <unidirectional association>
+       relation 136194 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 136322 // <unidirectional association>
+         b parent class_ref 129538 // vtkClipping3DDataViewer
+      end
+
+      classrelation 136450 // <unidirectional association>
+       relation 136322 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 136450 // <unidirectional association>
+         b parent class_ref 129154 // wxVrk3DBaseView
+      end
+
+      classrelation 136578 // <unidirectional association>
+       relation 136450 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 136578 // <unidirectional association>
+         b parent class_ref 133634 // wxVtk3DDataViewer
+      end
+
+      classrelation 136706 // <unidirectional association>
+       relation 136578 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 136706 // <unidirectional association>
+         b parent class_ref 129538 // vtkClipping3DDataViewer
+      end
+
+      classrelation 136834 // <unidirectional association>
+       relation 136706 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 136834 // <unidirectional association>
+         b parent class_ref 133762 // wxVtkMPR3DViewCntrlPanel
+      end
+
+      classrelation 136962 // <unidirectional association>
+       relation 136834 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 136962 // <unidirectional association>
+         b parent class_ref 130434 // vtkPolyData
+      end
+
+      classrelation 137090 // <unidirectional association>
+       relation 136962 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 137090 // <unidirectional association>
+         b parent class_ref 130178 // vtkActor
+      end
+
+      classrelation 137218 // <unidirectional association>
+       relation 137090 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 137218 // <unidirectional association>
+         b parent class_ref 133890 // vtkPlaneWidget
+      end
+
+      classrelation 137346 // <unidirectional association>
+       relation 137218 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 137346 // <unidirectional association>
+         b parent class_ref 134018 // vtkPointWidget
+      end
+
+      classrelation 137474 // <unidirectional association>
+       relation 137346 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 137474 // <unidirectional association>
+         b parent class_ref 130306 // vtkPolyDataMapper
+      end
     end
 
     class 132226 "wxVtk3DBaseView"
@@ -1018,5 +1134,61 @@ ${inlines}
          b parent class_ref 131586 // wxWidgetMesure2D_Plane_inMPR
       end
     end
+
+    class 133634 "wxVtk3DDataViewer"
+      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 ""
+      
+    end
+
+    class 133762 "wxVtkMPR3DViewCntrlPanel"
+      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 ""
+      
+    end
+
+    class 133890 "vtkPlaneWidget"
+      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 ""
+      
+    end
+
+    class 134018 "vtkPointWidget"
+      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 ""
+      
+    end
   end
 end

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram
index 3adc73c33a30b0d458c0729f9cc541d3353553fd..ce8b687b638f988b3bc01799036313dc2f493a69 100644 (file)
--- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram
+++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram
@@ -40,29 +40,29 @@ classcanvas 129922 class_ref 129026 // vtkInteractorStyleImage
 end
 classcanvas 130946 class_ref 129154 // wxVrk3DBaseView
   draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
-  xyz 579 459 2000
+  xyz 547 376 2000
 end
 classcanvas 131202 class_ref 129282 // wxVtkClipping3DView
   draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
-  xyz 440 597 2000
+  xyz 442 638 2000
 end
 classcanvas 131842 class_ref 129410 // wxPanel
   draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
   color lightorange
-  xyz 482 535 2000
+  xyz 484 580 2000
 end
 classcanvas 132226 class_ref 129538 // vtkClipping3DDataViewer
   draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
-  xyz 611 598 2000
+  xyz 404 530 2000
 end
 classcanvas 132482 class_ref 129666 // vtkBoxWidget
   draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
   color magenta
-  xyz 431 681 2000
+  xyz 433 722 2000
 end
 classcanvas 133122 class_ref 129794 // wxVtkClipping3DViewCntrlPanel
   draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
-  xyz 595 767 3005
+  xyz 590 910 3005
 end
 classcanvas 133250 class_ref 129922 // wxVtkMPR2DView
   draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
@@ -115,6 +115,43 @@ classcanvas 137602 class_ref 131074 // InteractorStyleMaracas
   draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
   xyz 187 517 2006
 end
+classcanvas 137986 class_ref 132098 // wxVtkMPR3DView
+  draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
+  xyz 604 637 2000
+end
+classcanvas 138242 class_ref 133634 // wxVtk3DDataViewer
+  draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
+  xyz 632 491 2000
+end
+classcanvas 138626 class_ref 133762 // wxVtkMPR3DViewCntrlPanel
+  draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
+  xyz 670 403 2000
+end
+classcanvas 139778 class_ref 130434 // vtkPolyData
+  draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
+  color magenta
+  xyz 744 598 2000
+end
+classcanvas 140034 class_ref 130178 // vtkActor
+  draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
+  color magenta
+  xyz 761 640 2000
+end
+classcanvas 140290 class_ref 133890 // vtkPlaneWidget
+  draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
+  color magenta
+  xyz 723 687 3010
+end
+classcanvas 140546 class_ref 134018 // vtkPointWidget
+  draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
+  color magenta
+  xyz 722 727 2000
+end
+classcanvas 140930 class_ref 130306 // vtkPolyDataMapper
+  draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
+  color magenta
+  xyz 705 776 2000
+end
 relationcanvas 128258 relation_ref 128002 // <association>
   from ref 128130 z 2001 to ref 128002
   no_role_a no_role_b
@@ -161,7 +198,10 @@ relationcanvas 131074 relation_ref 129026 // <generalisation>
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 131714 relation_ref 129282 // <unidirectional association>
-  from ref 131202 z 2001 to ref 130946
+  decenter_end 139
+  from ref 131202 z 2001 to point 580 605
+  line 139138 z 2001 to point 580 443
+  line 139522 z 2001 to ref 130946
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
@@ -171,20 +211,22 @@ relationcanvas 132098 relation_ref 129410 // <unidirectional association>
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 132354 relation_ref 129538 // <unidirectional association>
-  from ref 131202 z 2001 to ref 132226
+  decenter_end 177
+  from ref 131202 z 2001 to point 430 648
+  line 139010 z 2001 to ref 132226
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 132610 relation_ref 129666 // _boxWidgetS1
   decenter_begin 769
   decenter_end 538
-  from ref 131202 z 2001 label "_boxWidgetS1" italic xyz 520 664 2001 to point 563 693
+  from ref 131202 z 2001 label "_boxWidgetS1" italic xyz 522 705 2001 to point 565 734
   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 646 2001 to ref 132482
+  from ref 131202 z 2001 label "_boxWidgetVolume" italic xyz 414 687 2001 to ref 132482
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
@@ -268,6 +310,50 @@ relationcanvas 137858 relation_ref 131714 // <generalisation>
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
+relationcanvas 138370 relation_ref 136322 // <unidirectional association>
+  from ref 137986 z 2001 to point 607 517
+  line 139394 z 2001 to ref 130946
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 138498 relation_ref 136450 // <unidirectional association>
+  from ref 137986 z 2001 to ref 138242
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 138882 relation_ref 136706 // <unidirectional association>
+  from ref 137986 z 2001 to point 789 537
+  line 139650 z 2001 to ref 138626
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 139906 relation_ref 136834 // <unidirectional association>
+  from ref 137986 z 2001 to ref 139778
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 140162 relation_ref 136962 // <unidirectional association>
+  from ref 137986 z 2001 to ref 140034
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 140418 relation_ref 137090 // <unidirectional association>
+  from ref 137986 z 3011 to ref 140290
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 140674 relation_ref 137218 // <unidirectional association>
+  from ref 137986 z 2001 to point 699 722
+  line 140802 z 2001 to ref 140546
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 141058 relation_ref 137346 // <unidirectional association>
+  from ref 137986 z 2001 to point 680 784
+  line 141186 z 2001 to ref 140930
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
 line 137474 -_-_
   from ref 137346 z 2014 to ref 137218
 end

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128130.diagram b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128130.diagram
index 92b9c38bc8b2857422f882fc31806163d868aea9..3b0e36aaf2a5695a590e57ffca514a0f2139c70d 100644 (file)
--- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128130.diagram
+++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128130.diagram
@@ -3,7 +3,7 @@ format 66
 classcanvas 128002 class_ref 131202 // wxMaracas_N_ViewersWidget
   draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
   color mediumyellow
-  xyz 638 690 2000
+  xyz 637 737 2000
 end
 classcanvas 128130 class_ref 131330 // wxMaracas_ViewerWidget
   draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
@@ -15,7 +15,7 @@ wxwindow2
 wxwindow3
 wxwindow4
 "
-  xyzwh 597 559 2005 118 92
+  xyzwh 596 636 2005 118 92
 classcanvas 128642 class_ref 131458 // vtkMPRBaseData
   draw_all_relations default hide_attributes default hide_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_infonote default shadow default show_stereotype_properties default
   xyz 379 470 2000
@@ -141,21 +141,6 @@ relationcanvas 130562 relation_ref 132610 // <unidirectional association>
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
-relationcanvas 131074 relation_ref 132866 // <unidirectional association>
-  from ref 128002 z 2001 to ref 130946
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 131330 relation_ref 132994 // <unidirectional association>
-  from ref 128002 z 2001 to ref 131202
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 131586 relation_ref 133122 // <unidirectional association>
-  from ref 128002 z 2001 to ref 131458
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
 relationcanvas 132354 relation_ref 133378 // <unidirectional association>
   from ref 131714 z 2001 to ref 132226
   no_role_a no_role_b
@@ -210,6 +195,21 @@ relationcanvas 136834 relation_ref 134658 // <unidirectional association>
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
+relationcanvas 141826 relation_ref 135810 // <unidirectional association>
+  from ref 128130 z 2001 to ref 131202
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 141954 relation_ref 135938 // <unidirectional association>
+  from ref 128130 z 2001 to ref 130946
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 142082 relation_ref 136066 // <unidirectional association>
+  from ref 128130 z 2001 to ref 131458
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
 line 128514 -_-_
   from ref 128386 z 2006 to ref 128258
 line 129666 -_-_

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session
index c1a0aea66caf484fb2474acdc6b4fccd2cd17908..c3a1aa2948a7b7fecc8233814c7071136597b9d6 100644 (file)
--- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session
+++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session
@@ -1,12 +1,12 @@
-window_sizes 1396 856 329 1061 729 70
+window_sizes 1397 856 329 1062 729 70
 diagrams
   active  classdiagram_ref 128002 // wxVtkViewer class Diagram 1
-    365 446 100 4 420 0
+    1058 709 100 4 443 0
   classdiagram_ref 128130 // wxVtkViewer class Diagram 2
     870 691 100 4 240 0
 end
 show_stereotypes
-selected classdiagram_ref 128130 // wxVtkViewer class Diagram 2
+selected classdiagram_ref 128002 // wxVtkViewer class Diagram 1
 open
   classview_ref 128002 // wxVtkViewer
 end

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj
index f9a24b1923c6172d831151a559b4028897c957a9..1fde197489a0eb709ce48f26222f36ab3eeba98a 100644 (file)
--- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj
+++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj
@@ -1,6 +1,6 @@
 format 66
 "wxVtkViewer"
-  revision 3
+  revision 4
   modified_by 2 "davila"
 
 
@@ -37,6 +37,6 @@ format 66
   mark_for_import
   
   ncouples 1
-  key "html dir" value "/Users/davila/Creatis/creaMaracasVisu/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram2_HTML/"
+  key "html dir" value "/Users/davila/Creatis/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 8e3fbbde11db61627bd276e89afd925bfb75e490..781a333310567b9c4d26cb8bf6a2f2c8c3368bbd 100644 (file)
Binary files a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/fig128002.png and b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/fig128002.png differ

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram2_HTML/fig128130.png b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram2_HTML/fig128130.png
index 86ed079a7b1e2f8e24f1bd6fb191eac03b88f232..78bcd0f57e0e6ffbf8d658f58332b97923139a6b 100644 (file)
Binary files a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram2_HTML/fig128130.png and b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram2_HTML/fig128130.png differ

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
index f3217a2e5b2f801419ea11328f6f542898987425..a46feff5b49d41b2ac441a90eceff740b0c503f2 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
@@ -341,7 +341,6 @@ void vtkMPR3DDataViewer::Refresh()
        int x = (int)(_vtkmprbasedata->GetX());
        int y = (int)(_vtkmprbasedata->GetY());
        int z = (int)(_vtkmprbasedata->GetZ());
-       std::cout<<" vtkMPR3DDataViewer::Refresh() x="<<x<<" y= "<<y<<" z= "<<z;
        SetPositionX( x );
        SetPositionY( y );
        SetPositionZ( z );

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
index 806bc12d368a64d2f2f48778980cc104ce027fa1..a094c266bcc871a8457c4f41b461ef5e0ef9c049 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
@@ -64,7 +64,9 @@ void wxVtkMPR3DView::Configure(){
 
        _wxvtk3Dbaseview->Configure();
        _wxvtkmpr3DviewCntrlPanel->UpdateControlPanel();
-       _wxvtk3Dbaseview->GetRenderer()->Clear();               
+       
+//EED 27 Mai 2009 
+//     _wxvtk3Dbaseview->GetRenderer()->Clear();    
        
        // Actors are added to the renderer. 
        vtkActor* _outlineActor = _vtkmpr3Ddataviewer->GetOutlineActor();