no message

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002
index 74b38b164c64d17ed78ec42eac3617590d7e505e..e0a8ba4dcfcef47bf4f20c2fd717bee9df6972c1 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 5
+  revision 6
   modified_by 2 "davila"
   // class settings
   //class diagram settings
@@ -178,6 +178,7 @@ ${inlines}
            classrelation_ref 128898 // <unidirectional association>
          b parent class_ref 129026 // vtkInteractorStyleImage
       end
+
     end
 
     class 128386 "vtkImageViewer2_XYZ"
@@ -287,27 +288,6 @@ ${inlines}
       
     end
 
-    class 129154 "wxVrk3DBaseView"
-      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 129026 // <generalisation>
-       relation 129026 ---|>
-         a public
-           cpp default "${type}"
-           classrelation_ref 129026 // <generalisation>
-         b parent class_ref 128258 // wxVtkBaseView
-      end
-    end
-
     class 129282 "wxVtkClipping3DView"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
@@ -320,23 +300,6 @@ ${inlines}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 129154 // <generalisation>
-       relation 129154 ---|>
-         a public
-           cpp default "${type}"
-           classrelation_ref 129154 // <generalisation>
-         b parent class_ref 129154 // wxVrk3DBaseView
-      end
-
-      classrelation 129282 // <unidirectional association>
-       relation 129282 --->
-         a role_name "" private
-           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
-"
-           classrelation_ref 129282 // <unidirectional association>
-         b parent class_ref 129154 // wxVrk3DBaseView
-      end
-
       classrelation 129410 // <unidirectional association>
        relation 129410 --->
          a role_name "" private
@@ -372,6 +335,15 @@ ${inlines}
            classrelation_ref 129794 // (_boxWidgetVolume)
          b parent class_ref 129666 // vtkBoxWidget
       end
+
+      classrelation 140802 // <unidirectional association>
+       relation 140674 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 140802 // <unidirectional association>
+         b parent class_ref 132226 // wxVtk3DBaseView
+      end
     end
 
     class 129410 "wxPanel"
@@ -947,15 +919,6 @@ ${inlines}
          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
@@ -1027,6 +990,15 @@ ${inlines}
            classrelation_ref 137474 // <unidirectional association>
          b parent class_ref 130306 // vtkPolyDataMapper
       end
+
+      classrelation 140674 // <unidirectional association>
+       relation 140546 --->
+         a role_name "" private
+           cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+           classrelation_ref 140674 // <unidirectional association>
+         b parent class_ref 132226 // wxVtk3DBaseView
+      end
     end
 
     class 132226 "wxVtk3DBaseView"
@@ -1041,6 +1013,13 @@ ${inlines}
       idl_decl ""
       explicit_switch_type ""
       
+      classrelation 140546 // <generalisation>
+       relation 140418 ---|>
+         a public
+           cpp default "${type}"
+           classrelation_ref 140546 // <generalisation>
+         b parent class_ref 128258 // wxVtkBaseView
+      end
     end
 
     class 132354 "vtkMPRBaseDataViewer"

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram
index 4d71eb22913db9ebbc866b295c7357ed70436e37..52c68e1d4f3777909726cb72a348451ebd8bbc98 100644 (file)
--- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram
+++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram
@@ -38,10 +38,6 @@ classcanvas 129922 class_ref 129026 // vtkInteractorStyleImage
   color magenta
   xyz 407 173 2000
 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 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 442 638 2000
@@ -121,11 +117,11 @@ classcanvas 137986 class_ref 132098 // wxVtkMPR3DView
 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
+  xyz 623 492 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
+  xyz 646 419 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
@@ -156,6 +152,10 @@ classcanvas 141314 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 173 261 2010
 end
+classcanvas 142082 class_ref 132226 // wxVtk3DBaseView
+  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 504 363 2005
+end
 relationcanvas 128258 relation_ref 128002 // <association>
   from ref 128130 z 2001 to ref 128002
   no_role_a no_role_b
@@ -196,19 +196,6 @@ relationcanvas 130818 relation_ref 128898 // <unidirectional association>
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
-relationcanvas 131074 relation_ref 129026 // <generalisation>
-  from ref 130946 z 2001 to ref 128386
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 131714 relation_ref 129282 // <unidirectional association>
-  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
 relationcanvas 132098 relation_ref 129410 // <unidirectional association>
   from ref 131202 z 2001 to ref 131842
   no_role_a no_role_b
@@ -314,12 +301,6 @@ 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
@@ -369,6 +350,25 @@ relationcanvas 141826 relation_ref 138882 // <unidirectional association>
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
+relationcanvas 142338 relation_ref 140418 // <generalisation>
+  from ref 142082 z 2006 to ref 128386
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 142466 relation_ref 140546 // <unidirectional association>
+  decenter_end 697
+  from ref 137986 z 2006 to point 620 574
+  line 142850 z 2006 to ref 142082
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 142594 relation_ref 140674 // <unidirectional association>
+  decenter_end 387
+  from ref 131202 z 2006 to point 594 578
+  line 142722 z 2006 to ref 142082
+  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/wxVtkViewer.prj b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/wxVtkViewer.prj
index 8ee099663bca841a25d16bef4d3e255300142ec4..398f13d7ba6c1d3fb942c07fecc2a1d0249f992d 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 5
+  revision 6
   modified_by 2 "davila"
 
 

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/fig128002.png b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/fig128002.png
index 1adf37d37aed940d96c213923ed47ba50fd60512..b685c0dc1d743a12cc47896bf1ccd05089155e82 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/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
index e3215c49db8b086e9ac751f5277e6b61430a4052..c6d2e895a6d8f62dce9d993a821ac044c7006f33 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_ViewerWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/06/05 06:07:39 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2009/06/22 10:31:44 $
+  Version:   $Revision: 1.14 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -213,10 +213,9 @@
                if (mwidgetMesure)                              { delete mwidgetMesure; }
                if (mvtkplane2Dview)                    { delete mvtkplane2Dview; }
                if (mwxsphereview)                              { delete mwxsphereview; }
+               if (mwxvtkmpr3Dview)                    { delete mwxvtkmpr3Dview; }
                if (mwxvtkclipping3Dview)               { delete mwxvtkclipping3Dview; }
                if (mwxvtk3Dbaseview_Clipping3D){ delete mwxvtk3Dbaseview_Clipping3D; }
-               if (mwxvtkmpr3Dview)                    { delete mwxvtkmpr3Dview; }
-
        }
        //------------------------------------------------------------------------------------------------------------
        // Methods

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
index aa6011e5f136113e02a1d5978b4544a15333c12c..28c4ca778c3eb9885e99a99a0571a78c5984dd11 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
@@ -183,6 +183,10 @@ void wxVtkMPR3DView::Configure(){
 //-------------------------------------------------------------------
 wxVtkMPR3DView::~wxVtkMPR3DView()
 {
+       printf("EED wxVtkMPR3DView::~wxVtkMPR3DView\n");
+       VisiblePointWidget( false );
+       VisiblePlaneWidget( false );
+       
        if(_pointWidget!=NULL){
                _pointWidget->Delete();
        }