From 9dc30144cdc21a364c7fa78e51959e44567d8c04 Mon Sep 17 00:00:00 2001 From: fabian Date: Wed, 24 Nov 2021 15:21:44 +0100 Subject: [PATCH] cleaned up diagram --- models/12.session | 12 +++ models/128012.diagram | 189 +++++++++++++++++++++--------------------- models/models.prj | 146 +++++++++++++++++--------------- 3 files changed, 184 insertions(+), 163 deletions(-) create mode 100644 models/12.session diff --git a/models/12.session b/models/12.session new file mode 100644 index 0000000..984fc1f --- /dev/null +++ b/models/12.session @@ -0,0 +1,12 @@ +window_sizes 2560 1475 332 2218 1324 78 + +diagrams + active classdiagram_ref 128012 // domain-model + 2207 1263 200 A-Landscape 72 0 +end +show_stereotypes +selected classdiagram_ref 128012 // domain-model +open + classview_ref 128012 // domain +end +end diff --git a/models/128012.diagram b/models/128012.diagram index ac62211..ed0ff40 100644 --- a/models/128012.diagram +++ b/models/128012.diagram @@ -2,171 +2,171 @@ format 224 classcanvas 128008 class_ref 128008 // Menu classdiagramsettings member_max_width 0 end - xyz 679.9 439.7 2000 + xyz 902.24 520.98 2000 end classcanvas 128136 class_ref 128136 // Potrawa classdiagramsettings member_max_width 0 end - xyzwh 434 323.6 2000 85 53 + xyzwh 677.6 382.76 2000 118 77 end classcanvas 128264 class_ref 128264 // Zamowienie classdiagramsettings member_max_width 0 end - xyz 445.6 219.9 2000 + xyz 684.34 202.24 2000 end classcanvas 128392 class_ref 128392 // Platnosc classdiagramsettings member_max_width 0 end - xyzwh 442.1 80.6 2000 67 53 + xyzwh 671.84 59.38 2000 125 77 end classcanvas 128520 class_ref 128520 // Kelner classdiagramsettings member_max_width 0 end - xyz 274.8 260 2000 + xyz 303.16 253.22 2000 end classcanvas 128904 class_ref 128904 // Produkt classdiagramsettings member_max_width 0 end - xyzwh 435.8 444.4 2000 84 41 + xyzwh 694.9 546.02 2000 87 57 end classcanvas 129032 class_ref 129032 // Spizarnia classdiagramsettings member_max_width 0 end - xyz 312.5 404 2000 + xyz 231.42 555.38 2000 end classcanvas 129160 class_ref 129160 // Kuchnia classdiagramsettings member_max_width 0 end - xyz 273.4 187.4 2000 + xyz 468 192.56 2000 end classcanvas 129672 class_ref 135688 // Klient classdiagramsettings member_max_width 0 end - xyz 170.8 320.2 2000 + xyz 406.52 364.54 2000 end classcanvas 129800 class_ref 135816 // Kucharz classdiagramsettings member_max_width 0 end - xyz 154 186.4 2000 + xyz 299.18 192.38 2000 end classcanvas 129928 class_ref 135944 // Kasa classdiagramsettings member_max_width 0 end - xyz 277.6 87.2 2000 + xyz 460.5 71.72 2000 end classcanvas 130056 class_ref 136072 // Kasjer classdiagramsettings member_max_width 0 end - xyz 154.6 89 2000 + xyz 304.16 77.16 2000 end classcanvas 130312 class_ref 136328 // PracownikSpizarni classdiagramsettings member_max_width 0 end - xyz 143.2 403.4 2000 + xyz 205.52 426.72 2000 +end +classcanvas 130444 class_ref 128012 // Miara + classdiagramsettings member_max_width 0 end + xyz 465 499 2000 end classcanvas 134408 class_ref 142856 // PlatnoscKarta classdiagramsettings member_max_width 0 end - xyz 569.8 68 2000 + xyz 870.3 51.02 2000 end classcanvas 134536 class_ref 142984 // PlatnoscGotowka classdiagramsettings member_max_width 0 end - xyz 569.4 120.2 2000 + xyz 862.5 110.34 2000 end classcanvas 136584 class_ref 143240 // PotrawaNiestandardowa classdiagramsettings member_max_width 0 end - xyz 592.4 309.8 2000 + xyz 859.76 370.28 2000 end classcanvas 136712 class_ref 143368 // PotrawaStandardowa classdiagramsettings member_max_width 0 end - xyz 595.6 361.2 2000 + xyz 869.98 430.8 2000 end classcanvas 137352 class_ref 143496 // Pracownik classdiagramsettings member_max_width 0 end - xyzwh -10.6 207.6 2005 105 77 + xyzwh 11.96 192.82 2005 203 106 end classcanvas 140808 class_ref 143624 // IloscProduktu classdiagramsettings member_max_width 0 end - xyz 339 540.2 2000 + xyz 418.32 543.38 2000 end classcanvas 142600 class_ref 143752 // Data classdiagramsettings member_max_width 0 end - xyz 781 77 2000 + xyz 45.46 495.56 2000 end classcanvas 142728 class_ref 143880 // Wartosc classdiagramsettings member_max_width 0 end - xyz 782 115 2000 + xyz 37.32 540.84 2000 end classcanvas 142856 class_ref 144008 // NumerKonta classdiagramsettings member_max_width 0 end - xyz 783 154 2000 + xyz 13.72 304.18 2000 end classcanvas 142984 class_ref 144136 // NumerTelefonu classdiagramsettings member_max_width 0 end - xyz 783 193 2000 + xyz 13 349.32 2000 end classcanvas 143112 class_ref 144264 // StanZamowienia classdiagramsettings member_max_width 0 end - xyz 784 233 2000 + xyz 789.5 222.12 2000 end -relationcanvas 130440 relation_ref 128264 // Jest obslugiwana - decenter_begin 529 - from ref 130312 z 2001 label "Jest obslugiwana" italic max_width 255 xyz 238.5 408.5 2001 to ref 129032 +relationcanvas 130440 relation_ref 128264 // Obsluguje + decenter_begin 379 + decenter_end 282 + from ref 130312 z 2001 label "Obsluguje" italic max_width 255 xyz 260 501 2001 to ref 129032 no_role_a no_role_b - multiplicity_a_pos 303 426 3000 multiplicity_b_pos 230 426 3000 + multiplicity_a_pos 238 539 3000 multiplicity_b_pos 227 472 3000 end -relationcanvas 130824 relation_ref 128648 // Jest dodatkiem - decenter_begin 293 - decenter_end 268 - from ref 128136 z 2001 label "Jest dodatkiem" italic max_width 255 xyz 400.5 402.5 2001 to ref 128904 +relationcanvas 130824 relation_ref 128648 // > Jest dodatkiem + decenter_begin 317 + decenter_end 231 + from ref 128136 z 2001 label "> Jest dodatkiem" italic max_width 255 xyz 612 492 2001 to ref 128904 no_role_a no_role_b - multiplicity_a_pos 450 433 3000 multiplicity_b_pos 451 379 3000 + multiplicity_a_pos 706 529 3000 multiplicity_b_pos 706 466 3000 end -relationcanvas 130952 relation_ref 128776 // Jest skladnikiem - decenter_begin 737 - decenter_end 757 - from ref 128904 z 2001 label "Jest skladnikiem" italic max_width 255 xyz 504.5 402 2001 to ref 128136 +relationcanvas 130952 relation_ref 128776 // > Jest skladnikiem + decenter_begin 736 + decenter_end 672 + from ref 128904 z 2001 label "> Jest skladnikiem" italic max_width 255 xyz 767 493 2001 to ref 128136 no_role_a no_role_b - multiplicity_a_pos 490 379 3000 multiplicity_b_pos 481 433 3000 + multiplicity_a_pos 748 466 3000 multiplicity_b_pos 735 529 3000 end -relationcanvas 131592 relation_ref 129032 // from ref 134408 z 2001 to ref 128392 @@ -179,64 +179,61 @@ relationcanvas 134920 relation_ref 137224 // no_multiplicity_a no_multiplicity_b end relationcanvas 136840 relation_ref 137352 // + decenter_begin 532 from ref 136584 z 2001 to ref 128136 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 136968 relation_ref 137480 // + decenter_begin 425 from ref 136712 z 2001 to ref 128136 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 137224 relation_ref 137736 // < Zawiera - from ref 128008 z 2001 label "< Zawiera" italic max_width 255 xyz 630 413 3000 to ref 136712 +relationcanvas 137224 relation_ref 137736 // Jest zawarta w + decenter_begin 344 + decenter_end 342 + from ref 128008 z 2001 label "Jest zawarta w" italic max_width 255 xyz 927 489.5 2001 to ref 136712 no_role_a no_role_b - multiplicity_a_pos 648 399 3000 multiplicity_b_pos 676 428 3000 + multiplicity_a_pos 907 476 3000 multiplicity_b_pos 906 503 3000 end relationcanvas 137480 relation_ref 137864 // - geometry HVH unfixed - decenter_end 200 - from ref 130056 z 2006 to point 120 104 - line 141832 z 2006 to point 120 220 - line 141960 z 2006 to ref 137352 + geometry VHr + from ref 130056 z 2006 to point 109 93 + line 130060 z 2006 to ref 137352 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 137608 relation_ref 137992 // - geometry HVH unfixed - decenter_end 412 - from ref 129800 z 2006 to point 131 203 - line 142344 z 2006 to point 131 236 - line 142472 z 2006 to ref 137352 + decenter_begin 493 + decenter_end 174 + from ref 129800 z 2006 to ref 137352 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 137736 relation_ref 138120 // - geometry HVH unfixed - decenter_end 612 - from ref 128520 z 2006 to point 131 275 - line 143240 z 2006 to point 131 252 - line 143368 z 2006 to ref 137352 + decenter_begin 333 + decenter_end 705 + from ref 128520 z 2006 to ref 137352 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 138888 relation_ref 138248 // - geometry HVH unfixed - decenter_end 800 - from ref 130312 z 2006 to point 112 420 - line 143496 z 2006 to point 112 266 - line 143624 z 2006 to ref 137352 + geometry VHr + decenter_end 722 + from ref 130312 z 2006 to point 155 444 + line 130316 z 2006 to ref 137352 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 140936 relation_ref 138376 // Przechowuje - from ref 129032 z 2001 label "Przechowuje" italic max_width 255 xyz 334 488.5 3000 to ref 140808 + from ref 129032 z 2001 label "Przechowuje" italic max_width 255 xyz 320 558 2001 to ref 140808 no_role_a no_role_b - multiplicity_a_pos 355 529 3000 multiplicity_b_pos 331 442 3000 + multiplicity_a_pos 408 583 3000 multiplicity_b_pos 301 582 3000 end relationcanvas 141064 relation_ref 138504 // Zapisuje informacje o licznosci - from ref 140808 z 2001 label "Zapisuje informacje o licznosci" italic max_width 255 xyz 373.5 507.5 3000 to ref 128904 + from ref 140808 z 2001 label "Zapisuje informacje o licznosci" italic max_width 255 xyz 524.5 558.5 2001 to ref 128904 no_role_a no_role_b - multiplicity_a_pos 446 484 3000 multiplicity_b_pos 402 541 3000 + multiplicity_a_pos 683 582 3000 multiplicity_b_pos 515 584 3000 end end diff --git a/models/models.prj b/models/models.prj index d374e0a..2998a58 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ format 224 "models" - revision 5 - modified_by 8 "s452662" + revision 6 + modified_by 12 "fabian" @@ -36,7 +36,7 @@ format 224 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 generalization_color black dpi 72 - font_size 6 + font_size 5 diagram_format A4 image_root_dir "" @@ -87,12 +87,12 @@ format 224 classrelation_ref 140040 // end - classrelation 140168 // (< Zawiera) - relation 137736 ---- name "< Zawiera" + classrelation 140168 // (Jest zawarta w) + relation 137736 ---- name "Jest zawarta w" a role_name "" multiplicity "*" private - classrelation_ref 140168 // (< Zawiera) + classrelation_ref 140168 // (Jest zawarta w) b role_name "" multiplicity "1" private - classrelation_ref 140296 // (< Zawiera) + classrelation_ref 140296 // (Jest zawarta w) end end @@ -106,24 +106,24 @@ format 224 explicit_switch_type "" mysql_decl "" - classrelation 129288 // (Jest dodatkiem) - relation 128648 ---- name "Jest dodatkiem" + classrelation 129288 // (> Jest dodatkiem) + relation 128648 ---- name "> Jest dodatkiem" a role_name "" multiplicity "*" private - classrelation_ref 129288 // (Jest dodatkiem) + classrelation_ref 129288 // (> Jest dodatkiem) b role_name "" multiplicity "*" private - classrelation_ref 129416 // (Jest dodatkiem) + classrelation_ref 129416 // (> Jest dodatkiem) end - classrelation 129672 // Jest skladnikiem - relation_ref 128776 // Jest skladnikiem + classrelation 129672 // (> Jest skladnikiem) + relation_ref 128776 // > Jest skladnikiem end - classrelation 130184 // @@ -288,8 +288,8 @@ format 224 explicit_switch_type "" mysql_decl "" - classrelation 130440 // (Jest zarzadzane) - relation_ref 129160 // Jest zarzadzane + classrelation 130440 // (Zarzadza) + relation_ref 129160 // Zarzadza end classrelation 130568 // (Obsluguje) @@ -326,24 +326,24 @@ format 224 classrelation_ref 128904 // (Jest przechowywany) end - classrelation 129416 // (Jest dodatkiem) - relation_ref 128648 // Jest dodatkiem + classrelation 129416 // (> Jest dodatkiem) + relation_ref 128648 // > Jest dodatkiem end - classrelation 129544 // (Jest skladnikiem) - relation 128776 ---- name "Jest skladnikiem" + classrelation 129544 // (> Jest skladnikiem) + relation 128776 ---- name "> Jest skladnikiem" a role_name "" multiplicity "*" private - classrelation_ref 129544 // (Jest skladnikiem) + classrelation_ref 129544 // (> Jest skladnikiem) b role_name "" multiplicity "1..*" private - classrelation_ref 129672 // Jest skladnikiem + classrelation_ref 129672 // (> Jest skladnikiem) end - classrelation 141320 // (Zapisuje informacje o licznosci) + classrelation 141320 // Zapisuje informacje o licznosci relation_ref 138504 // Zapisuje informacje o licznosci end attribute 129800 "nazwa" - private explicit_type "" + private explicit_type "string" cpp_decl "" java_decl "" php_decl "" @@ -364,8 +364,8 @@ format 224 explicit_switch_type "" mysql_decl "" - classrelation 128648 // (Jest obslugiwana) - relation_ref 128264 // Jest obslugiwana + classrelation 128648 // (Obsluguje) + relation_ref 128264 // Obsluguje end classrelation 128904 // (Jest przechowywany) @@ -455,20 +455,20 @@ format 224 explicit_switch_type "" mysql_decl "" - classrelation 131720 // ( @@ -511,12 +511,12 @@ format 224 explicit_switch_type "" mysql_decl "" - classrelation 128520 // (Jest obslugiwana) - relation 128264 ---- name "Jest obslugiwana" + classrelation 128520 // (Obsluguje) + relation 128264 ---- name "Obsluguje" a role_name "" multiplicity "1" private - classrelation_ref 128520 // (Jest obslugiwana) + classrelation_ref 128520 // (Obsluguje) b role_name "" multiplicity "1..*" private - classrelation_ref 128648 // (Jest obslugiwana) + classrelation_ref 128648 // (Obsluguje) end classrelation 140808 // @@ -610,8 +610,8 @@ format 224 relation_ref 137608 // end - classrelation 140296 // (< Zawiera) - relation_ref 137736 // < Zawiera + classrelation 140296 // (Jest zawarta w) + relation_ref 137736 // Jest zawarta w end end @@ -659,7 +659,7 @@ format 224 end attribute 128776 "numerTelefonu" - private explicit_type "" + private type class_ref 144136 // NumerTelefonu cpp_decl "" java_decl "" php_decl "" @@ -689,11 +689,11 @@ format 224 a role_name "" multiplicity "1" private classrelation_ref 141192 // (Zapisuje informacje o licznosci) b role_name "" multiplicity "1" private - classrelation_ref 141320 // (Zapisuje informacje o licznosci) + classrelation_ref 141320 // Zapisuje informacje o licznosci end attribute 129288 "ilosc" - private explicit_type "" + private explicit_type "int" cpp_decl "" java_decl "" php_decl "" @@ -704,7 +704,7 @@ format 224 end attribute 129416 "miara" - private explicit_type "" + private explicit_type "Miara" cpp_decl "" java_decl "" php_decl "" @@ -774,5 +774,17 @@ format 224 mysql_decl "" end + + class 128012 "Miara" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end end end