diff --git a/models/134530.diagram b/models/134530.diagram index 7ed08b7..44439ce 100644 --- a/models/134530.diagram +++ b/models/134530.diagram @@ -1,59 +1,59 @@ format 224 classinstance 128002 class_ref 156628 // Klient - name "" xyz 75 28 2000 life_line_z 2000 + name "" xyz 97 4 2000 life_line_z 2000 classinstance 128130 class_ref 134530 // KlawiaturaKontroler - name "" xyz 179 38 2000 life_line_z 2000 + name "" xyz 244 12 2000 life_line_z 2000 classinstance 128258 class_ref 156756 // AutomatKontroler - name "" xyz 382 41 2000 life_line_z 2000 + name "" xyz 458 15 2000 life_line_z 2000 classinstance 128386 class_ref 134658 // ListaProduktow - name "" xyz 571 40 2000 life_line_z 2000 + name "" xyz 662 11 2005 life_line_z 2000 durationcanvas 128514 classinstance_ref 128002 // :Klient - xyzwh 86 136 2010 11 69 + xyzwh 108 102 2010 11 40 end durationcanvas 128642 classinstance_ref 128130 // :KlawiaturaKontroler - xyzwh 229 142 2010 11 54 + xyzwh 294 102 2010 11 80 end -durationcanvas 128898 classinstance_ref 128258 // :AutomatKontroler - xyzwh 426 143 2010 11 66 +durationcanvas 129026 classinstance_ref 128258 // :AutomatKontroler + xyzwh 502 109 2010 11 91 end -durationcanvas 129154 classinstance_ref 128386 // :ListaProduktow - xyzwh 610 148 2010 11 57 +durationcanvas 129282 classinstance_ref 128386 // :ListaProduktow + xyzwh 701 118 2010 11 82 end msg 128770 synchronous from durationcanvas_ref 128514 to durationcanvas_ref 128642 - yz 143 2015 explicitmsg "wybierzKodProduktu(numer:int)" + yz 102 2015 explicitmsg "wybierzKodProduktu(numer: int)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 87 129 -msg 129026 synchronous - from durationcanvas_ref 128642 - to durationcanvas_ref 128898 - yz 150 2020 explicitmsg "wybierzProdukt(numer:int)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 269 136 -msg 129282 synchronous - from durationcanvas_ref 128898 - to durationcanvas_ref 129154 - yz 155 2015 explicitmsg "wybierzProdukt(numer:int)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 459 141 -msg 129410 return - from durationcanvas_ref 129154 - to durationcanvas_ref 128898 - yz 194 2020 explicitmsg "produkt = wybierzProdukt(numer:int)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 435 180 -msg 129538 return - from durationcanvas_ref 128898 - to durationcanvas_ref 128642 - yz 177 2015 explicitmsg "produkt = wybierzProdukt(numer:int)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 269 163 -msg 129666 return + label_xy 91 88 +msg 128898 return from durationcanvas_ref 128642 to durationcanvas_ref 128514 - yz 178 2020 explicitmsg "produkt = wybierzKodProduktu(numer:int)" + yz 127 2020 explicitmsg "produkt = wybierzKodProduktu(numer: int)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 63 164 + label_xy 99 112 +msg 129154 synchronous + from durationcanvas_ref 128642 + to durationcanvas_ref 129026 + yz 109 2015 explicitmsg "wybierzKodProduktu(numer: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 327 95 +msg 129410 synchronous + from durationcanvas_ref 129026 + to durationcanvas_ref 129282 + yz 118 2015 explicitmsg "wybierzKodProduktu(numer :int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 531 104 +msg 129538 return + from durationcanvas_ref 129282 + to durationcanvas_ref 129026 + yz 189 2020 explicitmsg "produkt = wybierzKodProduktu(numer: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 507 173 +msg 129666 return + from durationcanvas_ref 129026 + to durationcanvas_ref 128642 + yz 158 3005 explicitmsg "produkt = wybierzKodProduktu(numer: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 303 144 end diff --git a/models/134658.diagram b/models/134658.diagram index 47ab8fe..4001dd3 100644 --- a/models/134658.diagram +++ b/models/134658.diagram @@ -1,69 +1,65 @@ format 224 classinstance 128002 class_ref 156628 // Klient - name "" xyz 116 4 2000 life_line_z 2000 -classinstance 128258 class_ref 134914 // KasetaKontroler - name "" xyz 317 19 2000 life_line_z 2000 -classinstance 129026 class_ref 156756 // AutomatKontroler - name "" xyz 521 26 2005 life_line_z 2000 -classinstance 129154 class_ref 141442 // EkranKontroler - name "" xyz 709 12 2010 life_line_z 2000 -textcanvas 130946 "<>" - xyzwh 721 149 3005 55 14 -textcanvas 131074 "<>" - xyzwh 800 159 2030 55 14 -durationcanvas 129282 classinstance_ref 128002 // :Klient - xyzwh 127 96 2010 11 40 + name "" xyz 27 37 2000 life_line_z 2000 +classinstance 128130 class_ref 134786 // KasetaKontroler + name "" xyz 208 32 2000 life_line_z 2000 +classinstance 128258 class_ref 156756 // AutomatKontroler + name "" xyz 387 36 2000 life_line_z 2000 +classinstance 128386 class_ref 134914 // EkranKontroler + name "" xyz 608 39 2000 life_line_z 2000 +durationcanvas 128514 classinstance_ref 128002 // :Klient + xyzwh 38 149 2010 11 41 end -durationcanvas 129410 classinstance_ref 128258 // :KasetaKontroler - xyzwh 358 98 2010 11 111 - overlappingdurationcanvas 130434 - xyzwh 364 120 2020 11 25 +durationcanvas 128642 classinstance_ref 128130 // :KasetaKontroler + xyzwh 249 149 2010 11 135 + overlappingdurationcanvas 129666 + xyzwh 255 184 2020 11 25 end - overlappingdurationcanvas 130690 - xyzwh 364 179 2020 11 25 + overlappingdurationcanvas 129922 + xyzwh 255 253 2020 11 25 end end -durationcanvas 129666 classinstance_ref 129026 // :AutomatKontroler - xyzwh 565 100 2010 11 80 +durationcanvas 128898 classinstance_ref 128258 // :AutomatKontroler + xyzwh 431 157 2010 11 26 end -durationcanvas 129922 classinstance_ref 129154 // :EkranKontroler - xyzwh 746 102 2010 11 112 - overlappingdurationcanvas 130178 - xyzwh 752 149 2020 11 38 +durationcanvas 129154 classinstance_ref 128386 // :EkranKontroler + xyzwh 645 168 2010 11 81 + overlappingdurationcanvas 129410 + xyzwh 651 177 2020 11 66 end end -msg 129538 synchronous - from durationcanvas_ref 129282 +msg 128770 synchronous + from durationcanvas_ref 128514 + to durationcanvas_ref 128642 + yz 149 2015 explicitmsg "wprowadzPieniadze(monety: money, banknoty: money)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy -31 135 +msg 129026 synchronous + from durationcanvas_ref 128642 + to durationcanvas_ref 128898 + yz 157 2015 explicitmsg "przekarzPieniadze(monety: money, banknoty: money)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 217 143 +msg 129282 synchronous + from durationcanvas_ref 128898 + to durationcanvas_ref 129154 + yz 168 2020 explicitmsg "wyswietlKwote(monety: money, banknoty: money, produkt: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 392 154 +reflexivemsg 129538 synchronous to durationcanvas_ref 129410 - yz 98 2015 explicitmsg "WprowadzPieniadze(monety: money, bankoty: money)" + yz 177 2025 explicitmsg "wyswietPozostalalKwote(monety: money, banknoty: money, produkt: int)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 88 84 -msg 129794 synchronous - from durationcanvas_ref 129410 + label_xy 665 186 +reflexivemsg 129794 synchronous to durationcanvas_ref 129666 - yz 102 2015 explicitmsg "PrzekazKwote(monety: money, banknoty: money)" + yz 184 2025 explicitmsg "sprawdzMonety(monety: money)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 341 88 -msg 130050 synchronous - from durationcanvas_ref 129666 + label_xy 196 170 +reflexivemsg 130050 synchronous to durationcanvas_ref 129922 - yz 102 3005 explicitmsg "WyswietlKwote(monety: money, banknoty: money, produkt:int)" + yz 253 2025 explicitmsg "sprawdzBanknoty(banknoty: money)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 556 85 -reflexivemsg 130306 synchronous - to durationcanvas_ref 130178 - yz 149 2025 explicitmsg "WyswietlPozostalaKwote(monety: money, banknoty: money, produkt:int)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 632 135 -reflexivemsg 130562 synchronous - to durationcanvas_ref 130434 - yz 120 2025 explicitmsg "SprawdzMonety(monety: money)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 304 106 -reflexivemsg 130818 synchronous - to durationcanvas_ref 130690 - yz 179 2025 explicitmsg "SprawdzBanknoty(banknoty: money)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 294 165 + label_xy 186 239 end diff --git a/models/134786.diagram b/models/134786.diagram new file mode 100644 index 0000000..75ab92b --- /dev/null +++ b/models/134786.diagram @@ -0,0 +1,38 @@ +format 224 + +classinstance 128002 class_ref 156628 // Klient + name "" xyz 62 4 2000 life_line_z 2000 +classinstance 128130 class_ref 135042 // PodajnikKontroler + name "" xyz 164 21 2000 life_line_z 2000 +classinstance 128258 class_ref 156756 // AutomatKontroler + name "" xyz 346 25 2000 life_line_z 2000 +durationcanvas 128386 classinstance_ref 128258 // :AutomatKontroler + xyzwh 390 100 2010 11 59 + overlappingdurationcanvas 129026 + xyzwh 396 128 2020 11 25 + end +end +durationcanvas 128514 classinstance_ref 128130 // :PodajnikKontroler + xyzwh 207 100 2010 11 25 +end +durationcanvas 128770 classinstance_ref 128002 // :Klient + xyzwh 73 115 2010 11 25 +end +msg 128642 synchronous + from durationcanvas_ref 128386 + to durationcanvas_ref 128514 + yz 100 2015 explicitmsg "wydajProdukt(numer: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 244 86 +msg 128898 synchronous + from durationcanvas_ref 128514 + to durationcanvas_ref 128770 + yz 115 2020 explicitmsg "wydajProdukt(numer: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 85 101 +reflexivemsg 129154 synchronous + to durationcanvas_ref 129026 + yz 128 2025 explicitmsg "potwierdzPlatnosc(monety: money, banknoty: money, produkt: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 258 114 +end diff --git a/models/134914.diagram b/models/134914.diagram new file mode 100644 index 0000000..d48b73f --- /dev/null +++ b/models/134914.diagram @@ -0,0 +1,42 @@ +format 224 + +classinstance 128002 class_ref 156628 // Klient + name "" xyz 63 4 2000 life_line_z 2000 +classinstance 128130 class_ref 156756 // AutomatKontroler + name "" xyz 246 17 2000 life_line_z 2000 +classinstance 128770 class_ref 134786 // KasetaKontroler + name "" xyz 599 22 2000 life_line_z 2000 +durationcanvas 128258 classinstance_ref 128002 // :Klient + xyzwh 74 92 2010 11 40 +end +durationcanvas 128386 classinstance_ref 128130 // :AutomatKontroler + xyzwh 290 92 2010 11 73 +end +durationcanvas 128898 classinstance_ref 128770 // :KasetaKontroler + xyzwh 640 98 2010 11 67 +end +msg 128514 synchronous + from durationcanvas_ref 128258 + to durationcanvas_ref 128386 + yz 92 2015 explicitmsg "anulujZakup(produkt: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 123 77 +msg 128642 return + from durationcanvas_ref 128386 + to durationcanvas_ref 128258 + yz 114 2015 explicitmsg "pieniadze = anulujZakup(produkt: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 99 105 +msg 129026 synchronous + from durationcanvas_ref 128386 + to durationcanvas_ref 128898 + yz 98 2020 explicitmsg "zwrocPieniadze(monety: money, banknoty: money, produkt: int))" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 317 81 +msg 129154 return + from durationcanvas_ref 128898 + to durationcanvas_ref 128386 + yz 154 2020 explicitmsg "kwota = zwrocPieniadze(monety: money, banknoty: money, produkt: int))" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 304 138 +end diff --git a/models/160980_2.d b/models/160980_2.d new file mode 100644 index 0000000..7c1354f --- /dev/null +++ b/models/160980_2.d @@ -0,0 +1,89 @@ +format 224 + +pseudostatecanvas 128084 pseudostate_ref 128084 // initial + xyz 81 92 2000 +end +statecanvas 128212 state_ref 128212 // Produkt Wybrany + + xyzwh 31 201 2000 115 33 +end +statecanvas 128340 state_ref 128340 // Produkt Oplacony + + xyzwh 372 451 2000 117 33 +end +statecanvas 128468 state_ref 128468 // Karta Wczytana + + xyzwh 568 207 2000 137 33 +end +pseudostatecanvas 128596 pseudostate_ref 128212 // final Produkt Wydany + xyz 417 609 2000 +end +pseudostatecanvas 128980 pseudostate_ref 128340 // final Zakup Anulowany + xyz 247 688 2000 +end +statecanvas 129876 state_ref 128596 // Oczekiwanie na Zaplate + + xyzwh 248 203 2000 149 33 +end +note 134356 "wrzuconaKwota < cenaProduktu " + xyzwh 266 26 2006 123 49 +note 134484 "srodkiNaKoncie < cenaProduktu" + xyzwh 644 498 2000 119 47 +note 134612 "wrzuconaKwota >= cenaProduktu" + xyzwh 270 365 2000 103 65 +transitioncanvas 128724 transition_ref 128084 // wydajProdukt + + from ref 128340 z 2001 label "wydajProdukt" xyz 443 539 2001 to ref 128596 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 128852 transition_ref 128212 // pobierzSrodki + + from ref 128468 z 2001 label "pobierzSrodki" xyz 458 331 2001 to ref 128340 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 129108 transition_ref 128340 // odrzucTransakcje + + from ref 128468 z 2001 label "odrzucTransakcje" max_width 14 xyz 644 476 2001 to point 634 640 + line 134228 z 2001 to point 636 700 + line 129236 z 2001 to ref 128980 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 129748 transition_ref 128468 // wybierzProdukt + + from ref 128084 z 2001 label "wybierzProdukt" xyz 10 145 2001 to ref 128212 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 130644 transition_ref 128724 // oplacProdukt + + from ref 128212 z 2001 label "oplacProdukt" xyz 159 199 2001 to ref 129876 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 132052 transition_ref 129108 // wrzucGotowke + decenter_begin 906 + decenter_end 134 + + from ref 129876 z 2001 label "wrzucGotowke" max_width 14 xyz 288 77 2001 to point 379 94 + line 132180 z 2001 to point 263 93 + line 132308 z 2001 to ref 129876 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 132564 transition_ref 129236 // przylozKarteDoTerminala + + from ref 129876 z 2001 label "przylozKarteDoTerminala" xyz 424 199 2001 to ref 128468 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 132692 transition_ref 129364 // wrzucGotowke + decenter_begin 865 + decenter_end 75 + + from ref 129876 z 2001 label "wrzucGotowke" max_width 14 xyz 278 351 2001 to point 378 443 + line 134740 z 2001 to ref 128340 + write_horizontally default show_definition default drawing_language default +end +transitioncanvas 132820 transition_ref 129492 // anulujZakup + decenter_begin 79 + + from ref 129876 z 2001 label "anulujZakup" xyz 185 449 2001 to ref 128980 + write_horizontally default show_definition default drawing_language default +end +end diff --git a/models/models.prj b/models/models.prj index 4c42828..41e3cbb 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ -format 223 +format 224 "models" - revision 20 - modified_by 84 "Szogunek" + revision 21 + modified_by 2 "luksz" @@ -1280,5 +1280,85 @@ format 223 end end end + + sequencediagram 134530 "1-1-wyborKoduProduktuPakowanego" + sequencediagramsettings end + overlapping_bars size A4 + end + + class 134530 "KlawiaturaKontroler" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + class 134658 "ListaProduktow" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + sequencediagram 134658 "1-2-wprowadzenieMonetyBanknotu" + sequencediagramsettings end + overlapping_bars size A4 + end + + class 134786 "KasetaKontroler" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + class 134914 "EkranKontroler" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + sequencediagram 134786 "1-3-odbiorProduktu" + sequencediagramsettings end + overlapping_bars size A4 + end + + class 135042 "PodajnikKontroler" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + sequencediagram 134914 "1-4-anulowanieZakupu" + sequencediagramsettings end + overlapping_bars size A4 + end end end