From 8f7ea7d6b6d2db959c481d1defcb5135311ecce3 Mon Sep 17 00:00:00 2001 From: Ricardo Corredor Date: Thu, 5 Nov 2009 13:10:32 +0000 Subject: [PATCH] Changes done by Catalina Rodriguez and Ricardo Corredor in the MVC model of creaMaracasVisu --- .../manualContour/129177.diagram | 16 +- .../manualContour/129305.diagram | 84 +++-- .../manualContour/129433.diagram | 110 +++--- .../manualContour/129561.diagram | 53 +-- .../manualContour/manualContour.prj | 338 ++++++++++++++---- 5 files changed, 431 insertions(+), 170 deletions(-) diff --git a/lib/doxygen/bouml/manualContour/manualContour/129177.diagram b/lib/doxygen/bouml/manualContour/manualContour/129177.diagram index 435a281..ca8913d 100644 --- a/lib/doxygen/bouml/manualContour/manualContour/129177.diagram +++ b/lib/doxygen/bouml/manualContour/manualContour/129177.diagram @@ -1,23 +1,23 @@ -format 66 +format 67 -classcanvas 128025 class_ref 129945 // manualContourModel +classcanvas 128025 class_ref 129945 // manualBaseModel 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 92 229 2000 + xyz 114 231 2000 end classcanvas 128153 class_ref 131353 // manualViewBaseContour 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 228 105 2008 + xyz 253.1 107.6 2008 end classcanvas 129177 class_ref 129689 // manualContourBaseControler 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 351 228 2000 + xyz 382.2 230.9 2000 end note 130201 "MODEL" - xyzwh 96 168 2000 65 36 + xyzwh 96.8 167.5 2000 65 36 note 130329 "VIEW" - xyzwh 240 52 2013 59 35 + xyzwh 240.9 52.9 2013 59 35 note 130457 "CONTROLLER" - xyzwh 477 174 2005 116 35 + xyzwh 477.4 174.1 2005 116 35 relationcanvas 129689 relation_ref 133401 // from ref 129177 z 2001 to ref 128025 no_role_a no_role_b diff --git a/lib/doxygen/bouml/manualContour/manualContour/129305.diagram b/lib/doxygen/bouml/manualContour/manualContour/129305.diagram index c429fa2..02912a0 100644 --- a/lib/doxygen/bouml/manualContour/manualContour/129305.diagram +++ b/lib/doxygen/bouml/manualContour/manualContour/129305.diagram @@ -1,76 +1,106 @@ -format 66 +format 67 -classcanvas 128025 class_ref 129945 // manualContourModel +classcanvas 128025 class_ref 129945 // manualBaseModel 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 236 221 2000 + xyz 288.4 155.2 2000 +end +classcanvas 128070 class_ref 128198 // manualContourModel + 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 279 241 2000 end classcanvas 128153 class_ref 130073 // manualContourModelBullEye 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 368 405 2005 + xyz 523.6 348.6 2005 end classcanvas 128281 class_ref 130201 // manualContourModelBullEyeSector 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 434 305 2000 + xyz 503.7 261.6 2000 end classcanvas 128409 class_ref 130329 // manualContourModelCircle 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 218 454 2000 + xyz 111.8 490.5 2000 end classcanvas 128537 class_ref 130457 // manualContourModelLine 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 101 410 2000 + xyz 73.6 421.1 2000 end classcanvas 128665 class_ref 130585 // manualContourModelRoi 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 78 299 2000 + xyz 65.9 352 2000 end classcanvas 128793 class_ref 132377 // manualPoint 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 447 221 2000 + xyz 478.1 155.2 2000 end classcanvas 129945 class_ref 133145 // vtkKochanekSpline 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 darkblue - xyz 243 102 2000 + xyz 83.3 130.3 2000 +end +relationcanvas 128582 relation_ref 128582 // + from ref 128070 z 2001 to point 142 281 + line 130246 z 2001 to point 49 225 + line 131142 z 2001 to point 49 146 + line 130630 z 2001 to ref 129945 + role_a_pos 7 128 3000 no_role_b + no_multiplicity_a no_multiplicity_b end -relationcanvas 128921 relation_ref 132505 // - from ref 128665 z 2001 to ref 128025 +relationcanvas 128710 relation_ref 128710 // + from ref 128665 z 2001 to point 255 331 + line 129606 z 2001 to ref 128070 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 129049 relation_ref 132633 // - from ref 128537 z 2001 to ref 128025 +relationcanvas 128838 relation_ref 128838 // + from ref 128537 z 2001 to point 270 384 + line 129734 z 2001 to ref 128070 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 129177 relation_ref 132761 // - from ref 128409 z 2001 to ref 128025 +relationcanvas 128966 relation_ref 128966 // + from ref 128409 z 2001 to point 305 419 + line 129862 z 2001 to ref 128070 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 129305 relation_ref 132889 // - from ref 128153 z 2006 to ref 128281 +relationcanvas 129094 relation_ref 129094 // + from ref 128153 z 2006 to point 477 363 + line 129990 z 2006 to ref 128070 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 129222 relation_ref 129222 // + from ref 128281 z 2001 to ref 128070 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 129433 relation_ref 133017 // - from ref 128153 z 2006 to ref 128025 +relationcanvas 129305 relation_ref 132889 // + from ref 128153 z 2006 to ref 128281 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 129689 relation_ref 133145 // - from ref 128281 z 2001 to ref 128025 +relationcanvas 129350 relation_ref 129350 // + from ref 128070 z 2001 to ref 128025 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 129817 relation_ref 133273 // from ref 128025 z 2001 to ref 128793 - no_role_a no_role_b - multiplicity_a_pos 430 245 3000 no_multiplicity_b + role_a_pos 412 154 3000 no_role_b + multiplicity_a_pos 462 181 3000 no_multiplicity_b end -relationcanvas 130073 relation_ref 134297 // - from ref 128025 z 2001 to ref 129945 - no_role_a no_role_b +relationcanvas 130118 relation_ref 129478 // + from ref 128070 z 2001 to point 141 281 + line 130502 z 2001 to ref 129945 + role_a_pos 153 175 3000 no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 130374 relation_ref 129606 // + from ref 128070 z 2001 to point 142 281 + line 130886 z 2001 to point 238 219 + line 131014 z 2001 to point 238 144 + line 130758 z 2001 to ref 129945 + role_a_pos 213 126 3000 no_role_b no_multiplicity_a no_multiplicity_b end end diff --git a/lib/doxygen/bouml/manualContour/manualContour/129433.diagram b/lib/doxygen/bouml/manualContour/manualContour/129433.diagram index f6cd427..a49ab38 100644 --- a/lib/doxygen/bouml/manualContour/manualContour/129433.diagram +++ b/lib/doxygen/bouml/manualContour/manualContour/129433.diagram @@ -1,79 +1,93 @@ -format 66 +format 67 classcanvas 128025 class_ref 131097 // manualView3DContour 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 443 480 2000 + xyz 587.7 747.1 2000 +end +classcanvas 128070 class_ref 128070 // manualViewPoints + 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 189 420 2000 end classcanvas 128153 class_ref 131225 // manualView3VContour 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 480 419 2000 + xyz 577.4 677 2000 end classcanvas 128281 class_ref 131353 // manualViewBaseContour 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 311 205 2000 + xyz 410.4 387.6 2000 end classcanvas 128409 class_ref 131481 // manualViewBullEye 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 280 644 2000 + xyz 105.2 748.5 2000 end classcanvas 128537 class_ref 131609 // manualViewBullEyeSector 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 390 585 2000 + xyz 408.7 748.6 2000 end classcanvas 128665 class_ref 131737 // manualViewCircle 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 109 547 2000 + xyz 194.3 537.8 2000 end classcanvas 128793 class_ref 131865 // manualViewContour 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 318 309 2000 + xyz 424.2 540 2000 end classcanvas 128921 class_ref 131993 // manualViewLine 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 104 425 2000 + xyz 196.3 483.6 2000 end classcanvas 129049 class_ref 132121 // manualViewPoint 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 87 171 2000 + xyz 175.9 143.2 2000 end classcanvas 129177 class_ref 132249 // manualViewRoi 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 291 520 2000 + xyz 115.6 617.1 2000 end -classcanvas 129305 class_ref 129945 // manualContourModel +classcanvas 129305 class_ref 129945 // manualBaseModel 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 274 81 2000 + xyz 431.2 239.2 2000 end note 131097 "See the Model Diagram for more information" - xyzwh 173 9 2000 178 53 + xyzwh 399.1 163.5 2000 179 48 classcanvas 132505 class_ref 130073 // manualContourModelBullEye 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 532 643 2000 + xyz 79 859.4 2000 end note 132633 "See the Model Diagram for more information" - xyzwh 571 589 2000 131 48 + xyzwh 102.6 930.2 2000 131 48 classcanvas 132889 class_ref 132505 // wxVTKRenderWindowInteractor 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 462 126 2000 + xyz 729.1 361.7 2000 end classcanvas 133017 class_ref 133017 // wxVtkBaseView 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 532 184 2000 + xyz 769.9 419.5 2000 end classcanvas 133145 class_ref 132633 // 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 darkblue - xyz 553 240 2000 + xyz 796.5 482.1 2000 end classcanvas 133273 class_ref 132761 // 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 darkblue - xyz 566 296 2000 + xyz 806.4 541.7 2000 end classcanvas 133401 class_ref 132889 // 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 darkblue - xyz 532 355 2000 + xyz 782.2 607.6 2000 +end +relationcanvas 128198 relation_ref 128070 // + from ref 128070 z 2001 to ref 128281 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 128326 relation_ref 128198 // + from ref 128070 z 2001 to ref 129049 + role_a_pos 258 336 3000 no_role_b + multiplicity_a_pos 233 336 3000 no_multiplicity_b end relationcanvas 129433 relation_ref 129177 // from ref 128921 z 2001 to ref 128793 @@ -82,7 +96,9 @@ relationcanvas 129433 relation_ref 129177 // end relationcanvas 129689 relation_ref 129433 // decenter_begin 907 - from ref 129177 z 2001 to ref 128793 + from ref 129177 z 2001 to point 246 627 + line 128582 z 2001 to point 419 627 + line 128710 z 2001 to ref 128793 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -91,14 +107,27 @@ relationcanvas 129945 relation_ref 129689 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b end +relationcanvas 130118 relation_ref 128326 // + from ref 128281 z 2001 to ref 133017 + role_a_pos 671 417 3000 no_role_b + no_multiplicity_a no_multiplicity_b +end relationcanvas 130201 relation_ref 129817 // - from ref 128153 z 2001 to ref 128793 + from ref 128153 z 2001 to point 550 658 + line 129990 z 2001 to ref 128793 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 130329 relation_ref 129945 // decenter_end 615 - from ref 128025 z 2001 to ref 128793 + from ref 128025 z 2001 to point 516 693 + line 129862 z 2001 to ref 128793 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 130374 relation_ref 128454 // + from ref 128281 z 2001 to point 649 376 + line 130630 z 2001 to ref 132889 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -108,13 +137,14 @@ relationcanvas 130457 relation_ref 130073 // no_multiplicity_a no_multiplicity_b end relationcanvas 130585 relation_ref 130201 // - from ref 128281 z 2001 to ref 129049 - no_role_a no_role_b - multiplicity_a_pos 211 203 3000 no_multiplicity_b + from ref 128281 z 2001 to point 365 321 + line 128454 z 2001 to ref 129049 + role_a_pos 335 279 3000 no_role_b + multiplicity_a_pos 335 306 3000 no_multiplicity_b end relationcanvas 130713 relation_ref 130329 // from ref 128281 z 2001 to ref 129305 - no_role_a no_role_b + role_a_pos 498 284 3000 no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 130969 relation_ref 129305 // @@ -129,21 +159,18 @@ relationcanvas 132249 relation_ref 133913 // end relationcanvas 132377 relation_ref 134041 // from ref 128409 z 2001 to ref 128537 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b + role_a_pos 308 747 3000 no_role_b + multiplicity_a_pos 392 774 3000 no_multiplicity_b end -relationcanvas 132761 relation_ref 134169 // +relationcanvas 132761 relation_ref 134169 // from ref 128409 z 2001 to ref 132505 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 133529 relation_ref 134553 // - from ref 128793 z 2001 to ref 132889 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end relationcanvas 133785 relation_ref 134809 // - from ref 128793 z 2001 to ref 133145 + from ref 128793 z 2001 to point 690 557 + line 129606 z 2001 to point 720 499 + line 129734 z 2001 to ref 133145 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -152,13 +179,10 @@ relationcanvas 133913 relation_ref 134937 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 134041 relation_ref 135065 // - from ref 128793 z 2001 to ref 133017 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end relationcanvas 134169 relation_ref 135193 // - from ref 128793 z 2001 to ref 133401 + from ref 128793 z 2001 to point 687 557 + line 129350 z 2001 to point 717 623 + line 129478 z 2001 to ref 133401 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end diff --git a/lib/doxygen/bouml/manualContour/manualContour/129561.diagram b/lib/doxygen/bouml/manualContour/manualContour/129561.diagram index 649b267..8e4bebe 100644 --- a/lib/doxygen/bouml/manualContour/manualContour/129561.diagram +++ b/lib/doxygen/bouml/manualContour/manualContour/129561.diagram @@ -1,62 +1,62 @@ -format 66 +format 67 classcanvas 128025 class_ref 129177 // manualCircleControler 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 108 540 2000 + xyz 80 477.1 2000 end classcanvas 128153 class_ref 129305 // manualContour3DControler 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 495 467 2000 + xyz 524.7 469.8 2000 end classcanvas 128281 class_ref 129433 // manualContour3V3DControler 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 407 612 2000 + xyz 438.9 614.3 2000 end classcanvas 128409 class_ref 129561 // manualContour3VControler 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 281 689 2000 + xyz 300.2 693 2000 end classcanvas 128537 class_ref 129689 // manualContourBaseControler 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 35 282 2005 + xyz 30.6 278.3 2005 end classcanvas 128665 class_ref 129817 // manualContourControler 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 287 281 2000 + xyz 306.8 278.2 2000 end classcanvas 128793 class_ref 130713 // manualLineControler 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 72 476 2000 + xyz 83.8 419.7 2000 end classcanvas 128921 class_ref 130841 // manualContourPerpPlaneControler 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 135 600 2000 + xyz 119.6 565.1 2000 end classcanvas 129049 class_ref 130969 // manualRoiControler 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 78 394 2000 + xyz 85.1 363.5 2000 end classcanvas 129177 class_ref 129945 // manualContourModel 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 55 143 2005 + xyz 53.3 148.4 2005 end classcanvas 129305 class_ref 131353 // manualViewBaseContour 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 260 142 2000 + xyz 254.3 149.3 2000 end classcanvas 129561 class_ref 131097 // manualView3DContour 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 487 145 2000 + xyz 750.1 472.6 2000 end note 132377 "See the Model Diagram for more information" - xyzwh 56 84 2000 131 48 + xyzwh 42.1 89.7 2000 160 47 note 132505 "See the View Diagram for more information" - xyzwh 273 78 2000 131 48 + xyzwh 254.8 88.1 2000 155 48 note 132633 "See the View Diagram for more information" - xyzwh 496 84 2000 131 48 + xyzwh 739.1 402.7 2000 163 47 classcanvas 132761 class_ref 132505 // wxVTKRenderWindowInteractor 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 602 279 2000 + xyz 523.1 278 2000 end relationcanvas 129817 relation_ref 130457 // from ref 129049 z 2001 to ref 128665 @@ -64,12 +64,14 @@ relationcanvas 129817 relation_ref 130457 // no_multiplicity_a no_multiplicity_b end relationcanvas 129945 relation_ref 130585 // - from ref 128793 z 2001 to ref 128665 + from ref 128793 z 2001 to point 237 399 + line 128326 z 2001 to ref 128665 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 130073 relation_ref 130713 // - from ref 128025 z 2001 to ref 128665 + from ref 128025 z 2001 to point 250 449 + line 128454 z 2001 to ref 128665 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -104,7 +106,9 @@ relationcanvas 130841 relation_ref 131481 // no_multiplicity_a no_multiplicity_b end relationcanvas 131353 relation_ref 131737 // - from ref 128537 z 2006 to ref 129305 + from ref 128537 z 2006 to point 172 234 + line 128198 z 2006 to point 330 234 + line 128070 z 2006 to ref 129305 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -114,12 +118,14 @@ relationcanvas 131609 relation_ref 131993 // no_multiplicity_a no_multiplicity_b end relationcanvas 131737 relation_ref 132121 // - from ref 128281 z 2001 to ref 128153 + from ref 128281 z 2001 to point 605 581 + line 128838 z 2001 to ref 128153 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 131865 relation_ref 132249 // - from ref 128281 z 2001 to ref 128409 + from ref 128281 z 2001 to point 527 709 + line 128710 z 2001 to ref 128409 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -129,7 +135,8 @@ relationcanvas 131993 relation_ref 132377 // no_multiplicity_a no_multiplicity_b end relationcanvas 132249 relation_ref 133785 // - from ref 128921 z 2001 to ref 128409 + from ref 128921 z 2001 to point 222 710 + line 128582 z 2001 to ref 128409 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end diff --git a/lib/doxygen/bouml/manualContour/manualContour/manualContour.prj b/lib/doxygen/bouml/manualContour/manualContour/manualContour.prj index eb65bde..37e061f 100644 --- a/lib/doxygen/bouml/manualContour/manualContour/manualContour.prj +++ b/lib/doxygen/bouml/manualContour/manualContour/manualContour.prj @@ -1,7 +1,7 @@ -format 66 +format 67 "manualContour" - revision 7 - modified_by 2 "davila" + revision 8 + modified_by 70 "Ricardo" @@ -31,7 +31,7 @@ format 66 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 12 + font_size 9 diagram_format A4 mark_for_import @@ -66,12 +66,12 @@ format 66 classdiagram 129433 "view" draw_all_relations no 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 - size A4 + size A3 end classdiagram 129561 "controller" draw_all_relations no 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 - size A4 + size A3 end class 129177 "manualCircleControler" @@ -176,7 +176,7 @@ format 66 relation 131481 ---> a role_name "" private classrelation_ref 131481 // - b parent class_ref 129945 // manualContourModel + b parent class_ref 129945 // manualBaseModel end classrelation 131737 // @@ -190,7 +190,7 @@ format 66 relation 133401 ---> a role_name "" private classrelation_ref 133401 // - b parent class_ref 129945 // manualContourModel + b parent class_ref 129945 // manualBaseModel end classrelation 133529 // @@ -225,7 +225,7 @@ format 66 end end - class 129945 "manualContourModel" + class 129945 "manualBaseModel" visibility package cpp_decl "" java_decl "" @@ -234,19 +234,13 @@ format 66 idl_decl "" explicit_switch_type "" - classrelation 133273 // + classrelation 133273 // _lstPoints () relation 133273 ---> - a role_name "" multiplicity "*" private - classrelation_ref 133273 // + a role_name "_lstPoints" multiplicity "*" private + classrelation_ref 133273 // _lstPoints () b parent class_ref 132377 // manualPoint end - classrelation 134297 // - relation 134297 ---> - a role_name "" private - classrelation_ref 134297 // - b parent class_ref 133145 // vtkKochanekSpline - end end class 130073 "manualContourModelBullEye" @@ -265,11 +259,11 @@ format 66 b parent class_ref 130201 // manualContourModelBullEyeSector end - classrelation 133017 // - relation 133017 ---|> + classrelation 129094 // + relation 129094 ---|> a public - classrelation_ref 133017 // - b parent class_ref 129945 // manualContourModel + classrelation_ref 129094 // + b parent class_ref 128198 // manualContourModel end end @@ -282,11 +276,11 @@ format 66 idl_decl "" explicit_switch_type "" - classrelation 133145 // - relation 133145 ---|> + classrelation 129222 // + relation 129222 ---|> a public - classrelation_ref 133145 // - b parent class_ref 129945 // manualContourModel + classrelation_ref 129222 // + b parent class_ref 128198 // manualContourModel end end @@ -299,11 +293,11 @@ format 66 idl_decl "" explicit_switch_type "" - classrelation 132761 // - relation 132761 ---|> + classrelation 128966 // + relation 128966 ---|> a public - classrelation_ref 132761 // - b parent class_ref 129945 // manualContourModel + classrelation_ref 128966 // + b parent class_ref 128198 // manualContourModel end end @@ -316,11 +310,11 @@ format 66 idl_decl "" explicit_switch_type "" - classrelation 132633 // - relation 132633 ---|> + classrelation 128838 // + relation 128838 ---|> a public - classrelation_ref 132633 // - b parent class_ref 129945 // manualContourModel + classrelation_ref 128838 // + b parent class_ref 128198 // manualContourModel end end @@ -333,11 +327,11 @@ format 66 idl_decl "" explicit_switch_type "" - classrelation 132505 // - relation 132505 ---|> + classrelation 128710 // + relation 128710 ---|> a public - classrelation_ref 132505 // - b parent class_ref 129945 // manualContourModel + classrelation_ref 128710 // + b parent class_ref 128198 // manualContourModel end end @@ -442,18 +436,18 @@ format 66 idl_decl "" explicit_switch_type "" - classrelation 130201 // + classrelation 130201 // _lstViewPoints () relation 130201 ---> - a role_name "" multiplicity "*" private - classrelation_ref 130201 // + a role_name "_lstViewPoints" multiplicity "*" private + classrelation_ref 130201 // _lstViewPoints () b parent class_ref 132121 // manualViewPoint end - classrelation 130329 // + classrelation 130329 // _manContModel () relation 130329 ---> - a role_name "" private - classrelation_ref 130329 // - b parent class_ref 129945 // manualContourModel + a role_name "_manContModel" private + classrelation_ref 130329 // _manContModel () + b parent class_ref 129945 // manualBaseModel end classrelation 131609 // @@ -467,21 +461,72 @@ format 66 relation 131865 ---|> a public classrelation_ref 131865 // - b parent class_ref 129945 // manualContourModel + b parent class_ref 129945 // manualBaseModel end classrelation 131993 // relation 131993 ---> a role_name "" private classrelation_ref 131993 // - b parent class_ref 129945 // manualContourModel + b parent class_ref 129945 // manualBaseModel end classrelation 133657 // relation 133657 ---> a role_name "" private classrelation_ref 133657 // - b parent class_ref 129945 // manualContourModel + b parent class_ref 129945 // manualBaseModel + end + + attribute 128838 "_spc" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + attribute 129350 "_pts" + private explicit_type "vtkPoints" + stereotype "*" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + attribute 129478 "_textActor" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + attribute 129606 "_range" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + classrelation 128326 // _wxvtkbaseview () + relation 128326 ---> + a role_name "_wxvtkbaseview" private + classrelation_ref 128326 // _wxvtkbaseview () + b parent class_ref 133017 // wxVtkBaseView + end + + classrelation 128454 // + relation 128454 -_-> + a default + classrelation_ref 128454 // + b parent class_ref 132505 // wxVTKRenderWindowInteractor end end @@ -501,17 +546,17 @@ format 66 b parent class_ref 132249 // manualViewRoi end - classrelation 134041 // + classrelation 134041 // lstSectorBullEye () relation 134041 ---> - a role_name "" private - classrelation_ref 134041 // + a role_name "lstSectorBullEye" multiplicity "*" private + classrelation_ref 134041 // lstSectorBullEye () b parent class_ref 131609 // manualViewBullEyeSector end - classrelation 134169 // - relation 134169 ---> - a role_name "" private - classrelation_ref 134169 // + classrelation 134169 // + relation 134169 -_-> + a private + classrelation_ref 134169 // b parent class_ref 130073 // manualContourModelBullEye end end @@ -566,13 +611,6 @@ format 66 b parent class_ref 131353 // manualViewBaseContour end - classrelation 134553 // - relation 134553 -_-> - a default - classrelation_ref 134553 // - b parent class_ref 132505 // wxVTKRenderWindowInteractor - end - classrelation 134681 // relation 134681 -_-> a default @@ -594,13 +632,6 @@ format 66 b parent class_ref 132761 // vtkActor end - classrelation 135065 // - relation 135065 ---> - a role_name "" private - classrelation_ref 135065 // - b parent class_ref 133017 // wxVtkBaseView - end - classrelation 135193 // relation 135193 ---> a role_name "" private @@ -635,6 +666,86 @@ format 66 idl_decl "" explicit_switch_type "" + attribute 128070 "_colorNormal_r" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + attribute 128198 "_colorNormal_g" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + attribute 128326 "_colorNormal_b" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + attribute 128454 "_colorPosibleSelected_r" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + attribute 128582 "_colorPosibleSelected_g" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + attribute 128710 "_colorPosibleSelected_b" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + attribute 128966 "_spc" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + attribute 129094 "_widthLine" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + attribute 129222 "_pointVtkActor" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end end class 132249 "manualViewRoi" @@ -664,6 +775,95 @@ format 66 explicit_switch_type "" end + + class 128070 "manualViewPoints" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + + classrelation 128070 // + relation 128070 ---|> + a public + classrelation_ref 128070 // + b parent class_ref 131353 // manualViewBaseContour + end + + classrelation 128198 // _copyViewPoints () + relation 128198 ---> + a role_name "_copyViewPoints" multiplicity "*" private + classrelation_ref 128198 // _copyViewPoints () + b parent class_ref 132121 // manualViewPoint + end + end + + class 128198 "manualContourModel" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + + classrelation 128582 // _cntSplineX () + relation 128582 ---> + a role_name "_cntSplineX" private + classrelation_ref 128582 // _cntSplineX () + b parent class_ref 133145 // vtkKochanekSpline + end + + classrelation 129350 // + relation 129350 ---|> + a public + classrelation_ref 129350 // + b parent class_ref 129945 // manualBaseModel + end + + attribute 129734 "_closeContour" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + attribute 129862 "_realSize" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + attribute 129990 "_label" + private explicit_type "string" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + classrelation 129478 // _cntSplineY () + relation 129478 ---> + a role_name "_cntSplineY" private + classrelation_ref 129478 // _cntSplineY () + b parent class_ref 133145 // vtkKochanekSpline + end + + classrelation 129606 // _cntSplineZ () + relation 129606 ---> + a role_name "_cntSplineZ" private + classrelation_ref 129606 // _cntSplineZ () + b parent class_ref 133145 // vtkKochanekSpline + end + end end classview 129305 "maracasVisu" -- 2.45.2