Commit aa3e40a
1 parent afbd2ac commit aa3e40a
File tree
8 files changed
+347
-57
lines changed- python/core/composer
- src
- app/composer
- core/composer
- ui
- tests
- src/core
- testdata/control_images/expected_composermap_zebrastyle
8 files changed
+347
-57
lines changedLines changed: 26 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
247 | 247 |
| |
248 | 248 |
| |
249 | 249 |
| |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
250 | 276 |
| |
251 | 277 |
| |
252 | 278 |
| |
|
Lines changed: 89 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
61 | 61 |
| |
62 | 62 |
| |
63 | 63 |
| |
| 64 | + | |
| 65 | + | |
| 66 | + | |
64 | 67 |
| |
65 | 68 |
| |
66 | 69 |
| |
| |||
74 | 77 |
| |
75 | 78 |
| |
76 | 79 |
| |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
77 | 90 |
| |
78 | 91 |
| |
79 | 92 |
| |
| 93 | + | |
| 94 | + | |
| 95 | + | |
80 | 96 |
| |
81 | 97 |
| |
82 | 98 |
| |
| |||
339 | 355 |
| |
340 | 356 |
| |
341 | 357 |
| |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
342 | 362 |
| |
343 | 363 |
| |
344 | 364 |
| |
345 | 365 |
| |
| 366 | + | |
346 | 367 |
| |
347 | 368 |
| |
348 | 369 |
| |
349 | 370 |
| |
| 371 | + | |
350 | 372 |
| |
351 | 373 |
| |
352 | 374 |
| |
| |||
369 | 391 |
| |
370 | 392 |
| |
371 | 393 |
| |
372 |
| - | |
373 |
| - | |
374 | 394 |
| |
375 | 395 |
| |
376 | 396 |
| |
| |||
454 | 474 |
| |
455 | 475 |
| |
456 | 476 |
| |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
457 | 481 |
| |
458 | 482 |
| |
459 | 483 |
| |
| |||
880 | 904 |
| |
881 | 905 |
| |
882 | 906 |
| |
| 907 | + | |
| 908 | + | |
| 909 | + | |
| 910 | + | |
| 911 | + | |
| 912 | + | |
| 913 | + | |
| 914 | + | |
| 915 | + | |
| 916 | + | |
| 917 | + | |
| 918 | + | |
| 919 | + | |
883 | 920 |
| |
884 | 921 |
| |
| 922 | + | |
| 923 | + | |
885 | 924 |
| |
886 | 925 |
| |
887 | 926 |
| |
| |||
913 | 952 |
| |
914 | 953 |
| |
915 | 954 |
| |
| 955 | + | |
| 956 | + | |
| 957 | + | |
| 958 | + | |
| 959 | + | |
| 960 | + | |
| 961 | + | |
| 962 | + | |
| 963 | + | |
| 964 | + | |
| 965 | + | |
| 966 | + | |
| 967 | + | |
| 968 | + | |
| 969 | + | |
| 970 | + | |
| 971 | + | |
| 972 | + | |
| 973 | + | |
| 974 | + | |
| 975 | + | |
| 976 | + | |
| 977 | + | |
| 978 | + | |
| 979 | + | |
| 980 | + | |
| 981 | + | |
| 982 | + | |
| 983 | + | |
| 984 | + | |
| 985 | + | |
| 986 | + | |
| 987 | + | |
| 988 | + | |
| 989 | + | |
| 990 | + | |
| 991 | + | |
| 992 | + | |
| 993 | + | |
| 994 | + | |
| 995 | + | |
| 996 | + | |
| 997 | + | |
| 998 | + | |
| 999 | + | |
| 1000 | + | |
| 1001 | + | |
| 1002 | + | |
916 | 1003 |
| |
917 | 1004 |
| |
918 | 1005 |
| |
|
Lines changed: 7 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
85 | 85 |
| |
86 | 86 |
| |
87 | 87 |
| |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
88 | 92 |
| |
89 | 93 |
| |
90 | 94 |
| |
| |||
122 | 126 |
| |
123 | 127 |
| |
124 | 128 |
| |
| 129 | + | |
| 130 | + | |
| 131 | + | |
125 | 132 |
| |
126 | 133 |
| |
127 | 134 |
|
Lines changed: 87 additions & 8 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
49 | 49 |
| |
50 | 50 |
| |
51 | 51 |
| |
| 52 | + | |
52 | 53 |
| |
53 | 54 |
| |
54 | 55 |
| |
| |||
105 | 106 |
| |
106 | 107 |
| |
107 | 108 |
| |
108 |
| - | |
109 |
| - | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
110 | 112 |
| |
111 | 113 |
| |
112 | 114 |
| |
| |||
865 | 867 |
| |
866 | 868 |
| |
867 | 869 |
| |
| 870 | + | |
| 871 | + | |
| 872 | + | |
| 873 | + | |
| 874 | + | |
| 875 | + | |
| 876 | + | |
| 877 | + | |
| 878 | + | |
| 879 | + | |
| 880 | + | |
| 881 | + | |
| 882 | + | |
| 883 | + | |
| 884 | + | |
| 885 | + | |
| 886 | + | |
| 887 | + | |
| 888 | + | |
| 889 | + | |
| 890 | + | |
| 891 | + | |
868 | 892 |
| |
869 | 893 |
| |
870 | 894 |
| |
| |||
889 | 913 |
| |
890 | 914 |
| |
891 | 915 |
| |
| 916 | + | |
892 | 917 |
| |
893 | 918 |
| |
894 | 919 |
| |
| |||
1027 | 1052 |
| |
1028 | 1053 |
| |
1029 | 1054 |
| |
| 1055 | + | |
| 1056 | + | |
| 1057 | + | |
| 1058 | + | |
| 1059 | + | |
| 1060 | + | |
| 1061 | + | |
| 1062 | + | |
| 1063 | + | |
| 1064 | + | |
| 1065 | + | |
| 1066 | + | |
| 1067 | + | |
| 1068 | + | |
| 1069 | + | |
| 1070 | + | |
| 1071 | + | |
| 1072 | + | |
| 1073 | + | |
| 1074 | + | |
| 1075 | + | |
| 1076 | + | |
| 1077 | + | |
| 1078 | + | |
| 1079 | + | |
| 1080 | + | |
| 1081 | + | |
| 1082 | + | |
| 1083 | + | |
| 1084 | + | |
| 1085 | + | |
| 1086 | + | |
| 1087 | + | |
| 1088 | + | |
| 1089 | + | |
| 1090 | + | |
| 1091 | + | |
| 1092 | + | |
| 1093 | + | |
| 1094 | + | |
| 1095 | + | |
| 1096 | + | |
| 1097 | + | |
| 1098 | + | |
| 1099 | + | |
| 1100 | + | |
| 1101 | + | |
| 1102 | + | |
1030 | 1103 |
| |
1031 | 1104 |
| |
1032 | 1105 |
| |
| |||
1070 | 1143 |
| |
1071 | 1144 |
| |
1072 | 1145 |
| |
1073 |
| - | |
| 1146 | + | |
| 1147 | + | |
1074 | 1148 |
| |
1075 | 1149 |
| |
1076 | 1150 |
| |
| |||
1268 | 1342 |
| |
1269 | 1343 |
| |
1270 | 1344 |
| |
1271 |
| - | |
| 1345 | + | |
1272 | 1346 |
| |
1273 | 1347 |
| |
1274 | 1348 |
| |
| |||
1287 | 1361 |
| |
1288 | 1362 |
| |
1289 | 1363 |
| |
| 1364 | + | |
| 1365 | + | |
| 1366 | + | |
| 1367 | + | |
| 1368 | + | |
1290 | 1369 |
| |
1291 | 1370 |
| |
1292 | 1371 |
| |
1293 |
| - | |
| 1372 | + | |
1294 | 1373 |
| |
1295 | 1374 |
| |
1296 | 1375 |
| |
| |||
1307 | 1386 |
| |
1308 | 1387 |
| |
1309 | 1388 |
| |
1310 |
| - | |
| 1389 | + | |
1311 | 1390 |
| |
1312 | 1391 |
| |
1313 | 1392 |
| |
| |||
1347 | 1426 |
| |
1348 | 1427 |
| |
1349 | 1428 |
| |
1350 |
| - | |
| 1429 | + | |
1351 | 1430 |
| |
1352 | 1431 |
| |
1353 | 1432 |
| |
| |||
1801 | 1880 |
| |
1802 | 1881 |
| |
1803 | 1882 |
| |
1804 |
| - | |
| 1883 | + | |
1805 | 1884 |
| |
1806 | 1885 |
| |
1807 | 1886 |
| |
|
Lines changed: 30 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
287 | 287 |
| |
288 | 288 |
| |
289 | 289 |
| |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
290 | 316 |
| |
291 | 317 |
| |
292 | 318 |
| |
| |||
470 | 496 |
| |
471 | 497 |
| |
472 | 498 |
| |
| 499 | + | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
473 | 503 |
| |
474 | 504 |
| |
475 | 505 |
| |
|
Lines changed: 87 additions & 31 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
54 | 54 |
| |
55 | 55 |
| |
56 | 56 |
| |
57 |
| - | |
| 57 | + | |
58 | 58 |
| |
59 |
| - | |
| 59 | + | |
60 | 60 |
| |
61 | 61 |
| |
62 | 62 |
| |
| |||
393 | 393 |
| |
394 | 394 |
| |
395 | 395 |
| |
396 |
| - | |
397 |
| - | |
398 |
| - | |
399 |
| - | |
400 |
| - | |
401 |
| - | |
402 |
| - | |
403 |
| - | |
404 |
| - | |
405 |
| - | |
406 |
| - | |
407 |
| - | |
408 |
| - | |
409 |
| - | |
410 |
| - | |
411 |
| - | |
412 |
| - | |
413 |
| - | |
414 |
| - | |
415 |
| - | |
416 |
| - | |
417 |
| - | |
418 |
| - | |
419 |
| - | |
420 |
| - | |
421 |
| - | |
422 | 396 |
| |
423 | 397 |
| |
424 | 398 |
| |
| |||
428 | 402 |
| |
429 | 403 |
| |
430 | 404 |
| |
431 |
| - | |
| 405 | + | |
432 | 406 |
| |
433 | 407 |
| |
434 | 408 |
| |
435 | 409 |
| |
436 | 410 |
| |
437 | 411 |
| |
438 |
| - | |
| 412 | + | |
439 | 413 |
| |
440 | 414 |
| |
441 |
| - | |
| 415 | + | |
442 | 416 |
| |
443 | 417 |
| |
444 | 418 |
| |
| |||
460 | 434 |
| |
461 | 435 |
| |
462 | 436 |
| |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 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 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
463 | 519 |
| |
464 | 520 |
| |
465 | 521 |
| |
|
Lines changed: 21 additions & 16 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
75 | 75 |
| |
76 | 76 |
| |
77 | 77 |
| |
78 |
| - | |
| 78 | + | |
79 | 79 |
| |
80 | 80 |
| |
81 | 81 |
| |
| |||
84 | 84 |
| |
85 | 85 |
| |
86 | 86 |
| |
87 |
| - | |
| 87 | + | |
88 | 88 |
| |
89 | 89 |
| |
90 | 90 |
| |
91 | 91 |
| |
92 | 92 |
| |
93 | 93 |
| |
94 | 94 |
| |
95 |
| - | |
| 95 | + | |
96 | 96 |
| |
97 | 97 |
| |
98 | 98 |
| |
| |||
108 | 108 |
| |
109 | 109 |
| |
110 | 110 |
| |
111 |
| - | |
| 111 | + | |
112 | 112 |
| |
113 | 113 |
| |
114 | 114 |
| |
| |||
132 | 132 |
| |
133 | 133 |
| |
134 | 134 |
| |
135 |
| - | |
136 |
| - | |
| 135 | + | |
| 136 | + | |
137 | 137 |
| |
138 | 138 |
| |
139 | 139 |
| |
| |||
148 | 148 |
| |
149 | 149 |
| |
150 | 150 |
| |
151 |
| - | |
152 |
| - | |
| 151 | + | |
| 152 | + | |
153 | 153 |
| |
154 | 154 |
| |
155 | 155 |
| |
| |||
165 | 165 |
| |
166 | 166 |
| |
167 | 167 |
| |
168 |
| - | |
169 |
| - | |
| 168 | + | |
| 169 | + | |
170 | 170 |
| |
171 | 171 |
| |
172 | 172 |
| |
| |||
182 | 182 |
| |
183 | 183 |
| |
184 | 184 |
| |
185 |
| - | |
186 |
| - | |
| 185 | + | |
| 186 | + | |
187 | 187 |
| |
188 | 188 |
| |
189 | 189 |
| |
| |||
222 | 222 |
| |
223 | 223 |
| |
224 | 224 |
| |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
225 | 230 |
| |
226 | 231 |
| |
227 | 232 |
| |
228 |
| - | |
229 |
| - | |
| 233 | + | |
| 234 | + | |
230 | 235 |
| |
231 | 236 |
| |
232 | 237 |
| |
| |||
242 | 247 |
| |
243 | 248 |
| |
244 | 249 |
| |
245 |
| - | |
246 |
| - | |
| 250 | + | |
| 251 | + | |
247 | 252 |
| |
248 | 253 |
| |
249 | 254 |
| |
|
0 commit comments