diff --git a/uml/lumiera/128133.diagram b/uml/lumiera/128133.diagram index 1fbd686ec..284608c18 100644 --- a/uml/lumiera/128133.diagram +++ b/uml/lumiera/128133.diagram @@ -173,7 +173,7 @@ relationcanvas 135685 relation_ref 130949 // no_multiplicity_a no_multiplicity_b relationcanvas 135941 relation_ref 131077 // from ref 128261 z 1999 stereotype "<>" xyz 371 893 3000 to ref 135813 - role_a_pos 365 849 3000 no_role_b + role_a_pos 374 844 3000 no_role_b multiplicity_a_pos 451 877 3000 no_multiplicity_b relationcanvas 136069 relation_ref 131205 // from ref 135813 z 1999 to point 433 897 diff --git a/uml/lumiera/128261 b/uml/lumiera/128261 index 0d01de253..d583563a8 100644 --- a/uml/lumiera/128261 +++ b/uml/lumiera/128261 @@ -1,6 +1,6 @@ format 40 "MObject" // ProcessingLayer::MObject - revision 33 + revision 34 modified_by 5 "hiv" // class settings //class diagram settings @@ -436,6 +436,49 @@ ${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl} b multiplicity "" parent class_ref 128389 // Track association_type class_ref 128645 // Placement end + + classrelation 163077 // + relation_ref 158085 // + end + + classrelation 163333 // + relation_ref 158213 // + end + end + + class 146565 "Segmentation" + visibility package + cpp_decl "${comment}${template}class ${name}${inherit} + { +${members} }; +${inlines} +" + java_decl "" + idl_decl "" + explicit_switch_type "" + + classrelation 162821 // + relation 157957 *--> + stereotype "list" + a role_name "" multiplicity "1..*" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; +" + classrelation_ref 162821 // + b multiplicity "" parent class_ref 135173 // Segment + end + + classrelation 163205 // + relation 158213 ---- + stereotype "partitioning" + a role_name "" multiplicity "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 163205 // + b role_name "" multiplicity "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 163333 // + end end class 135173 "Segment" @@ -476,6 +519,16 @@ ${inlines} classrelation_ref 138885 // elements () b multiplicity "" parent class_ref 129797 // ExplicitPlacement end + + classrelation 163589 // + relation 158469 ---> + stereotype "correspondance" + a role_name "" multiplicity "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 163589 // + b multiplicity "" parent class_ref 131461 // RenderGraph + end end class 128389 "Track" diff --git a/uml/lumiera/128389 b/uml/lumiera/128389 index 05bf51f89..49db4297c 100644 --- a/uml/lumiera/128389 +++ b/uml/lumiera/128389 @@ -1,6 +1,6 @@ format 40 "RenderEngine" // ProcessingLayer::RenderEngine - revision 17 + revision 18 modified_by 5 "hiv" // class settings //class diagram settings @@ -126,7 +126,7 @@ ${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl} cpp default " ${comment}${static}${mutable}${volatile}${const}${stereotype}<${type}> ${name}${value}; " classrelation_ref 132485 // renderSegments () - b multiplicity "1" parent class_ref 131461 // Processor + b multiplicity "1" parent class_ref 131461 // RenderGraph end classrelation 136197 // @@ -134,11 +134,11 @@ ${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl} a public cpp default "${type}" classrelation_ref 136197 // - b multiplicity "" parent class_ref 131461 // Processor + b multiplicity "" parent class_ref 131461 // RenderGraph end end - class 131461 "Processor" + class 131461 "RenderGraph" visibility package cpp_decl "${comment}${template}class ${name}${inherit} { @@ -149,13 +149,13 @@ ${inlines} idl_decl "" explicit_switch_type "" - classrelation 132613 // output () + classrelation 132613 // pipes () relation 131973 ---> - stereotype "has_a" - a role_name "output" multiplicity "1" protected + stereotype "list" + a role_name "pipes" multiplicity "1..*" protected cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; " - classrelation_ref 132613 // output () + classrelation_ref 132613 // pipes () b multiplicity "" parent class_ref 131589 // ExitNode end @@ -533,7 +533,6 @@ ${inlines} classrelation_ref 152453 // b multiplicity "" parent class_ref 132741 // State end - end class 142597 "StateAdapter" diff --git a/uml/lumiera/128389.diagram b/uml/lumiera/128389.diagram index da7bca1cb..94ca2c897 100644 --- a/uml/lumiera/128389.diagram +++ b/uml/lumiera/128389.diagram @@ -4,9 +4,9 @@ classcanvas 128005 class_ref 131333 // RenderEngine draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default xyz 175 325 2000 end -classcanvas 128133 class_ref 131461 // Processor +classcanvas 128133 class_ref 131461 // RenderGraph draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default - xyz 276 165 2000 + xyz 267 165 2000 end classcanvas 128389 class_ref 131589 // ExitNode draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default @@ -69,12 +69,12 @@ textcanvas 140037 "the relationcanvas 128261 relation_ref 131845 // from ref 128005 z 1999 stereotype "<>" xyz 178 278 3000 to point 216 200 line 137733 z 1999 to ref 128133 - role_a_pos 184 178 3000 no_role_b - multiplicity_a_pos 249 211 3000 multiplicity_b_pos 202 300 3000 + role_a_pos 175 178 3000 no_role_b + multiplicity_a_pos 240 211 3000 multiplicity_b_pos 202 300 3000 relationcanvas 128901 relation_ref 131973 // - from ref 128133 z 1999 stereotype "<>" xyz 354 342 3000 to ref 128389 - role_a_pos 440 419 3000 no_role_b - multiplicity_a_pos 414 419 3000 no_multiplicity_b + from ref 128133 z 1999 stereotype "<>" xyz 362 375 3000 to ref 128389 + role_a_pos 377 393 3000 no_role_b + multiplicity_a_pos 404 419 3000 no_multiplicity_b relationcanvas 129925 relation_ref 132101 // geometry VHV from ref 128389 z 1999 to point 445 397 diff --git a/uml/lumiera/128901 b/uml/lumiera/128901 index 9a2bf5b90..c6bc6940d 100644 --- a/uml/lumiera/128901 +++ b/uml/lumiera/128901 @@ -1,6 +1,6 @@ format 40 "Builder" // ProcessingLayer::MObject::Builder - revision 17 + revision 18 modified_by 5 "hiv" // class settings //class diagram settings @@ -171,7 +171,7 @@ format 40 end end - classdiagram 129285 "Builder Entities" + classdiagram 129285 "Builder Tool (Visitor)" draw_all_relations default hide_attributes default hide_operations default show_members_full_definition yes show_members_visibility default show_members_stereotype default show_parameter_dir no 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_infonote default shadow default size A4 end @@ -205,6 +205,15 @@ ${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl} comment "Main Operation of the Builder: create a render engine for a given part of the timeline" end + + classrelation 162565 // + relation 157701 ---> + a role_name "" multiplicity "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 162565 // + b multiplicity "" parent class_ref 131077 // Assembler + end end class 130693 "ToolFactory" @@ -240,6 +249,52 @@ ${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl} classrelation_ref 137221 // b multiplicity "" parent class_ref 134149 // BuilderTool end + + classrelation 161797 // + relation 157189 ---> + a role_name "" multiplicity "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 161797 // + b multiplicity "" parent class_ref 134277 // SegmentationTool + end + + classrelation 161925 // + relation 157317 ---> + a role_name "" multiplicity "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 161925 // + b multiplicity "" parent class_ref 134405 // NodeCreatorTool + end + + classrelation 162053 // + relation 157445 ---- + a role_name "" multiplicity "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 162053 // + b role_name "" multiplicity "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 162181 // + end + + classrelation 162437 // + relation_ref 157573 // + end + + classrelation 162949 // + relation 158085 ---- + a role_name "" multiplicity "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 162949 // + b role_name "" multiplicity "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 163077 // + end end class 130821 "ConManager" @@ -269,6 +324,10 @@ ${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl} comment "TODO" end + + classrelation 162181 // + relation_ref 157445 // + end end class 131077 "Assembler" @@ -297,6 +356,18 @@ ${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl} end + + classrelation 162309 // + relation 157573 ---- + a role_name "" multiplicity "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 162309 // + b role_name "" multiplicity "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 162437 // + end end class 132741 "State" @@ -553,6 +624,16 @@ ${class}::${name} ${(}const ${t0}& ${p0}${)}${const}${volatile} ${throw}${static classrelation_ref 146821 // b multiplicity "" parent class_ref 140293 // Applicable end + + classrelation 163461 // + relation 158341 ---> + stereotype "create" + a role_name "" multiplicity "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 163461 // + b multiplicity "" parent class_ref 146565 // Segmentation + end end class 134405 "NodeCreatorTool" @@ -643,7 +724,7 @@ ${class}::${name} ${(}${t0}& ${p0}${)}${const}${volatile} ${throw}${staticnl} end attribute 129797 "proc" - protected type class_ref 131461 // Processor + protected type class_ref 131461 // RenderGraph cpp_decl " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; " java_decl "" @@ -658,6 +739,21 @@ ${class}::${name} ${(}${t0}& ${p0}${)}${const}${volatile} ${throw}${staticnl} classrelation_ref 146949 // b multiplicity "" parent class_ref 140293 // Applicable end + + classrelation 162693 // + relation 157829 ---> + stereotype "create" + a role_name "" multiplicity "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 162693 // + b multiplicity "" parent class_ref 131461 // RenderGraph + end + end + + classdiagram 132868 "Builder Entities" + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default + size A4 end end end diff --git a/uml/lumiera/129285.diagram b/uml/lumiera/129285.diagram index 0dbfb65e7..90c337f61 100644 --- a/uml/lumiera/129285.diagram +++ b/uml/lumiera/129285.diagram @@ -141,6 +141,14 @@ relationcanvas 136709 relation_ref 144773 // line 136837 z 2003 to ref 135557 no_role_a no_role_b no_multiplicity_a no_multiplicity_b +relationcanvas 137989 relation_ref 157189 // + from ref 128645 z 1999 to ref 130565 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 138117 relation_ref 157317 // + from ref 128645 z 1999 to ref 130949 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b line 131461 -_-_ from ref 130565 z 1999 to point 302 530 line 132101 z 1999 to point 265 528 diff --git a/uml/lumiera/129925.diagram b/uml/lumiera/129925.diagram deleted file mode 100644 index 357ca1d90..000000000 --- a/uml/lumiera/129925.diagram +++ /dev/null @@ -1,5 +0,0 @@ -format 38 - -artifactcanvas 128005 artifact_ref 128261 // mobject - xyz 123 127 2000 -end diff --git a/uml/lumiera/130309 b/uml/lumiera/130309 index e89c34727..90b1618b3 100644 --- a/uml/lumiera/130309 +++ b/uml/lumiera/130309 @@ -1,6 +1,6 @@ format 40 "engine" // design::codegen::proc::engine - revision 9 + revision 10 modified_by 5 "hiv" // class settings //class diagram settings @@ -77,7 +77,7 @@ ${namespace_end}" comment "a complete network of processing nodes usable for rendering" end - artifact 132101 "processor" + artifact 132101 "rendergraph" stereotype "source" cpp_h "/* ${NAME}.hpp - ${description} @@ -111,7 +111,7 @@ ${namespace_start} ${members} ${namespace_end}" associated_classes - class_ref 131461 // Processor + class_ref 131461 // RenderGraph end comment "a single render pipeline for one segment of the timeline" end diff --git a/uml/lumiera/132868.diagram b/uml/lumiera/132868.diagram new file mode 100644 index 000000000..448280cfa --- /dev/null +++ b/uml/lumiera/132868.diagram @@ -0,0 +1,124 @@ +format 40 + +classcanvas 128005 class_ref 131333 // RenderEngine + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default + xyz 61 564 2000 + end +classcanvas 128133 class_ref 131461 // RenderGraph + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default + xyz 220 458 2004 + end +classcanvas 128517 class_ref 131589 // ExitNode + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default + xyz 382 586 3005 + end +classcanvas 128773 class_ref 145541 // Timeline + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default + xyz 88 47 2000 + end +classcanvas 128901 class_ref 128261 // Fixture + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default + xyz 56 148 2000 + end +classcanvas 129029 class_ref 135173 // Segment + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default + xyz 218 304 2000 + end +classcanvas 129157 class_ref 146565 // Segmentation + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default + xyz 74 266 2000 + end +classcanvas 129541 class_ref 130693 // ToolFactory + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default + xyz 561 157 2000 + end +classcanvas 129669 class_ref 131077 // Assembler + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default + xyz 444 94 2000 + end +classcanvas 129797 class_ref 134277 // SegmentationTool + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default + xyz 481 293 2004 + end +classcanvas 130053 class_ref 134405 // NodeCreatorTool + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default + xyz 596 324 2000 + end +classcanvas 130181 class_ref 130821 // ConManager + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default + xyz 670 536 2000 + end +classcanvas 130309 class_ref 130565 // BuilderFacade + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default + xyz 576 51 2000 + end +textcanvas 132101 "for each Timeline (top level)" + xyzwh 124 96 2000 136 18 +relationcanvas 128261 relation_ref 131845 // + from ref 128005 z 1999 stereotype "<>" xyz 84 529 3000 to point 100 494 + line 129285 z 1999 to ref 128133 + role_a_pos 128 472 3000 no_role_b + multiplicity_a_pos 193 505 3000 multiplicity_b_pos 87 539 3000 +relationcanvas 128389 relation_ref 134789 // + geometry HV + from ref 128005 z 1999 to point 259 590 + line 129413 z 1999 to ref 128133 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 128645 relation_ref 131973 // + from ref 128133 z 1999 stereotype "<>" xyz 324 555 3000 to ref 128517 + role_a_pos 330 574 3000 no_role_b + multiplicity_a_pos 342 593 3000 no_multiplicity_b +relationcanvas 129925 relation_ref 137221 // + from ref 129797 z 1999 stereotype "<>" xyz 359 341 3000 to ref 129029 + role_a_pos 286 317 3000 no_role_b + multiplicity_a_pos 286 350 3000 no_multiplicity_b +relationcanvas 130437 relation_ref 157189 // + from ref 129541 z 1999 to ref 129797 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 130565 relation_ref 157317 // + from ref 129541 z 1999 to ref 130053 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 130821 relation_ref 157445 // + from ref 129541 z 1999 to point 712 254 + line 130949 z 1999 to ref 130181 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 131077 relation_ref 157573 // + from ref 129669 z 1999 to ref 129541 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 131205 relation_ref 157701 // + from ref 130309 z 1999 to ref 129669 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 131589 relation_ref 157829 // + from ref 130053 z 1999 stereotype "<>" xyz 419 446 3000 to ref 128133 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 131717 relation_ref 157957 // + from ref 129157 z 1999 stereotype "<>" xyz 158 317 3000 to ref 129029 + no_role_a no_role_b + multiplicity_a_pos 191 341 3000 no_multiplicity_b +relationcanvas 131845 relation_ref 158085 // + from ref 129541 z 1999 to ref 128901 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 132229 relation_ref 158213 // + from ref 129157 z 1999 stereotype "<>" xyz 113 233 3000 to ref 128901 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 132485 relation_ref 158341 // + from ref 129797 z 1999 stereotype "<>" xyz 373 274 3000 to point 357 284 + line 132613 z 1999 to ref 129157 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 132741 relation_ref 158469 // + from ref 129029 z 1999 stereotype "<>" xyz 201 411 3000 to ref 128133 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +line 131973 -_-_ + from ref 128773 z 1999 to ref 128901 +end