From a8fad8b0105d6dc3643e06cc5332134c1709f2ae Mon Sep 17 00:00:00 2001 From: Dominik Date: Tue, 2 Feb 2021 14:38:14 +0100 Subject: [PATCH] Zmiany Po spotkaniu z Kubisem 8-X --- models/128044.diagram | 72 +++++++++++++++---- models/134572.diagram | 53 +++++++------- models/134700.diagram | 57 +++++++-------- models/134828.diagram | 24 +++---- models/134956.diagram | 34 ++++----- models/141186.diagram | 92 +++++++++++++----------- models/44.session | 15 ++-- models/models.prj | 164 +++++++++++++++++++++++++++++++++++------- 8 files changed, 338 insertions(+), 173 deletions(-) diff --git a/models/128044.diagram b/models/128044.diagram index 930eb90..1ffe45d 100644 --- a/models/128044.diagram +++ b/models/128044.diagram @@ -3,30 +3,76 @@ format 224 classinstance 128172 class_ref 128044 // Serwisant name "" xyz 50 14 2000 life_line_z 2000 classinstance 128300 class_ref 128266 // Automat - name "Automat" xyz 240 7 2005 life_line_z 2000 + name "Automat" xyz 213 7 2005 life_line_z 2000 classinstance 128812 class_ref 128300 // SystemOperacyjny - name "" xyz 459 5 2005 life_line_z 2000 -note 129196 "Co przechodzi w stan gotowosci? Automat czy AutomatController?" - xyzwh 564 437 2000 253 55 + name "ManagerSystemu" xyz 724 5 2005 life_line_z 2000 +classinstance 129324 class_ref 141996 // NaprawaAutomatuKontroler + name "AutomatKontroler" xyz 380 7 2000 life_line_z 2000 +classinstance 130348 class_ref 148780 // RaportZakonczeniaNaprawy + name "" xyz 1231 8 2000 life_line_z 2000 +classinstance 130732 class_ref 142252 // ManagerNaprawy + name "" xyz 1053 14 2000 life_line_z 2000 durationcanvas 128428 classinstance_ref 128172 // :Serwisant xyzwh 81 86 2010 11 40 end durationcanvas 128556 classinstance_ref 128300 // Automat:Automat - xyzwh 296 87 2010 11 37 + xyzwh 269 88 2010 11 92 end -durationcanvas 128940 classinstance_ref 128812 // :SystemOperacyjny - xyzwh 524 102 2010 11 25 +durationcanvas 129452 classinstance_ref 129324 // AutomatKontroler:NaprawaAutomatuKontroler + xyzwh 528 77 2010 11 191 + overlappingdurationcanvas 129836 + xyzwh 534 121 2020 11 26 + end +end +durationcanvas 129580 classinstance_ref 128812 // ManagerSystemu:SystemOperacyjny + xyzwh 845 238 2010 11 51 +end +durationcanvas 130860 classinstance_ref 130732 // :ManagerNaprawy + xyzwh 1112 238 2010 11 114 + overlappingdurationcanvas 131500 + xyzwh 1118 266 2020 11 27 + end +end +durationcanvas 130988 classinstance_ref 130348 // :RaportZakonczeniaNaprawy + xyzwh 1325 267 2010 11 26 +end +durationcanvas 131244 classinstance_ref 128172 // :Serwisant + xyzwh 81 332 2010 11 26 end msg 128684 synchronous from durationcanvas_ref 128428 to durationcanvas_ref 128556 - yz 87 2015 explicitmsg "1. zamknijAutomat()" + yz 88 2015 explicitmsg "1. zamknijAutomat()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 125 71 -msg 129068 synchronous + label_xy 125 72 +msg 129708 synchronous + from durationcanvas_ref 129452 + to durationcanvas_ref 129580 + yz 238 2015 explicitmsg "1.2 przejdzWStanGotowosci()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 593 214 +msg 129964 synchronous from durationcanvas_ref 128556 - to durationcanvas_ref 128940 - yz 102 2020 explicitmsg "1.1. przejdzWStanGotowosci()" + to durationcanvas_ref 129836 + yz 121 2025 explicitmsg "1.1 SygnalZamknieciaAutomatu()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 311 84 + label_xy 289 104 +msg 131116 synchronous + from durationcanvas_ref 130860 + to durationcanvas_ref 130988 + yz 267 2015 explicitmsg "<> 1.3. stworzRaportOZakonczeniuNaprawy()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 1032 250 +msg 131372 return + from durationcanvas_ref 130860 + to durationcanvas_ref 131244 + yz 332 2015 explicitmsg "1.4 zwrocRaport(raport : RaportZakonczeniaNaprawy)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 373 315 +msg 131628 synchronous + from durationcanvas_ref 129580 + to durationcanvas_ref 131500 + yz 266 3005 explicitmsg "1.2.1. ZakonczenieSerwisu()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 851 249 end diff --git a/models/134572.diagram b/models/134572.diagram index b3f81df..77e18f3 100644 --- a/models/134572.diagram +++ b/models/134572.diagram @@ -6,55 +6,56 @@ classinstance 128428 class_ref 135084 // ModulLogowania name "" xyz 530 5 2005 life_line_z 2000 classinstance 128556 class_ref 128300 // SystemOperacyjny name "ManagerSystemu" xyz 757 5 2000 life_line_z 2000 -classinstance 131884 class_ref 141996 // NaprawaAutomatu - name "KontrolerAutomatu" xyz 137 9 2005 life_line_z 2000 -note 132652 "Czy nazwa zd. Sys jest poprawna" - xyzwh 65 342 2000 149 55 -note 132780 "Czy przekaza dane -" - xyzwh 626 111 2000 121 57 +classinstance 131884 class_ref 141996 // NaprawaAutomatuKontroler + name "KontrolerAutomatu" xyz 108 9 2005 life_line_z 2000 durationcanvas 129580 classinstance_ref 128428 // :ModulLogowania xyzwh 586 82 2010 11 145 overlappingdurationcanvas 130988 - xyzwh 592 150 2020 11 25 + xyzwh 592 155 2020 11 25 end overlappingdurationcanvas 132396 - xyzwh 592 108 2020 11 25 + xyzwh 592 107 2020 11 26 end end -durationcanvas 131244 classinstance_ref 128556 // ManagerSystemu:SystemOperacyjny - xyzwh 878 205 2010 11 25 -end durationcanvas 132012 classinstance_ref 128044 // :Serwisant xyzwh 25 79 2010 11 40 end -durationcanvas 132140 classinstance_ref 131884 // KontrolerAutomatu:NaprawaAutomatu - xyzwh 260 80 2010 11 140 +durationcanvas 132140 classinstance_ref 131884 // KontrolerAutomatu:NaprawaAutomatuKontroler + xyzwh 260 79 2010 11 265 +end +durationcanvas 132908 classinstance_ref 128556 // ManagerSystemu:SystemOperacyjny + xyzwh 878 283 2010 11 26 end reflexivemsg 131116 synchronous to durationcanvas_ref 130988 - yz 150 2025 explicitmsg "1.4 weryfikujDaneLogowania()" + yz 155 2025 explicitmsg "1.4 weryfikujDaneLogowania()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "ID : int, haslo : string" - label_xy 446 175 -msg 131372 synchronous - from durationcanvas_ref 129580 - to durationcanvas_ref 131244 - yz 205 2015 explicitmsg "1.5 przelaczWStanSerwisowy()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 631 217 + label_xy 511 139 msg 132268 synchronous from durationcanvas_ref 132012 to durationcanvas_ref 132140 - yz 80 2015 explicitmsg "1. logowanie()" + yz 79 2015 explicitmsg "1. logowanie()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "ID : int, haslo : string" - label_xy 37 63 + label_xy 37 62 msg 132524 synchronous from durationcanvas_ref 132140 to durationcanvas_ref 132396 - yz 108 2025 explicitmsg "1.1. przeslijDaneLogowania()" + yz 107 2025 explicitmsg "1.1. przeslijDaneLogowania()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "ID : int, haslo : string" - label_xy 268 90 + label_xy 268 89 +msg 133036 synchronous + from durationcanvas_ref 132140 + to durationcanvas_ref 132908 + yz 283 2015 explicitmsg "1.5 przelaczWStanSerwisowy()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 471 266 +msg 133420 return + from durationcanvas_ref 129580 + to durationcanvas_ref 132140 + yz 196 2015 explicitmsg "1.4.1 zwrocInformacjeOWeryfikacji ( info : string )" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 270 178 end diff --git a/models/134700.diagram b/models/134700.diagram index 09b6431..cee7127 100644 --- a/models/134700.diagram +++ b/models/134700.diagram @@ -2,41 +2,37 @@ format 224 classinstance 128044 class_ref 128044 // Serwisant name "" xyz 17 4 2000 life_line_z 2000 -classinstance 128172 class_ref 141996 // NaprawaAutomatu - name "KontrolerAutomatu" xyz 165 5 2000 life_line_z 2000 +classinstance 128172 class_ref 141996 // NaprawaAutomatuKontroler + name "KontrolerAutomatu" xyz 136 5 2000 life_line_z 2000 classinstance 128300 class_ref 142124 // ManagerDiagnozy - name "" xyz 617 4 2000 life_line_z 2000 -classinstance 128428 class_ref 135212 // Raport - name "" xyz 859 83 2000 life_line_z 2000 -note 129196 "Diagnoza czy SystemOperacyjny?" - xyzwh 412 398 2005 155 59 -note 129836 "Moze bardziej jest to przeprowadzenie diagnozy niz \"wlaczenie narzedzi diagnostycznych?\"" - xyzwh 369 299 2000 277 73 + name "" xyz 714 4 2000 life_line_z 2000 +classinstance 128428 class_ref 135212 // RaportDiagnozy + name "" xyz 924 64 2000 life_line_z 2000 classinstance 130220 class_ref 128300 // SystemOperacyjny - name "" xyz 448 4 2005 life_line_z 2000 + name "ManagerSystemu" xyz 455 4 2005 life_line_z 2000 durationcanvas 128556 classinstance_ref 128044 // :Serwisant xyzwh 48 69 2010 11 40 end -durationcanvas 128684 classinstance_ref 128172 // KontrolerAutomatu:NaprawaAutomatu +durationcanvas 128684 classinstance_ref 128172 // KontrolerAutomatu:NaprawaAutomatuKontroler xyzwh 288 70 2010 11 67 end durationcanvas 128940 classinstance_ref 128300 // :ManagerDiagnozy - xyzwh 678 79 2010 11 148 + xyzwh 775 79 2010 11 156 overlappingdurationcanvas 130604 - xyzwh 684 87 2020 11 38 + xyzwh 781 87 2020 11 38 end overlappingdurationcanvas 131116 - xyzwh 684 152 2020 11 25 + xyzwh 781 152 2020 11 25 end end -durationcanvas 129324 classinstance_ref 128428 // :Raport - xyzwh 883 133 2010 11 50 +durationcanvas 129324 classinstance_ref 128428 // :RaportDiagnozy + xyzwh 979 133 2010 11 50 end -durationcanvas 129964 classinstance_ref 128044 // :Serwisant - xyzwh 48 158 2010 11 69 +durationcanvas 130348 classinstance_ref 130220 // ManagerSystemu:SystemOperacyjny + xyzwh 576 86 2010 11 61 end -durationcanvas 130348 classinstance_ref 130220 // :SystemOperacyjny - xyzwh 512 86 2010 11 61 +durationcanvas 131372 classinstance_ref 128044 // :Serwisant + xyzwh 48 223 2010 11 26 end msg 128812 synchronous from durationcanvas_ref 128556 @@ -47,16 +43,9 @@ msg 128812 synchronous msg 129452 synchronous from durationcanvas_ref 128940 to durationcanvas_ref 129324 - yz 172 2015 explicitmsg "<> 1.3. stworzRaportDiagnozy" + yz 171 2015 explicitmsg "<> 1.3. stworzRaportDiagnozy" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 662 191 -msg 130092 synchronous - from durationcanvas_ref 128940 - to durationcanvas_ref 129964 - yz 216 2020 explicitmsg "1.4 ZwrocRaport()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "raport : Raport" - label_xy 171 199 + label_xy 759 190 msg 130476 synchronous from durationcanvas_ref 128684 to durationcanvas_ref 130348 @@ -68,10 +57,16 @@ msg 130732 synchronous to durationcanvas_ref 130604 yz 101 2025 explicitmsg "1.1.1 rozpocznijDiagnoze()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 515 110 + label_xy 579 110 reflexivemsg 131244 synchronous to durationcanvas_ref 131116 yz 152 2025 explicitmsg "1.2. Diagnozuj()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 711 131 + label_xy 808 131 +msg 131500 return + from durationcanvas_ref 128940 + to durationcanvas_ref 131372 + yz 223 2015 explicitmsg "1.4 ZwrocRaport(raport : RaportDiagnozy)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 262 205 end diff --git a/models/134828.diagram b/models/134828.diagram index 4907c08..c7f1d6d 100644 --- a/models/134828.diagram +++ b/models/134828.diagram @@ -3,34 +3,32 @@ format 224 classinstance 128044 class_ref 128044 // Serwisant name "" xyz 34 4 2000 life_line_z 2000 classinstance 128172 class_ref 142252 // ManagerNaprawy - name "" xyz 508 4 2000 life_line_z 2000 + name "" xyz 498 6 2000 life_line_z 2000 classinstance 128684 class_ref 128300 // SystemOperacyjny - name "" xyz 678 4 2000 life_line_z 2000 -note 129068 "czy nie jest to zbyt ogolne? Co mozna dodac?" - xyzwh 352 384 2000 153 85 -classinstance 129196 class_ref 141996 // NaprawaAutomatu - name "KontrolerAutomatu" xyz 176 6 2000 life_line_z 2000 + name "ManagerSystemu" xyz 662 4 2000 life_line_z 2000 +classinstance 129196 class_ref 141996 // NaprawaAutomatuKontroler + name "KontrolerAutomatu" xyz 147 6 2000 life_line_z 2000 durationcanvas 128428 classinstance_ref 128172 // :ManagerNaprawy - xyzwh 567 75 2010 11 86 + xyzwh 557 75 2010 11 86 overlappingdurationcanvas 129708 - xyzwh 573 77 2020 11 25 + xyzwh 563 77 2020 11 25 end end -durationcanvas 128812 classinstance_ref 128684 // :SystemOperacyjny - xyzwh 742 98 2010 11 26 +durationcanvas 128812 classinstance_ref 128684 // ManagerSystemu:SystemOperacyjny + xyzwh 783 97 2010 11 27 end durationcanvas 129324 classinstance_ref 128044 // :Serwisant xyzwh 65 65 2010 11 40 end -durationcanvas 129452 classinstance_ref 129196 // KontrolerAutomatu:NaprawaAutomatu +durationcanvas 129452 classinstance_ref 129196 // KontrolerAutomatu:NaprawaAutomatuKontroler xyzwh 299 65 2010 11 25 end msg 128940 synchronous from durationcanvas_ref 128428 to durationcanvas_ref 128812 - yz 98 2015 explicitmsg "1.1. Naprawa()" + yz 97 2015 explicitmsg "1.1. Naprawa()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 612 72 + label_xy 614 79 msg 129580 synchronous from durationcanvas_ref 129324 to durationcanvas_ref 129452 diff --git a/models/134956.diagram b/models/134956.diagram index 7284438..b4979da 100644 --- a/models/134956.diagram +++ b/models/134956.diagram @@ -2,43 +2,37 @@ format 224 classinstance 128044 class_ref 128044 // Serwisant name "" xyz 33 4 2000 life_line_z 2000 -classinstance 128172 class_ref 141996 // NaprawaAutomatu - name "KontrolerAutomatu" xyz 197 4 2000 life_line_z 2000 +classinstance 128172 class_ref 141996 // NaprawaAutomatuKontroler + name "KontrolerAutomatu" xyz 168 4 2000 life_line_z 2000 classinstance 128300 class_ref 128300 // SystemOperacyjny - name "" xyz 473 4 2000 life_line_z 2000 -note 129708 "Czy ten restart jest zbedny? -" - xyzwh 348 398 2000 151 53 -note 129836 "Klasyczne pytanie o to co przechodzi w stan gotowosci -" - xyzwh 586 301 2000 157 89 + name "ManagerSystemu" xyz 500 5 2000 life_line_z 2000 durationcanvas 128556 classinstance_ref 128044 // :Serwisant xyzwh 64 69 2010 11 41 end -durationcanvas 128684 classinstance_ref 128172 // KontrolerAutomatu:NaprawaAutomatu - xyzwh 320 70 2010 11 82 +durationcanvas 128684 classinstance_ref 128172 // KontrolerAutomatu:NaprawaAutomatuKontroler + xyzwh 320 71 2010 11 194 end -durationcanvas 128940 classinstance_ref 128300 // :SystemOperacyjny - xyzwh 537 89 2010 11 127 +durationcanvas 128940 classinstance_ref 128300 // ManagerSystemu:SystemOperacyjny + xyzwh 621 89 2010 11 127 overlappingdurationcanvas 129196 - xyzwh 543 137 2020 11 25 + xyzwh 627 137 2020 11 25 end end msg 128812 synchronous from durationcanvas_ref 128556 to durationcanvas_ref 128684 - yz 70 2015 explicitmsg "1. wybierzPoleceniePonownegoUruchomienia()" + yz 71 2015 explicitmsg "1. wybierzPoleceniePonownegoUruchomienia()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 59 53 + label_xy 59 54 msg 129068 synchronous from durationcanvas_ref 128684 to durationcanvas_ref 128940 - yz 89 2015 explicitmsg "1.1. ponownieUruchom()" + yz 90 2015 explicitmsg "1.1. ponownieUruchom()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 340 72 + label_xy 340 73 reflexivemsg 129324 synchronous to durationcanvas_ref 129196 - yz 137 2025 explicitmsg "1.2 restartFunkcji()" + yz 137 2025 explicitmsg "1.2 restartAutomatu()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 552 118 + label_xy 636 117 end diff --git a/models/141186.diagram b/models/141186.diagram index f5ad58f..7a09ec4 100644 --- a/models/141186.diagram +++ b/models/141186.diagram @@ -1,81 +1,81 @@ format 224 -classcanvas 128044 class_ref 141996 // NaprawaAutomatu +classcanvas 128044 class_ref 141996 // NaprawaAutomatuKontroler classdiagramsettings member_max_width 0 end - xyzwh 983.3 699.4 2000 181 63 + xyzwh 986.24 693 2000 208 137 end classcanvas 128138 class_ref 128522 // RaportSprzedazy classdiagramsettings member_max_width 0 end - xyz 790.5 938 2000 + xyz 790.56 938.88 2000 end classcanvas 128172 class_ref 128300 // SystemOperacyjny classdiagramsettings member_max_width 0 end - xyz 1341.3 691.7 2000 + xyz 1342.02 691.52 2000 end classcanvas 128266 class_ref 135050 // genrowanieRaportuSprzedazy classdiagramsettings member_max_width 0 end - xyz 30.5 958.5 2000 + xyz 30.44 958.32 2000 end classcanvas 128300 class_ref 135084 // ModulLogowania classdiagramsettings member_max_width 0 end - xyz 1324 960.9 2000 + xyz 1324.96 959.6 2000 end classcanvas 128386 class_ref 164994 // ZakupProduktu classdiagramsettings member_max_width 0 end - xyz 10.7 53.2 2000 + xyz 10.72 53.12 2000 end classcanvas 128394 class_ref 135178 // ManegerRaportow classdiagramsettings member_max_width 0 end - xyz 419.5 886.5 2000 + xyz 419.88 886.48 2000 end classcanvas 128514 class_ref 165122 // ManagerProduktow classdiagramsettings member_max_width 0 end - xyz 264.7 47.5 2000 + xyz 264.32 48.2 2000 end note 128812 "Czy dodawa \"NaprawaAutomatu\" lub \"ZakupProduktu\"" - xyzwh 417.9 742.3 2000 249 63 + xyzwh 417.68 742.64 2000 249 63 classcanvas 129068 class_ref 142124 // ManagerDiagnozy classdiagramsettings member_max_width 0 end - xyz 1730.2 672.3 2000 + xyz 1730.48 672.96 2000 end -classcanvas 129324 class_ref 135212 // Raport +classcanvas 129324 class_ref 135212 // RaportDiagnozy classdiagramsettings member_max_width 0 end - xyz 2174.4 708.3 2000 + xyz 2174.72 708.42 2000 end classcanvas 129708 class_ref 142252 // ManagerNaprawy classdiagramsettings member_max_width 0 end - xyz 1356.3 431.1 2000 + xyz 1276.24 441.92 2000 end classcanvas 130434 class_ref 178562 // ManagerPlatnosci classdiagramsettings member_max_width 0 end - xyz 574.9 47.5 2000 + xyz 574.84 48.2 2000 end classcanvas 130562 class_ref 178434 // ManagerPlatnosciKarta classdiagramsettings member_max_width 0 end - xyz 998 42.1 2000 + xyz 998.88 42.64 2000 end classcanvas 130690 class_ref 164226 // ManagerPlatnosciGotowkowej classdiagramsettings member_max_width 0 end - xyz 867.6 322 2000 + xyz 868.2 322.8 2000 end classcanvas 130818 class_ref 185218 // ManagerSprzedazy classdiagramsettings member_max_width 0 end - xyz 427.3 286.2 2000 + xyz 427.88 286.52 2000 end classcanvas 130946 class_ref 171906 // Sprzedaz classdiagramsettings member_max_width 0 end - xyz 434.3 579.9 2005 + xyz 434.56 579.16 2005 end -relationcanvas 128428 relation_ref 128044 // Wykorzystuje +classcanvas 131884 class_ref 148780 // RaportZakonczeniaNaprawy + classdiagramsettings member_max_width 0 end + xyz 1303 329 2000 +end +relationcanvas 128428 relation_ref 128044 // PrzesylaDane decenter_begin 601 - from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 1176 844.5 2001 to ref 128300 + from ref 128044 z 2001 label "PrzesylaDane" italic max_width 255 xyz 1134 901 2001 to point 1247 1005 + line 130220 z 2001 to ref 128300 no_role_a no_role_b - multiplicity_a_pos 1327 980 3000 multiplicity_b_pos 1106 782 3000 -end -relationcanvas 128556 relation_ref 128172 // ZmienStan - from ref 128300 z 2001 label "ZmienStan" italic max_width 255 xyz 1382 845.5 2001 to ref 128172 - no_role_a no_role_b - multiplicity_a_pos 1395 775 3000 multiplicity_b_pos 1395 932 3000 + multiplicity_a_pos 1305 1017 3000 multiplicity_b_pos 1101 837 3000 end relationcanvas 128778 relation_ref 128138 // wykorzystuje from ref 128266 z 2001 label "wykorzystuje" italic max_width 255 xyz 295 962 2001 to ref 128394 @@ -94,29 +94,36 @@ relationcanvas 128906 relation_ref 128266 // tworzy multiplicity_a_pos 771 992 3000 multiplicity_b_pos 613 990 3000 end relationcanvas 128940 relation_ref 128300 // Komunikuje - from ref 128044 z 2001 label "Komunikuje" italic max_width 255 xyz 1211 712 2001 to ref 128172 + from ref 128044 z 2001 label "Komunikuje" italic max_width 255 xyz 1224 730 2001 to ref 128172 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 129196 relation_ref 128428 // Komunikuje - from ref 128172 z 2001 label "Komunikuje" italic max_width 255 xyz 1571.5 708.5 2001 to ref 129068 + from ref 128172 z 2001 label "Komunikuje" italic max_width 255 xyz 1571 712 2001 to ref 129068 no_role_a no_role_b - multiplicity_a_pos 1706 736 3000 multiplicity_b_pos 1511 736 3000 + multiplicity_a_pos 1713 738 3000 multiplicity_b_pos 1507 744 3000 end relationcanvas 129452 relation_ref 128556 // Stworz - from ref 129068 z 2001 label "Stworz" italic max_width 255 xyz 2013.5 706.5 2001 to ref 129324 + from ref 129068 z 2001 label "Stworz" italic max_width 255 xyz 2013 706 2001 to ref 129324 no_role_a no_role_b - multiplicity_a_pos 2137 736 3000 multiplicity_b_pos 1916 736 3000 + multiplicity_a_pos 2137 736 3000 multiplicity_b_pos 1917 736 3000 end relationcanvas 129836 relation_ref 128684 // Wykorzystuje - from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 1202.5 575.5 2001 to ref 129708 + from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 1210.5 598.5 2001 to ref 129708 no_role_a no_role_b - multiplicity_a_pos 1361 483 3000 multiplicity_b_pos 1124 698 3000 + multiplicity_a_pos 1328 537 3000 multiplicity_b_pos 1178 692 3000 end -relationcanvas 130092 relation_ref 128812 // Naprawia - from ref 129708 z 2001 label "Naprawia" italic max_width 255 xyz 1361 572.5 2001 to ref 128172 +relationcanvas 130092 relation_ref 128812 // Naprawia i ZwracaRaport + from ref 129708 z 2001 label "Naprawia i ZwracaRaport" italic max_width 255 xyz 1416 602 2001 to ref 128172 no_role_a no_role_b - multiplicity_a_pos 1396 668 3000 multiplicity_b_pos 1398 493 3000 + multiplicity_a_pos 1399 668 3000 multiplicity_b_pos 1390 545 3000 +end +relationcanvas 130348 relation_ref 135340 // ZwracaInformacje + from ref 128300 z 2001 to point 1336 901 + line 131628 z 2001 to point 1257 895 + line 131756 z 2001 label "ZwracaInformacje" italic max_width 255 xyz 1158 846 3000 to ref 128044 + no_role_a no_role_b + multiplicity_a_pos 1184 845 3000 multiplicity_b_pos 1359 936 3000 end relationcanvas 131330 relation_ref 170498 // aktywuje from ref 128514 z 2001 label "aktywuje" italic max_width 255 xyz 465 58 2001 to ref 130434 @@ -126,17 +133,22 @@ end relationcanvas 131586 relation_ref 170754 // wykorzystuje decenter_begin 228 decenter_end 517 - from ref 130434 z 2001 label "wykorzystuje" italic max_width 255 xyz 783.5 36 2001 to ref 130562 + from ref 130434 z 2001 label "wykorzystuje" italic max_width 255 xyz 783 36 2001 to ref 130562 no_role_a no_role_b multiplicity_a_pos 974 72 3000 multiplicity_b_pos 726 71 3000 end relationcanvas 131714 relation_ref 170882 // wykorzystuje decenter_begin 935 decenter_end 465 - from ref 130434 z 2001 label "wykorzystuje" italic max_width 255 xyz 795.5 195 2001 to ref 130690 + from ref 130434 z 2001 label "wykorzystuje" italic max_width 255 xyz 795 195 2001 to ref 130690 no_role_a no_role_b multiplicity_a_pos 948 343 3000 multiplicity_b_pos 717 122 3000 end +relationcanvas 132012 relation_ref 135468 // Stworz + from ref 129708 z 2001 label "Stworz" italic max_width 255 xyz 1383 388 3000 to ref 131884 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end relationcanvas 132610 relation_ref 171522 // przesylaDane from ref 130434 z 2001 label "przesylaDane" italic max_width 255 xyz 535 177 2001 to ref 130818 no_role_a no_role_b @@ -148,7 +160,7 @@ relationcanvas 132738 relation_ref 171650 // przesylaDane multiplicity_a_pos 438 263 3000 multiplicity_b_pos 341 111 3000 end relationcanvas 132866 relation_ref 171778 // tworzy - from ref 130818 z 2006 label "tworzy" italic max_width 255 xyz 476.5 482 2006 to ref 130946 + from ref 130818 z 2006 label "tworzy" italic max_width 255 xyz 476 482 2006 to ref 130946 no_role_a no_role_b multiplicity_a_pos 477 559 3000 multiplicity_b_pos 477 426 3000 end diff --git a/models/44.session b/models/44.session index 5e90060..2866086 100644 --- a/models/44.session +++ b/models/44.session @@ -1,20 +1,23 @@ window_sizes 1920 1017 450 1465 860 104 diagrams - sequencediagram_ref 128044 // 8-4-zamkniecieAutomatu - 1172 688 100 A4 0 0 - active sequencediagram_ref 134956 // 8-5-restartAutomatu - 1172 688 100 A4 0 0 + active classdiagram_ref 141186 // design-model + 1172 688 100 A1 502 1051 end show_stereotypes -selected class_ref 128044 // Serwisant +selected sequencediagram_ref 134956 // 8-5-restartAutomatu open class_ref 135340 // Diagnoza - class_ref 135212 // Raport class_ref 128044 // Serwisant + class_ref 141996 // NaprawaAutomatuKontroler + class_ref 128300 // SystemOperacyjny class_ref 128172 // AutomatController class_ref 134828 // Laptop class_ref 134956 // ManagerWejsciaWyjscia + class_ref 135084 // ModulLogowania + class_ref 142124 // ManagerDiagnozy + class_ref 142252 // ManagerNaprawy class_ref 191746 // Klient + class_ref 128266 // Automat end end diff --git a/models/models.prj b/models/models.prj index ef44e7e..23b5ac4 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ format 224 "models" - revision 31 - modified_by 2 "48516" + revision 32 + modified_by 44 "KingClank" @@ -1882,7 +1882,7 @@ format 224 end - class 135212 "Raport" + class 135212 "RaportDiagnozy" visibility package cpp_decl "" java_decl "" @@ -1930,17 +1930,17 @@ format 224 sequencediagram 134828 "8-3-rozpoczecieNaprawy" sequencediagramsettings end - overlapping_bars size A4 + overlapping_bars size A3 end sequencediagram 128044 "8-4-zamkniecieAutomatu" sequencediagramsettings end - overlapping_bars size A4 + overlapping_bars size A2 end sequencediagram 134956 "8-5-restartAutomatu" sequencediagramsettings end - overlapping_bars size A4 + overlapping_bars size A3 end class 128044 "Serwisant" @@ -1955,7 +1955,7 @@ format 224 end - class 141996 "NaprawaAutomatu" + class 141996 "NaprawaAutomatuKontroler" visibility package cpp_decl "" java_decl "" @@ -1965,10 +1965,10 @@ format 224 explicit_switch_type "" mysql_decl "" - classrelation 128044 // (Wykorzystuje) - relation 128044 ---> name "Wykorzystuje" + classrelation 128044 // (PrzesylaDane) + relation 128044 ---> name "PrzesylaDane" a role_name "" multiplicity "1" private - classrelation_ref 128044 // (Wykorzystuje) + classrelation_ref 128044 // (PrzesylaDane) b multiplicity "*" parent class_ref 135084 // ModulLogowania end @@ -1984,6 +1984,56 @@ format 224 a role_name "" multiplicity "1" private classrelation_ref 128684 // (Wykorzystuje) b multiplicity "1" parent class_ref 142252 // ManagerNaprawy + end + + operation 135596 "przeslijDaneLogowania()" + public explicit_return_type "" + nparams 0 + + + + + + end + + operation 135724 "przelaczWStanSerwisowy()" + public explicit_return_type "" + nparams 0 + + + + + + end + + operation 135980 "rozpocznijDiagnoze" + public explicit_return_type "" + nparams 0 + + + + + + end + + operation 136108 "rozpocznijNaprawe" + public explicit_return_type "" + nparams 0 + + + + + + end + + operation 136364 "przejdzWStanGotowosci" + public explicit_return_type "" + nparams 0 + + + + + end end @@ -2022,6 +2072,16 @@ format 224 + end + + operation 137004 "ZakonczenieSerwisu" + public explicit_return_type "" + nparams 0 + + + + + end end @@ -2086,16 +2146,6 @@ format 224 - end - - operation 128300 "PrzelaczWStanSerwisowy" - public explicit_return_type "" - nparams 0 - - - - - end attribute 128300 "ID" @@ -2119,6 +2169,23 @@ format 224 mysql_decl "" MysqlColumn end + + operation 135852 "zwrocInformacjeOWeryfikacji" + public explicit_return_type "" + nparams 0 + + + + + + end + + classrelation 135340 // (ZwracaInformacje) + relation 135340 ---> name "ZwracaInformacje" + a role_name "" multiplicity "1..*" private + classrelation_ref 135340 // (ZwracaInformacje) + b multiplicity "1" parent class_ref 141996 // NaprawaAutomatuKontroler + end end class 142124 "ManagerDiagnozy" @@ -2176,7 +2243,7 @@ format 224 relation 128556 ---> name "Stworz" a role_name "" multiplicity "1..*" private classrelation_ref 128556 // (Stworz) - b multiplicity "1" parent class_ref 135212 // Raport + b multiplicity "1" parent class_ref 135212 // RaportDiagnozy end end @@ -2190,10 +2257,10 @@ format 224 explicit_switch_type "" mysql_decl "" - classrelation 128812 // (Naprawia) - relation 128812 ---> name "Naprawia" + classrelation 128812 // (Naprawia i ZwracaRaport) + relation 128812 ---> name "Naprawia i ZwracaRaport" a role_name "" multiplicity "1" private - classrelation_ref 128812 // (Naprawia) + classrelation_ref 128812 // (Naprawia i ZwracaRaport) b multiplicity "1" parent class_ref 128300 // SystemOperacyjny end @@ -2205,6 +2272,33 @@ format 224 + end + + operation 136748 "stworzRaportOZakonczeniuNaprawy" + public explicit_return_type "" + nparams 0 + + + + + + end + + operation 136876 "zwrocRaport" + public explicit_return_type "" + nparams 0 + + + + + + end + + classrelation 135468 // (Stworz) + relation 135468 ---> name "Stworz" + a role_name "" private + classrelation_ref 135468 // (Stworz) + b parent class_ref 148780 // RaportZakonczeniaNaprawy end end @@ -2708,6 +2802,16 @@ format 224 idl_decl "" mysql_decl "" MysqlColumn + end + + operation 136236 "SygnalZamknieciaAutomatu" + public explicit_return_type "" + nparams 0 + + + + + end end @@ -2939,5 +3043,17 @@ ${members}}; mysql_decl "" end + + class 148780 "RaportZakonczeniaNaprawy" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end end end