Commit 9d2c4fc
1 parent a06000e commit 9d2c4fc
File tree
21 files changed
+351
-208
lines changed- python
- core
- layout
- scalebar
- plugins/processing/tests/testdata/custom
- src
- app
- layout
- core
- layout
- scalebar
- ui/layout
- tests/src/core
21 files changed
+351
-208
lines changedLines changed: 31 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
192 | 192 |
| |
193 | 193 |
| |
194 | 194 |
| |
195 |
| - | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
196 | 214 |
| |
197 | 215 |
| |
198 | 216 |
| |
199 | 217 |
| |
| 218 | + | |
| 219 | + | |
200 | 220 |
| |
201 | 221 |
| |
202 |
| - | |
| 222 | + | |
203 | 223 |
| |
204 | 224 |
| |
205 | 225 |
| |
206 |
| - | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
207 | 229 |
| |
208 | 230 |
| |
209 |
| - | |
| 231 | + | |
210 | 232 |
| |
211 | 233 |
| |
212 | 234 |
| |
213 | 235 |
| |
214 | 236 |
| |
215 | 237 |
| |
| 238 | + | |
| 239 | + | |
216 | 240 |
| |
217 | 241 |
| |
218 |
| - | |
| 242 | + | |
219 | 243 |
| |
220 | 244 |
| |
221 | 245 |
| |
222 | 246 |
| |
223 | 247 |
| |
224 | 248 |
| |
| 249 | + | |
| 250 | + | |
225 | 251 |
| |
226 | 252 |
| |
227 | 253 |
| |
|
Lines changed: 10 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
74 | 74 |
| |
75 | 75 |
| |
76 | 76 |
| |
77 |
| - | |
| 77 | + | |
78 | 78 |
| |
79 | 79 |
| |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
80 | 89 |
| |
81 | 90 |
| |
82 | 91 |
| |
|
Lines changed: 32 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
206 | 206 |
| |
207 | 207 |
| |
208 | 208 |
| |
209 |
| - | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
210 | 229 |
| |
211 | 230 |
| |
212 | 231 |
| |
213 | 232 |
| |
| 233 | + | |
| 234 | + | |
214 | 235 |
| |
215 | 236 |
| |
216 |
| - | |
| 237 | + | |
217 | 238 |
| |
218 | 239 |
| |
219 | 240 |
| |
220 |
| - | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
221 | 244 |
| |
222 | 245 |
| |
223 |
| - | |
| 246 | + | |
224 | 247 |
| |
225 | 248 |
| |
226 | 249 |
| |
227 | 250 |
| |
228 | 251 |
| |
229 | 252 |
| |
| 253 | + | |
| 254 | + | |
230 | 255 |
| |
231 | 256 |
| |
232 |
| - | |
| 257 | + | |
233 | 258 |
| |
234 | 259 |
| |
235 | 260 |
| |
236 | 261 |
| |
237 | 262 |
| |
238 | 263 |
| |
| 264 | + | |
| 265 | + | |
239 | 266 |
| |
240 | 267 |
| |
241 | 268 |
| |
|
Binary file not shown.
Lines changed: 8 additions & 27 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
36 | 36 |
| |
37 | 37 |
| |
38 | 38 |
| |
39 |
| - | |
40 | 39 |
| |
41 | 40 |
| |
42 | 41 |
| |
| |||
101 | 100 |
| |
102 | 101 |
| |
103 | 102 |
| |
104 |
| - | |
105 |
| - | |
106 |
| - | |
| 103 | + | |
| 104 | + | |
107 | 105 |
| |
108 | 106 |
| |
109 | 107 |
| |
| |||
135 | 133 |
| |
136 | 134 |
| |
137 | 135 |
| |
138 |
| - | |
| 136 | + | |
139 | 137 |
| |
140 | 138 |
| |
141 | 139 |
| |
| |||
181 | 179 |
| |
182 | 180 |
| |
183 | 181 |
| |
184 |
| - | |
185 | 182 |
| |
186 | 183 |
| |
187 | 184 |
| |
188 |
| - | |
| 185 | + | |
189 | 186 |
| |
190 | 187 |
| |
191 | 188 |
| |
| |||
196 | 193 |
| |
197 | 194 |
| |
198 | 195 |
| |
199 |
| - | |
| 196 | + | |
200 | 197 |
| |
201 | 198 |
| |
202 | 199 |
| |
| |||
300 | 297 |
| |
301 | 298 |
| |
302 | 299 |
| |
303 |
| - | |
| 300 | + | |
304 | 301 |
| |
305 | 302 |
| |
306 | 303 |
| |
| |||
309 | 306 |
| |
310 | 307 |
| |
311 | 308 |
| |
312 |
| - | |
| 309 | + | |
313 | 310 |
| |
314 | 311 |
| |
315 | 312 |
| |
316 | 313 |
| |
317 | 314 |
| |
318 |
| - | |
319 |
| - | |
320 |
| - | |
321 |
| - | |
322 |
| - | |
323 |
| - | |
324 |
| - | |
325 |
| - | |
326 |
| - | |
327 |
| - | |
328 |
| - | |
329 |
| - | |
330 |
| - | |
331 |
| - | |
332 |
| - | |
333 | 315 |
| |
334 | 316 |
| |
335 | 317 |
| |
| |||
535 | 517 |
| |
536 | 518 |
| |
537 | 519 |
| |
538 |
| - | |
| 520 | + | |
539 | 521 |
| |
540 | 522 |
| |
541 | 523 |
| |
| |||
583 | 565 |
| |
584 | 566 |
| |
585 | 567 |
| |
586 |
| - | |
587 | 568 |
| |
588 | 569 |
| |
589 | 570 |
| |
|
Lines changed: 1 addition & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
48 | 48 |
| |
49 | 49 |
| |
50 | 50 |
| |
51 |
| - | |
52 | 51 |
| |
53 | 52 |
| |
54 | 53 |
| |
| |||
66 | 65 |
| |
67 | 66 |
| |
68 | 67 |
| |
69 |
| - | |
| 68 | + | |
70 | 69 |
| |
71 | 70 |
| |
72 | 71 |
| |
|
Lines changed: 27 additions & 13 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
85 | 85 |
| |
86 | 86 |
| |
87 | 87 |
| |
88 |
| - | |
89 |
| - | |
| 88 | + | |
| 89 | + | |
90 | 90 |
| |
91 |
| - | |
| 91 | + | |
92 | 92 |
| |
93 |
| - | |
94 |
| - | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
95 | 96 |
| |
96 | 97 |
| |
97 | 98 |
| |
98 |
| - | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
99 | 113 |
| |
100 | 114 |
| |
101 | 115 |
| |
| |||
113 | 127 |
| |
114 | 128 |
| |
115 | 129 |
| |
116 |
| - | |
117 |
| - | |
118 |
| - | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
119 | 136 |
| |
120 | 137 |
| |
121 | 138 |
| |
| |||
127 | 144 |
| |
128 | 145 |
| |
129 | 146 |
| |
| 147 | + | |
130 | 148 |
| |
131 | 149 |
| |
132 | 150 |
| |
| |||
137 | 155 |
| |
138 | 156 |
| |
139 | 157 |
| |
140 |
| - | |
141 |
| - | |
142 | 158 |
| |
143 | 159 |
| |
144 | 160 |
| |
| |||
149 | 165 |
| |
150 | 166 |
| |
151 | 167 |
| |
152 |
| - | |
153 |
| - | |
154 | 168 |
| |
155 | 169 |
| |
156 | 170 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
64 | 64 |
| |
65 | 65 |
| |
66 | 66 |
| |
67 |
| - | |
68 |
| - | |
| 67 | + | |
| 68 | + | |
69 | 69 |
| |
70 | 70 |
| |
71 | 71 |
| |
|
Lines changed: 3 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
84 | 84 |
| |
85 | 85 |
| |
86 | 86 |
| |
87 |
| - | |
88 |
| - | |
| 87 | + | |
| 88 | + | |
89 | 89 |
| |
90 | 90 |
| |
91 | 91 |
| |
| |||
111 | 111 |
| |
112 | 112 |
| |
113 | 113 |
| |
114 |
| - | |
| 114 | + | |
115 | 115 |
| |
116 | 116 |
| |
117 | 117 |
| |
|
Lines changed: 6 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1031 | 1031 |
| |
1032 | 1032 |
| |
1033 | 1033 |
| |
| 1034 | + | |
1034 | 1035 |
| |
| 1036 | + | |
1035 | 1037 |
| |
1036 | 1038 |
| |
1037 | 1039 |
| |
| |||
1124 | 1126 |
| |
1125 | 1127 |
| |
1126 | 1128 |
| |
| 1129 | + | |
1127 | 1130 |
| |
| 1131 | + | |
1128 | 1132 |
| |
1129 | 1133 |
| |
1130 | 1134 |
| |
1131 | 1135 |
| |
1132 | 1136 |
| |
1133 | 1137 |
| |
| 1138 | + | |
1134 | 1139 |
| |
| 1140 | + | |
1135 | 1141 |
| |
1136 | 1142 |
| |
1137 | 1143 |
| |
|
Lines changed: 54 additions & 21 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
134 | 134 |
| |
135 | 135 |
| |
136 | 136 |
| |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
137 | 149 |
| |
138 | 150 |
| |
139 | 151 |
| |
| |||
376 | 388 |
| |
377 | 389 |
| |
378 | 390 |
| |
| 391 | + | |
379 | 392 |
| |
380 | 393 |
| |
381 | 394 |
| |
382 | 395 |
| |
383 | 396 |
| |
384 |
| - | |
385 |
| - | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
386 | 402 |
| |
387 | 403 |
| |
388 | 404 |
| |
| |||
546 | 562 |
| |
547 | 563 |
| |
548 | 564 |
| |
549 |
| - | |
| 565 | + | |
550 | 566 |
| |
551 | 567 |
| |
552 | 568 |
| |
553 | 569 |
| |
| 570 | + | |
554 | 571 |
| |
| 572 | + | |
555 | 573 |
| |
556 | 574 |
| |
557 | 575 |
| |
558 | 576 |
| |
559 |
| - | |
| 577 | + | |
560 | 578 |
| |
561 | 579 |
| |
562 | 580 |
| |
| |||
569 | 587 |
| |
570 | 588 |
| |
571 | 589 |
| |
572 |
| - | |
| 590 | + | |
| 591 | + | |
| 592 | + | |
| 593 | + | |
573 | 594 |
| |
574 | 595 |
| |
575 | 596 |
| |
| |||
614 | 635 |
| |
615 | 636 |
| |
616 | 637 |
| |
617 |
| - | |
618 |
| - | |
619 |
| - | |
620 |
| - | |
621 |
| - | |
622 |
| - | |
623 |
| - | |
624 |
| - | |
625 | 638 |
| |
626 | 639 |
| |
627 | 640 |
| |
628 | 641 |
| |
629 | 642 |
| |
630 | 643 |
| |
631 |
| - | |
| 644 | + | |
632 | 645 |
| |
633 | 646 |
| |
634 | 647 |
| |
| |||
645 | 658 |
| |
646 | 659 |
| |
647 | 660 |
| |
648 |
| - | |
649 |
| - | |
| 661 | + | |
| 662 | + | |
| 663 | + | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
| 668 | + | |
650 | 669 |
| |
651 |
| - | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
| 674 | + | |
| 675 | + | |
| 676 | + | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
| 682 | + | |
| 683 | + | |
| 684 | + | |
| 685 | + | |
652 | 686 |
| |
653 |
| - | |
654 | 687 |
| |
655 | 688 |
| |
656 | 689 |
| |
| |||
743 | 776 |
| |
744 | 777 |
| |
745 | 778 |
| |
746 |
| - | |
| 779 | + | |
747 | 780 |
| |
748 | 781 |
| |
749 |
| - | |
| 782 | + | |
750 | 783 |
| |
751 | 784 |
| |
752 | 785 |
| |
753 |
| - | |
| 786 | + | |
754 | 787 |
| |
755 | 788 |
| |
756 | 789 |
| |
|
Lines changed: 23 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
174 | 174 |
| |
175 | 175 |
| |
176 | 176 |
| |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
177 | 191 |
| |
178 | 192 |
| |
179 | 193 |
| |
| 194 | + | |
180 | 195 |
| |
181 |
| - | |
| 196 | + | |
182 | 197 |
| |
183 | 198 |
| |
184 | 199 |
| |
185 |
| - | |
| 200 | + | |
| 201 | + | |
186 | 202 |
| |
187 |
| - | |
| 203 | + | |
188 | 204 |
| |
189 | 205 |
| |
190 | 206 |
| |
191 | 207 |
| |
192 | 208 |
| |
| 209 | + | |
193 | 210 |
| |
194 |
| - | |
| 211 | + | |
195 | 212 |
| |
196 | 213 |
| |
197 | 214 |
| |
198 | 215 |
| |
199 | 216 |
| |
| 217 | + | |
200 | 218 |
| |
201 |
| - | |
| 219 | + | |
202 | 220 |
| |
203 | 221 |
| |
204 | 222 |
| |
|
Lines changed: 5 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
28 | 28 |
| |
29 | 29 |
| |
30 | 30 |
| |
31 |
| - | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
32 | 35 |
| |
33 | 36 |
| |
34 | 37 |
| |
| |||
41 | 44 |
| |
42 | 45 |
| |
43 | 46 |
| |
44 |
| - | |
| 47 | + | |
45 | 48 |
| |
46 | 49 |
| |
47 | 50 |
| |
|
Lines changed: 9 additions & 10 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
33 | 33 |
| |
34 | 34 |
| |
35 | 35 |
| |
36 |
| - | |
37 |
| - | |
38 |
| - | |
39 | 36 |
| |
40 | 37 |
| |
41 |
| - | |
| 38 | + | |
42 | 39 |
| |
43 | 40 |
| |
44 | 41 |
| |
45 |
| - | |
| 42 | + | |
46 | 43 |
| |
47 | 44 |
| |
48 |
| - | |
| 45 | + | |
49 | 46 |
| |
50 | 47 |
| |
51 |
| - | |
| 48 | + | |
52 | 49 |
| |
53 | 50 |
| |
54 | 51 |
| |
55 | 52 |
| |
56 | 53 |
| |
57 | 54 |
| |
58 |
| - | |
| 55 | + | |
59 | 56 |
| |
60 | 57 |
| |
61 | 58 |
| |
62 | 59 |
| |
63 | 60 |
| |
64 | 61 |
| |
65 | 62 |
| |
66 |
| - | |
67 |
| - | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
68 | 67 |
| |
69 | 68 |
| |
70 | 69 |
| |
|
Lines changed: 27 additions & 13 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
17 | 17 |
| |
18 | 18 |
| |
19 | 19 |
| |
| 20 | + | |
20 | 21 |
| |
21 | 22 |
| |
22 | 23 |
| |
| |||
31 | 32 |
| |
32 | 33 |
| |
33 | 34 |
| |
34 |
| - | |
35 |
| - | |
36 |
| - | |
| 35 | + | |
37 | 36 |
| |
38 | 37 |
| |
39 |
| - | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
40 | 42 |
| |
41 | 43 |
| |
42 | 44 |
| |
| |||
65 | 67 |
| |
66 | 68 |
| |
67 | 69 |
| |
68 |
| - | |
69 |
| - | |
70 |
| - | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
71 | 73 |
| |
72 | 74 |
| |
73 | 75 |
| |
| |||
81 | 83 |
| |
82 | 84 |
| |
83 | 85 |
| |
84 |
| - | |
85 |
| - | |
86 |
| - | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
87 | 89 |
| |
88 | 90 |
| |
89 | 91 |
| |
| |||
92 | 94 |
| |
93 | 95 |
| |
94 | 96 |
| |
| 97 | + | |
| 98 | + | |
95 | 99 |
| |
96 |
| - | |
| 100 | + | |
97 | 101 |
| |
98 | 102 |
| |
99 | 103 |
| |
100 | 104 |
| |
101 | 105 |
| |
102 | 106 |
| |
103 |
| - | |
| 107 | + | |
104 | 108 |
| |
105 | 109 |
| |
106 | 110 |
| |
107 | 111 |
| |
108 |
| - | |
| 112 | + | |
109 | 113 |
| |
110 | 114 |
| |
111 | 115 |
| |
| |||
125 | 129 |
| |
126 | 130 |
| |
127 | 131 |
| |
| 132 | + | |
128 | 133 |
| |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
129 | 141 |
| |
130 | 142 |
| |
131 | 143 |
| |
| |||
136 | 148 |
| |
137 | 149 |
| |
138 | 150 |
| |
| 151 | + | |
139 | 152 |
| |
140 | 153 |
| |
141 | 154 |
| |
| |||
154 | 167 |
| |
155 | 168 |
| |
156 | 169 |
| |
| 170 | + | |
157 | 171 |
| |
158 | 172 |
| |
159 | 173 |
| |
|
Lines changed: 9 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
18 | 18 |
| |
19 | 19 |
| |
20 | 20 |
| |
| 21 | + | |
21 | 22 |
| |
22 | 23 |
| |
23 | 24 |
| |
| |||
103 | 104 |
| |
104 | 105 |
| |
105 | 106 |
| |
| 107 | + | |
106 | 108 |
| |
107 |
| - | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
108 | 116 |
| |
109 | 117 |
| |
110 | 118 |
| |
|
Lines changed: 51 additions & 10 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
20 | 20 |
| |
21 | 21 |
| |
22 | 22 |
| |
| 23 | + | |
23 | 24 |
| |
24 | 25 |
| |
25 | 26 |
| |
| |||
71 | 72 |
| |
72 | 73 |
| |
73 | 74 |
| |
74 |
| - | |
75 |
| - | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
76 | 78 |
| |
77 | 79 |
| |
78 | 80 |
| |
| |||
207 | 209 |
| |
208 | 210 |
| |
209 | 211 |
| |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
210 | 233 |
| |
211 | 234 |
| |
212 | 235 |
| |
| 236 | + | |
213 | 237 |
| |
214 |
| - | |
| 238 | + | |
215 | 239 |
| |
216 | 240 |
| |
217 | 241 |
| |
218 |
| - | |
| 242 | + | |
| 243 | + | |
219 | 244 |
| |
220 |
| - | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
221 | 259 |
| |
222 | 260 |
| |
223 | 261 |
| |
224 | 262 |
| |
225 | 263 |
| |
| 264 | + | |
226 | 265 |
| |
227 |
| - | |
| 266 | + | |
228 | 267 |
| |
229 | 268 |
| |
230 | 269 |
| |
231 | 270 |
| |
232 | 271 |
| |
| 272 | + | |
233 | 273 |
| |
234 |
| - | |
| 274 | + | |
235 | 275 |
| |
236 | 276 |
| |
237 | 277 |
| |
| |||
417 | 457 |
| |
418 | 458 |
| |
419 | 459 |
| |
420 |
| - | |
421 |
| - | |
422 |
| - | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
423 | 464 |
| |
424 | 465 |
| |
425 | 466 |
| |
|
Lines changed: 5 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
28 | 28 |
| |
29 | 29 |
| |
30 | 30 |
| |
31 |
| - | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
32 | 35 |
| |
33 | 36 |
| |
34 | 37 |
| |
| |||
39 | 42 |
| |
40 | 43 |
| |
41 | 44 |
| |
42 |
| - | |
| 45 | + | |
43 | 46 |
| |
44 | 47 |
| |
45 | 48 |
| |
|
Lines changed: 5 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
40 | 40 |
| |
41 | 41 |
| |
42 | 42 |
| |
43 |
| - | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
44 | 47 |
| |
45 | 48 |
| |
46 | 49 |
| |
47 |
| - | |
| 50 | + | |
48 | 51 |
| |
49 | 52 |
| |
50 | 53 |
| |
|
Lines changed: 32 additions & 76 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
60 | 60 |
| |
61 | 61 |
| |
62 | 62 |
| |
63 |
| - | |
| 63 | + | |
64 | 64 |
| |
65 |
| - | |
| 65 | + | |
66 | 66 |
| |
67 | 67 |
| |
68 | 68 |
| |
| |||
466 | 466 |
| |
467 | 467 |
| |
468 | 468 |
| |
469 |
| - | |
470 |
| - | |
471 |
| - | |
472 |
| - | |
473 |
| - | |
474 |
| - | |
475 |
| - | |
476 |
| - | |
477 |
| - | |
478 |
| - | |
479 |
| - | |
480 |
| - | |
481 |
| - | |
482 |
| - | |
483 |
| - | |
484 |
| - | |
485 |
| - | |
486 |
| - | |
487 |
| - | |
488 |
| - | |
489 |
| - | |
490 |
| - | |
491 |
| - | |
492 |
| - | |
493 |
| - | |
494 |
| - | |
495 |
| - | |
496 |
| - | |
497 |
| - | |
498 |
| - | |
499 |
| - | |
500 |
| - | |
501 |
| - | |
502 |
| - | |
503 |
| - | |
504 |
| - | |
505 |
| - | |
506 |
| - | |
507 |
| - | |
508 |
| - | |
509 |
| - | |
510 |
| - | |
511 |
| - | |
512 |
| - | |
| 469 | + | |
513 | 470 |
| |
514 | 471 |
| |
515 | 472 |
| |
| |||
552 | 509 |
| |
553 | 510 |
| |
554 | 511 |
| |
555 |
| - | |
556 |
| - | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
| 519 | + | |
557 | 520 |
| |
558 |
| - | |
| 521 | + | |
559 | 522 |
| |
560 | 523 |
| |
561 | 524 |
| |
562 |
| - | |
| 525 | + | |
563 | 526 |
| |
564 | 527 |
| |
565 | 528 |
| |
566 | 529 |
| |
567 | 530 |
| |
568 | 531 |
| |
569 |
| - | |
570 |
| - | |
| 532 | + | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
571 | 541 |
| |
572 |
| - | |
| 542 | + | |
573 | 543 |
| |
574 | 544 |
| |
575 | 545 |
| |
| |||
588 | 558 |
| |
589 | 559 |
| |
590 | 560 |
| |
591 |
| - | |
| 561 | + | |
592 | 562 |
| |
593 | 563 |
| |
594 | 564 |
| |
595 | 565 |
| |
596 | 566 |
| |
597 | 567 |
| |
598 |
| - | |
| 568 | + | |
599 | 569 |
| |
600 | 570 |
| |
601 | 571 |
| |
| |||
609 | 579 |
| |
610 | 580 |
| |
611 | 581 |
| |
612 |
| - | |
613 |
| - | |
| 582 | + | |
| 583 | + | |
614 | 584 |
| |
615 |
| - | |
| 585 | + | |
616 | 586 |
| |
617 | 587 |
| |
618 | 588 |
| |
619 | 589 |
| |
620 |
| - | |
| 590 | + | |
621 | 591 |
| |
622 |
| - | |
| 592 | + | |
623 | 593 |
| |
624 | 594 |
| |
625 | 595 |
| |
| |||
638 | 608 |
| |
639 | 609 |
| |
640 | 610 |
| |
641 |
| - | |
| 611 | + | |
642 | 612 |
| |
643 | 613 |
| |
644 | 614 |
| |
645 | 615 |
| |
646 | 616 |
| |
647 | 617 |
| |
648 |
| - | |
| 618 | + | |
649 | 619 |
| |
650 | 620 |
| |
651 | 621 |
| |
| |||
659 | 629 |
| |
660 | 630 |
| |
661 | 631 |
| |
662 |
| - | |
663 |
| - | |
664 |
| - | |
665 |
| - | |
666 |
| - | |
667 |
| - | |
668 |
| - | |
669 |
| - | |
670 |
| - | |
671 |
| - | |
672 |
| - | |
673 |
| - | |
674 |
| - | |
675 | 632 |
| |
676 | 633 |
| |
677 | 634 |
| |
| |||
765 | 722 |
| |
766 | 723 |
| |
767 | 724 |
| |
768 |
| - | |
769 | 725 |
| |
770 | 726 |
| |
771 | 727 |
| |
|
Lines changed: 11 additions & 8 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
113 | 113 |
| |
114 | 114 |
| |
115 | 115 |
| |
116 |
| - | |
| 116 | + | |
117 | 117 |
| |
118 | 118 |
| |
119 | 119 |
| |
| |||
141 | 141 |
| |
142 | 142 |
| |
143 | 143 |
| |
144 |
| - | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
145 | 147 |
| |
146 | 148 |
| |
147 | 149 |
| |
| |||
153 | 155 |
| |
154 | 156 |
| |
155 | 157 |
| |
156 |
| - | |
157 | 158 |
| |
158 | 159 |
| |
159 | 160 |
| |
| |||
174 | 175 |
| |
175 | 176 |
| |
176 | 177 |
| |
177 |
| - | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
178 | 181 |
| |
179 | 182 |
| |
180 | 183 |
| |
| |||
186 | 189 |
| |
187 | 190 |
| |
188 | 191 |
| |
189 |
| - | |
190 | 192 |
| |
191 | 193 |
| |
192 | 194 |
| |
| |||
208 | 210 |
| |
209 | 211 |
| |
210 | 212 |
| |
211 |
| - | |
| 213 | + | |
| 214 | + | |
212 | 215 |
| |
213 | 216 |
| |
214 | 217 |
| |
| |||
218 | 221 |
| |
219 | 222 |
| |
220 | 223 |
| |
221 |
| - | |
| 224 | + | |
222 | 225 |
| |
223 | 226 |
| |
224 | 227 |
| |
| |||
241 | 244 |
| |
242 | 245 |
| |
243 | 246 |
| |
244 |
| - | |
| 247 | + | |
245 | 248 |
| |
246 | 249 |
| |
247 | 250 |
| |
|
0 commit comments