X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fdoxygen%2Fbouml%2FThresholdImageView%2FThresholdImageView%2F128002.diagram;h=12f8a922549a5d0f4a1419affefe8aec4674768a;hb=5c3e922bb300234023b24e53d2dc57d66c015ce8;hp=93d780c0a41c296728282ef01eabd0c7e3fbeda8;hpb=144ccdff8b8015203353995462efbde72e77fea5;p=creaMaracasVisu.git diff --git a/lib/doxygen/bouml/ThresholdImageView/ThresholdImageView/128002.diagram b/lib/doxygen/bouml/ThresholdImageView/ThresholdImageView/128002.diagram index 93d780c..12f8a92 100644 --- a/lib/doxygen/bouml/ThresholdImageView/ThresholdImageView/128002.diagram +++ b/lib/doxygen/bouml/ThresholdImageView/ThresholdImageView/128002.diagram @@ -1,72 +1,72 @@ -format 73 +format 75 classcanvas 128002 class_ref 128002 // ThresholdImageViewPanel - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default xyz 150.6 593.4 2000 end classcanvas 128130 class_ref 128130 // wxPanel - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color mediumgreen xyz 337.3 465.2 2000 end classcanvas 128386 class_ref 128258 // ThresholdImageView - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default xyz 116.3 387 2005 end classcanvas 128642 class_ref 128386 // LayerImageBase - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 328.7 230.7 2000 + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + xyz 395.2 224.1 2000 end classcanvas 128898 class_ref 128514 // ColorLayerImageViewPanel - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 533.8 589.5 2000 + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + xyz 533.8 590.6 2000 end classcanvas 129154 class_ref 128642 // ColorLayerImageView - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 517.7 387 2000 + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + xyz 517 386.3 2000 end classcanvas 130306 class_ref 128770 // wxVtkBaseView - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color gold - xyz 88.1 230.7 2000 + xyz 80.5 227 2000 end classcanvas 130562 class_ref 128898 // mBarRange - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default xyz 71.5 451.6 2000 end classcanvas 130818 class_ref 129026 // wxDlgTransformByDimensionBySpacingByPixel - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 425.2 311.6 2000 + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + xyz 538.7 330.1 2000 end classcanvas 131074 class_ref 129154 // vtkImageData - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color darkblue - xyz 522.5 46.1 2000 + xyz 595.1 93.8 2000 end classcanvas 131330 class_ref 129282 // vtkImageReslice - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color darkblue - xyz 569.6 94.3 2000 + xyz 618 130 2000 end classcanvas 131586 class_ref 129410 // vtkLookupTable - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color darkblue - xyz 611.8 142.5 2000 + xyz 617.4 168.6 2000 end classcanvas 131714 class_ref 129538 // vtkImageMapToColors - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color darkblue - xyz 608.4 199.8 2011 + xyz 616.7 204.3 2011 end classcanvas 131842 class_ref 129666 // vtkImageActor - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color darkblue - xyz 614 254.3 2006 + xyz 617.9 242.4 2006 end note 132482 "wxVtkViewer Class Diagram 1" - xyzwh 85.4 113.7 2000 163 81 + xyzwh 15.7 63.2 2000 194 34 classcanvas 132738 class_ref 136194 // bbcreaMaracasVisuColorLayerImageView - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color lightorange xyz 271.4 911.5 2005 end @@ -75,12 +75,12 @@ note 132866 "Inputs of the box" note 133122 "Output of the box" xyzwh 660.5 912.8 2000 163 39 classcanvas 133890 class_ref 136322 // wxWindow - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color mediumgreen xyz 327.4 391.6 2000 end classcanvas 136066 class_ref 136450 // bbcreaMaracasVisuThresholdImageView - draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color lightorange xyz 81.8 663.2 2012 end @@ -92,8 +92,42 @@ note 139138 "Output of the box xyzwh 378 732 2000 97 66 note 139778 "This box is missing.. EED" xyzwh 177 765.8 2000 148 72 +classcanvas 140034 class_ref 142978 // vtkScalarBarActor + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + color darkblue + xyz 614.6 282.1 2011 +end +classcanvas 140290 class_ref 143106 // ColorLayerObserver + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + xyz 337.2 118.5 2006 +end +classcanvas 140546 class_ref 143234 // vtkCommand + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + color darkblue + xyz 358.1 62.5 2000 +end +classcanvas 140802 class_ref 149762 // vtkBaseData + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + color gold + xyz 189.1 164.8 2006 +end +classcanvas 141058 class_ref 149890 // vtkObject + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + color darkblue + xyz 266.9 62.5 2000 +end +note 141570 "Observable +" + xyzwh 182.2 3.8 2000 99 34 +note 141826 "Observer +" + xyzwh 407.2 3.6 2005 110 34 +classcanvas 142978 class_ref 150018 // ColorLayerImageViewManager + draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default + xyz 545.9 463 2006 +end relationcanvas 128258 relation_ref 128002 // - from ref 128002 z 2001 to point 374.8 542.2 + from ref 128002 z 2001 to point 374.6 542.4 line 135938 z 2001 to ref 128130 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -104,28 +138,23 @@ relationcanvas 128514 relation_ref 128130 // no_multiplicity_a no_multiplicity_b end relationcanvas 128770 relation_ref 128258 // - from ref 128386 z 2006 to point 400.6 359.8 + from ref 128386 z 2006 to point 447.2 354.1 line 135170 z 2006 to ref 128642 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 129026 relation_ref 128386 // - from ref 128898 z 2001 to point 374.8 543 + from ref 128898 z 2001 to point 374.6 543.5 line 135810 z 2001 to ref 128130 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 129282 relation_ref 128514 // - from ref 129154 z 2001 to point 400.6 359.8 + from ref 129154 z 2001 to point 447.2 352.1 line 135042 z 2001 to ref 128642 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 129410 relation_ref 128642 // - from ref 128898 z 2001 to ref 129154 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end relationcanvas 130434 relation_ref 128770 // from ref 128642 z 2001 to ref 130306 no_role_a no_role_b @@ -137,9 +166,9 @@ relationcanvas 130690 relation_ref 128898 // no_multiplicity_a no_multiplicity_b end relationcanvas 130946 relation_ref 129026 // - from ref 128898 z 2001 to point 784.8 539.8 - line 135426 z 2001 to point 783 366.4 - line 135554 z 2001 to ref 130818 + from ref 128898 z 2001 to point 742 551.7 + line 135426 z 2001 to point 742 452 + line 143746 z 2001 to ref 130818 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -169,8 +198,8 @@ relationcanvas 132226 relation_ref 129666 // no_multiplicity_a no_multiplicity_b end relationcanvas 133378 relation_ref 136194 // - from ref 132738 z 2006 to point 22.2 871.4 - line 133506 z 2006 to point 23 250.6 + from ref 132738 z 2006 to point 22.4 871.3 + line 133506 z 2006 to point 23.5 250.2 line 133762 z 2006 to ref 130306 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -181,14 +210,14 @@ relationcanvas 134018 relation_ref 136322 // no_multiplicity_a no_multiplicity_b end relationcanvas 134146 relation_ref 136450 // - from ref 132738 z 2006 to point 508 809.8 - line 138242 z 2006 to point 461.4 427.2 + from ref 132738 z 2006 to point 510.4 812.2 + line 138242 z 2006 to point 461.3 427.9 line 134402 z 2006 to ref 133890 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 134914 relation_ref 136706 // - from ref 132738 z 2006 to point 675.6 849.8 + from ref 132738 z 2006 to point 675.7 849.1 line 138882 z 2006 to ref 128898 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -199,19 +228,60 @@ relationcanvas 136834 relation_ref 137090 // no_multiplicity_a no_multiplicity_b end relationcanvas 137090 relation_ref 137218 // - from ref 136066 z 2013 to point 493 681.4 - line 137858 z 2013 to point 460.6 427.2 + from ref 136066 z 2013 to point 493.5 681.3 + line 137858 z 2013 to point 461.9 427.9 line 138498 z 2013 to ref 133890 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 137474 relation_ref 137474 // - from ref 136066 z 2013 to point 23 676.4 - line 138754 z 2013 to point 23 249.8 + from ref 136066 z 2013 to point 23.5 676.8 + line 138754 z 2013 to point 23.5 249.1 line 138626 z 2013 to ref 130306 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end +relationcanvas 140162 relation_ref 144002 // + from ref 128642 z 2012 to ref 140034 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 140418 relation_ref 144130 // + from ref 140290 z 2007 to point 479 134 + line 143874 z 2007 to ref 128642 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 140674 relation_ref 144258 // + from ref 140290 z 2007 to ref 140546 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 140930 relation_ref 150786 // + from ref 130306 z 2007 to ref 140802 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 141186 relation_ref 150914 // + from ref 140802 z 2007 to ref 141058 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 141314 relation_ref 151042 // + from ref 141058 z 2001 to ref 140546 + no_role_a no_role_b + multiplicity_a_pos 343 86 3000 no_multiplicity_b +end +relationcanvas 143106 relation_ref 151170 // + from ref 128898 z 2007 to ref 142978 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 143234 relation_ref 151298 // + from ref 142978 z 2007 to ref 129154 + no_role_a no_role_b + multiplicity_a_pos 586 427 3000 no_multiplicity_b +end line 132610 -_-_ from ref 132482 z 2001 to ref 130306 line 132994 -_-_ @@ -232,4 +302,13 @@ line 139650 -_-_ from ref 139010 z 2014 to ref 137474 line 139906 -_-_ from ref 139778 z 2013 to ref 136066 +line 141442 -_-_ + from ref 132482 z 2007 to ref 140802 +line 142082 -_-_ + from ref 141826 z 2007 to point 459.2 97.8 + line 142850 z 2007 to ref 140290 +line 142722 -_-_ + from ref 141570 z 2006 to ref 141826 +line 143618 -_-_ + from ref 141570 z 2007 to ref 140802 end