From: Eduardo Davila Date: Mon, 22 Jun 2009 10:31:42 +0000 (+0000) Subject: no message X-Git-Tag: EED.02Oct2009~23 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=5c61ebf06cedf398ed1b3412899366d16a8b079c;p=creaMaracasVisu.git no message --- diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 index 74b38b1..e0a8ba4 100644 --- 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 // 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 // - relation 129026 ---|> - a public - cpp default "${type}" - classrelation_ref 129026 // - 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 // - relation 129154 ---|> - a public - cpp default "${type}" - classrelation_ref 129154 // - b parent class_ref 129154 // wxVrk3DBaseView - end - - classrelation 129282 // - relation 129282 ---> - a role_name "" private - cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; -" - classrelation_ref 129282 // - b parent class_ref 129154 // wxVrk3DBaseView - end - classrelation 129410 // relation 129410 ---> a role_name "" private @@ -372,6 +335,15 @@ ${inlines} classrelation_ref 129794 // (_boxWidgetVolume) b parent class_ref 129666 // vtkBoxWidget end + + classrelation 140802 // + relation 140674 ---> + a role_name "" private + cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; +" + classrelation_ref 140802 // + 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 // - relation 136322 ---> - a role_name "" private - cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; -" - classrelation_ref 136450 // - b parent class_ref 129154 // wxVrk3DBaseView - end - classrelation 136578 // relation 136450 ---> a role_name "" private @@ -1027,6 +990,15 @@ ${inlines} classrelation_ref 137474 // b parent class_ref 130306 // vtkPolyDataMapper end + + classrelation 140674 // + relation 140546 ---> + a role_name "" private + cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; +" + classrelation_ref 140674 // + b parent class_ref 132226 // wxVtk3DBaseView + end end class 132226 "wxVtk3DBaseView" @@ -1041,6 +1013,13 @@ ${inlines} idl_decl "" explicit_switch_type "" + classrelation 140546 // + relation 140418 ---|> + a public + cpp default "${type}" + classrelation_ref 140546 // + 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 4d71eb2..52c68e1 100644 --- 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 // from ref 128130 z 2001 to ref 128002 no_role_a no_role_b @@ -196,19 +196,6 @@ relationcanvas 130818 relation_ref 128898 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 131074 relation_ref 129026 // - 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 // - 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 // from ref 131202 z 2001 to ref 131842 no_role_a no_role_b @@ -314,12 +301,6 @@ relationcanvas 137858 relation_ref 131714 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 138370 relation_ref 136322 // - 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 // from ref 137986 z 2001 to ref 138242 no_role_a no_role_b @@ -369,6 +350,25 @@ relationcanvas 141826 relation_ref 138882 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b end +relationcanvas 142338 relation_ref 140418 // + 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 // + 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 // + 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 8ee0996..398f13d 100644 --- 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 1adf37d..b685c0d 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/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx index e3215c4..c6d2e89 100644 --- 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 aa6011e..28c4ca7 100644 --- 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(); }