diff --git a/.gitignore b/.gitignore index 39e3358..61f2799 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea -.vs \ No newline at end of file +.vs +*.session \ No newline at end of file diff --git a/models/128012.diagram b/models/128012.diagram index ed0ff40..8f7f18e 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 902.24 520.98 2000 + xyz 902.44 516.48 2000 end classcanvas 128136 class_ref 128136 // Potrawa classdiagramsettings member_max_width 0 end - xyzwh 677.6 382.76 2000 118 77 + xyzwh 678.4 382.76 2000 118 77 end classcanvas 128264 class_ref 128264 // Zamowienie classdiagramsettings member_max_width 0 end - xyz 684.34 202.24 2000 + xyz 664.44 186.04 2000 end classcanvas 128392 class_ref 128392 // Platnosc classdiagramsettings member_max_width 0 end - xyzwh 671.84 59.38 2000 125 77 + xyzwh 671.74 59.48 2000 125 77 end classcanvas 128520 class_ref 128520 // Kelner classdiagramsettings member_max_width 0 end - xyz 303.16 253.22 2000 + xyz 301.66 249.62 2000 end classcanvas 128904 class_ref 128904 // Produkt classdiagramsettings member_max_width 0 end - xyzwh 694.9 546.02 2000 87 57 + xyzwh 691 546.22 2000 93 57 end classcanvas 129032 class_ref 129032 // Spizarnia classdiagramsettings member_max_width 0 end - xyz 231.42 555.38 2000 + xyz 222.32 551.38 2000 end classcanvas 129160 class_ref 129160 // Kuchnia classdiagramsettings member_max_width 0 end - xyz 468 192.56 2000 + xyz 463 188.66 2000 end classcanvas 129672 class_ref 135688 // Klient classdiagramsettings member_max_width 0 end - xyz 406.52 364.54 2000 + xyz 406.92 360.24 2000 end classcanvas 129800 class_ref 135816 // Kucharz classdiagramsettings member_max_width 0 end - xyz 299.18 192.38 2000 + xyz 293.48 188.48 2000 end classcanvas 129928 class_ref 135944 // Kasa classdiagramsettings member_max_width 0 end - xyz 460.5 71.72 2000 + xyz 451.1 63.82 2000 end classcanvas 130056 class_ref 136072 // Kasjer classdiagramsettings member_max_width 0 end - xyz 304.16 77.16 2000 + xyz 303.96 73.76 2000 end classcanvas 130312 class_ref 136328 // PracownikSpizarni classdiagramsettings member_max_width 0 end - xyz 205.52 426.72 2000 + xyz 176.42 422.02 2000 end classcanvas 130444 class_ref 128012 // Miara classdiagramsettings member_max_width 0 end - xyz 465 499 2000 + xyz 465.1 495.2 2000 end classcanvas 134408 class_ref 142856 // PlatnoscKarta classdiagramsettings member_max_width 0 end - xyz 870.3 51.02 2000 + xyz 850.2 47.82 2000 end classcanvas 134536 class_ref 142984 // PlatnoscGotowka classdiagramsettings member_max_width 0 end - xyz 862.5 110.34 2000 + xyz 835.2 106.84 2000 end classcanvas 136584 class_ref 143240 // PotrawaNiestandardowa classdiagramsettings member_max_width 0 end - xyz 859.76 370.28 2000 + xyz 822.26 366.78 2000 end classcanvas 136712 class_ref 143368 // PotrawaStandardowa classdiagramsettings member_max_width 0 end - xyz 869.98 430.8 2000 + xyz 837.28 426.3 2000 end classcanvas 137352 class_ref 143496 // Pracownik classdiagramsettings member_max_width 0 end - xyzwh 11.96 192.82 2005 203 106 + xyzwh 11.56 192.32 2005 203 107 end classcanvas 140808 class_ref 143624 // IloscProduktu classdiagramsettings member_max_width 0 end - xyz 418.32 543.38 2000 + xyz 396.32 531.28 2000 end classcanvas 142600 class_ref 143752 // Data classdiagramsettings member_max_width 0 end - xyz 45.46 495.56 2000 + xyz 45.56 491.56 2000 end classcanvas 142728 class_ref 143880 // Wartosc classdiagramsettings member_max_width 0 end - xyz 37.32 540.84 2000 + xyz 31.02 536.34 2000 end classcanvas 142856 class_ref 144008 // NumerKonta classdiagramsettings member_max_width 0 end - xyz 13.72 304.18 2000 + xyz -4.78 300.88 2000 end classcanvas 142984 class_ref 144136 // NumerTelefonu classdiagramsettings member_max_width 0 end - xyz 13 349.32 2000 + xyz -11.9 345.52 2000 end classcanvas 143112 class_ref 144264 // StanZamowienia classdiagramsettings member_max_width 0 end - xyz 789.5 222.12 2000 + xyz 763.7 218.22 2000 end 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 + from ref 130312 z 2001 label "Obsluguje" italic max_width 255 xyz 246 497 2001 to ref 129032 no_role_a no_role_b - multiplicity_a_pos 238 539 3000 multiplicity_b_pos 227 472 3000 + multiplicity_a_pos 222 532 3000 multiplicity_b_pos 194 467 3000 end 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 + from ref 128136 z 2001 label "> Jest dodatkiem" italic max_width 255 xyz 590 488 2001 to ref 128904 no_role_a no_role_b - multiplicity_a_pos 706 529 3000 multiplicity_b_pos 706 466 3000 + multiplicity_a_pos 698 527 3000 multiplicity_b_pos 701 465 3000 end 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 + decenter_end 671 + from ref 128904 z 2001 label "> Jest skladnikiem" italic max_width 255 xyz 742 489 2001 to ref 128136 no_role_a no_role_b - multiplicity_a_pos 748 466 3000 multiplicity_b_pos 735 529 3000 + multiplicity_a_pos 743 465 3000 multiplicity_b_pos 733 527 3000 end relationcanvas 131592 relation_ref 129032 // Zawiera decenter_begin 546 - from ref 128264 z 2001 label "Zawiera" italic max_width 255 xyz 746 327 2001 to ref 128136 + from ref 128264 z 2001 label "Zawiera" italic max_width 255 xyz 736 323 2001 to ref 128136 no_role_a no_role_b - multiplicity_a_pos 712 365 3000 multiplicity_b_pos 726 293 3000 + multiplicity_a_pos 702 363 3000 multiplicity_b_pos 698 273 3000 end relationcanvas 131720 relation_ref 129160 // Zarzadza decenter_begin 785 decenter_end 319 - from ref 128264 z 2001 label "Zarzadza" italic max_width 255 xyz 495 252.5 2001 to ref 128520 + from ref 128264 z 2001 label "Zarzadza" italic max_width 255 xyz 483 248 2001 to ref 128520 no_role_a no_role_b - multiplicity_a_pos 357 273 3000 multiplicity_b_pos 676 275 3000 + multiplicity_a_pos 359 268 3000 multiplicity_b_pos 649 256 3000 end relationcanvas 131848 relation_ref 129288 // Obsluguje decenter_begin 759 - from ref 128520 z 2001 label "Obsluguje" italic max_width 255 xyz 323 331.5 2001 to ref 129672 + from ref 128520 z 2001 label "Obsluguje" italic max_width 255 xyz 309 327 2001 to ref 129672 no_role_a no_role_b - multiplicity_a_pos 395 359 3000 multiplicity_b_pos 335 299 3000 + multiplicity_a_pos 388 341 3000 multiplicity_b_pos 328 294 3000 end relationcanvas 131976 relation_ref 129416 // Przygotowuje - decenter_begin 519 - decenter_end 109 - from ref 129160 z 2001 label "Przygotowuje" italic max_width 255 xyz 570.5 195.5 2001 to ref 128264 + decenter_begin 518 + decenter_end 108 + from ref 129160 z 2001 label "Przygotowuje" italic max_width 255 xyz 553 191 2001 to ref 128264 no_role_a no_role_b - multiplicity_a_pos 676 220 3000 multiplicity_b_pos 532 219 3000 + multiplicity_a_pos 649 201 3000 multiplicity_b_pos 527 215 3000 end relationcanvas 132104 relation_ref 129544 // Obsluguje - from ref 129800 z 2001 label "Obsluguje" italic max_width 255 xyz 388.5 194 2001 to ref 129160 + from ref 129800 z 2001 label "Obsluguje" italic max_width 255 xyz 374 190 2001 to ref 129160 no_role_a no_role_b - multiplicity_a_pos 456 219 3000 multiplicity_b_pos 362 219 3000 + multiplicity_a_pos 446 214 3000 multiplicity_b_pos 359 214 3000 end relationcanvas 132232 relation_ref 129672 // Oplaca decenter_begin 504 - from ref 128264 z 2001 label "Oplaca" italic max_width 255 xyz 742 166 2001 to ref 128392 + from ref 128264 z 2001 label "Oplaca" italic max_width 255 xyz 733 162 2001 to ref 128392 no_role_a no_role_b - multiplicity_a_pos 721 144 3000 multiplicity_b_pos 720 187 3000 + multiplicity_a_pos 703 142 3000 multiplicity_b_pos 692 167 3000 end relationcanvas 132360 relation_ref 129800 // Przyjmuje - from ref 128392 z 2001 label "Przyjmuje" italic max_width 255 xyz 574.5 82 2001 to ref 129928 + from ref 128392 z 2001 label "Przyjmuje" italic max_width 255 xyz 561 78 2001 to ref 129928 no_role_a no_role_b - multiplicity_a_pos 535 104 3000 multiplicity_b_pos 662 105 3000 + multiplicity_a_pos 523 94 3000 multiplicity_b_pos 656 101 3000 end relationcanvas 132488 relation_ref 129928 // Obsluguje - from ref 129928 z 2001 label "Obsluguje" italic max_width 255 xyz 381.5 81 2001 to ref 130056 + from ref 129928 z 2001 label "Obsluguje" italic max_width 255 xyz 367 77 2001 to ref 130056 no_role_a no_role_b - multiplicity_a_pos 357 104 3000 multiplicity_b_pos 449 104 3000 + multiplicity_a_pos 359 97 3000 multiplicity_b_pos 434 94 3000 end relationcanvas 134792 relation_ref 137096 // from ref 134408 z 2001 to ref 128392 @@ -193,27 +193,27 @@ end 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 + from ref 128008 z 2001 label "Jest zawarta w" italic max_width 255 xyz 908 485 2001 to ref 136712 no_role_a no_role_b - multiplicity_a_pos 907 476 3000 multiplicity_b_pos 906 503 3000 + multiplicity_a_pos 871 471 3000 multiplicity_b_pos 897 497 3000 end relationcanvas 137480 relation_ref 137864 // geometry VHr - from ref 130056 z 2006 to point 109 93 + from ref 130056 z 2006 to point 109 90 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 // decenter_begin 493 - decenter_end 174 + decenter_end 173 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 // decenter_begin 333 - decenter_end 705 + decenter_end 704 from ref 128520 z 2006 to ref 137352 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -221,19 +221,19 @@ end relationcanvas 138888 relation_ref 138248 // geometry VHr decenter_end 722 - from ref 130312 z 2006 to point 155 444 + from ref 130312 z 2006 to point 155 439 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 320 558 2001 to ref 140808 + from ref 129032 z 2001 label "Przechowuje" italic max_width 255 xyz 304 554 2001 to ref 140808 no_role_a no_role_b - multiplicity_a_pos 408 583 3000 multiplicity_b_pos 301 582 3000 + multiplicity_a_pos 381 571 3000 multiplicity_b_pos 294 575 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 524.5 558.5 2001 to ref 128904 + from ref 140808 z 2001 label "Zapisuje informacje o licznosci" italic max_width 255 xyz 482 554 2001 to ref 128904 no_role_a no_role_b - multiplicity_a_pos 683 582 3000 multiplicity_b_pos 515 584 3000 + multiplicity_a_pos 674 578 3000 multiplicity_b_pos 494 571 3000 end end diff --git a/models/models.prj b/models/models.prj index 2998a58..76102b2 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ format 224 "models" - revision 6 - modified_by 12 "fabian" + revision 7 + modified_by 27 "s452645" @@ -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 5 + font_size 8 diagram_format A4 image_root_dir "" @@ -66,7 +66,7 @@ format 224 end classdiagram 128012 "domain-model" classdiagramsettings draw_all_relations no show_members_full_definition yes member_max_width 0 end - size A-Landscape + size B-Landscape end class 128008 "Menu" @@ -114,11 +114,11 @@ format 224 classrelation_ref 129416 // (> Jest dodatkiem) end - classrelation 129672 // (> Jest skladnikiem) + classrelation 129672 // > Jest skladnikiem relation_ref 128776 // > Jest skladnikiem end - classrelation 130184 // (Zawiera) + classrelation 130184 // Zawiera relation_ref 129032 // Zawiera end @@ -160,7 +160,7 @@ format 224 a role_name "" multiplicity "1..*" private classrelation_ref 130056 // (Zawiera) b role_name "" multiplicity "*" private - classrelation_ref 130184 // (Zawiera) + classrelation_ref 130184 // Zawiera end classrelation 130312 // (Zarzadza) @@ -335,7 +335,7 @@ format 224 a role_name "" multiplicity "*" private 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 @@ -364,7 +364,7 @@ format 224 explicit_switch_type "" mysql_decl "" - classrelation 128648 // (Obsluguje) + classrelation 128648 // Obsluguje relation_ref 128264 // Obsluguje end @@ -516,7 +516,7 @@ format 224 a role_name "" multiplicity "1" private classrelation_ref 128520 // (Obsluguje) b role_name "" multiplicity "1..*" private - classrelation_ref 128648 // (Obsluguje) + classrelation_ref 128648 // Obsluguje end classrelation 140808 // @@ -787,4 +787,30 @@ format 224 end end + + classview 128027 "design" + + classdiagramsettings member_max_width 0 end + + classcompositediagramsettings end + + collaborationdiagramsettings end + + objectdiagramsettings end + + objectcompositediagramsettings end + + sequencediagramsettings end + + statediagramsettings + end + + + activitydiagramsettings + end + sequencediagram 128027 "8-1-restartSystemu" + sequencediagramsettings end + overlapping_bars size A4 + end + end end