Commit ac9220d
1 parent 991f94d commit ac9220d
File tree
12 files changed
+732
-92
lines changed- python/core/composer
- src
- app/composer
- core/composer
- ui
- tests
- src/core
- testdata/control_images
- expected_composermap_filteredannotations
- expected_composermap_framedivisions
- expected_composermap_rotatedannotations
- expected_composermap_rotatedframe
12 files changed
+732
-92
lines changedLines changed: 48 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
138 | 138 |
| |
139 | 139 |
| |
140 | 140 |
| |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
141 | 151 |
| |
142 | 152 |
| |
143 | 153 |
| |
144 | 154 |
| |
145 | 155 |
| |
146 |
| - | |
| 156 | + | |
147 | 157 |
| |
148 |
| - | |
| 158 | + | |
| 159 | + | |
149 | 160 |
| |
150 | 161 |
| |
151 | 162 |
| |
| |||
488 | 499 |
| |
489 | 500 |
| |
490 | 501 |
| |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
| 509 | + | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
| 519 | + | |
| 520 | + | |
491 | 521 |
| |
492 | 522 |
| |
493 | 523 |
| |
| |||
565 | 595 |
| |
566 | 596 |
| |
567 | 597 |
| |
| 598 | + | |
| 599 | + | |
| 600 | + | |
| 601 | + | |
| 602 | + | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
| 609 | + | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
| 613 | + | |
568 | 614 |
| |
569 | 615 |
| |
570 | 616 |
| |
|
Lines changed: 174 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
69 | 69 |
| |
70 | 70 |
| |
71 | 71 |
| |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
72 | 77 |
| |
73 | 78 |
| |
74 | 79 |
| |
| |||
78 | 83 |
| |
79 | 84 |
| |
80 | 85 |
| |
81 |
| - | |
82 | 86 |
| |
83 | 87 |
| |
84 | 88 |
| |
85 | 89 |
| |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
86 | 95 |
| |
87 | 96 |
| |
88 | 97 |
| |
| |||
757 | 766 |
| |
758 | 767 |
| |
759 | 768 |
| |
| 769 | + | |
| 770 | + | |
| 771 | + | |
| 772 | + | |
| 773 | + | |
| 774 | + | |
| 775 | + | |
| 776 | + | |
| 777 | + | |
| 778 | + | |
| 779 | + | |
| 780 | + | |
| 781 | + | |
| 782 | + | |
| 783 | + | |
| 784 | + | |
| 785 | + | |
| 786 | + | |
| 787 | + | |
| 788 | + | |
| 789 | + | |
| 790 | + | |
| 791 | + | |
| 792 | + | |
| 793 | + | |
| 794 | + | |
| 795 | + | |
| 796 | + | |
| 797 | + | |
| 798 | + | |
| 799 | + | |
| 800 | + | |
| 801 | + | |
| 802 | + | |
| 803 | + | |
| 804 | + | |
| 805 | + | |
| 806 | + | |
| 807 | + | |
| 808 | + | |
| 809 | + | |
| 810 | + | |
| 811 | + | |
| 812 | + | |
760 | 813 |
| |
761 | 814 |
| |
762 | 815 |
| |
| |||
772 | 825 |
| |
773 | 826 |
| |
774 | 827 |
| |
| 828 | + | |
| 829 | + | |
| 830 | + | |
| 831 | + | |
| 832 | + | |
| 833 | + | |
| 834 | + | |
| 835 | + | |
775 | 836 |
| |
776 | 837 |
| |
777 | 838 |
| |
| |||
849 | 910 |
| |
850 | 911 |
| |
851 | 912 |
| |
852 |
| - | |
853 | 913 |
| |
854 | 914 |
| |
855 | 915 |
| |
| |||
858 | 918 |
| |
859 | 919 |
| |
860 | 920 |
| |
| 921 | + | |
| 922 | + | |
| 923 | + | |
| 924 | + | |
| 925 | + | |
| 926 | + | |
| 927 | + | |
| 928 | + | |
| 929 | + | |
| 930 | + | |
| 931 | + | |
| 932 | + | |
| 933 | + | |
| 934 | + | |
| 935 | + | |
| 936 | + | |
| 937 | + | |
| 938 | + | |
| 939 | + | |
| 940 | + | |
| 941 | + | |
| 942 | + | |
| 943 | + | |
| 944 | + | |
| 945 | + | |
| 946 | + | |
| 947 | + | |
| 948 | + | |
| 949 | + | |
| 950 | + | |
| 951 | + | |
| 952 | + | |
| 953 | + | |
| 954 | + | |
861 | 955 |
| |
862 | 956 |
| |
863 | 957 |
| |
| |||
907 | 1001 |
| |
908 | 1002 |
| |
909 | 1003 |
| |
| 1004 | + | |
| 1005 | + | |
| 1006 | + | |
| 1007 | + | |
| 1008 | + | |
| 1009 | + | |
| 1010 | + | |
| 1011 | + | |
| 1012 | + | |
| 1013 | + | |
| 1014 | + | |
| 1015 | + | |
| 1016 | + | |
| 1017 | + | |
| 1018 | + | |
910 | 1019 |
| |
911 | 1020 |
| |
912 | 1021 |
| |
| |||
918 | 1027 |
| |
919 | 1028 |
| |
920 | 1029 |
| |
921 |
| - | |
| 1030 | + | |
922 | 1031 |
| |
923 | 1032 |
| |
924 | 1033 |
| |
925 |
| - | |
926 |
| - | |
927 |
| - | |
928 |
| - | |
929 | 1034 |
| |
930 | 1035 |
| |
931 | 1036 |
| |
| |||
1160 | 1265 |
| |
1161 | 1266 |
| |
1162 | 1267 |
| |
| 1268 | + | |
| 1269 | + | |
| 1270 | + | |
| 1271 | + | |
1163 | 1272 |
| |
1164 | 1273 |
| |
1165 | 1274 |
| |
| |||
1185 | 1294 |
| |
1186 | 1295 |
| |
1187 | 1296 |
| |
| 1297 | + | |
| 1298 | + | |
| 1299 | + | |
| 1300 | + | |
1188 | 1301 |
| |
1189 | 1302 |
| |
1190 | 1303 |
| |
1191 | 1304 |
| |
| 1305 | + | |
1192 | 1306 |
| |
1193 | 1307 |
| |
| 1308 | + | |
1194 | 1309 |
| |
1195 | 1310 |
| |
| 1311 | + | |
1196 | 1312 |
| |
1197 | 1313 |
| |
| 1314 | + | |
1198 | 1315 |
| |
1199 | 1316 |
| |
1200 | 1317 |
| |
| |||
1310 | 1427 |
| |
1311 | 1428 |
| |
1312 | 1429 |
| |
| 1430 | + | |
| 1431 | + | |
| 1432 | + | |
| 1433 | + | |
| 1434 | + | |
1313 | 1435 |
| |
1314 | 1436 |
| |
1315 | 1437 |
| |
| |||
1318 | 1440 |
| |
1319 | 1441 |
| |
1320 | 1442 |
| |
| 1443 | + | |
| 1444 | + | |
| 1445 | + | |
| 1446 | + | |
| 1447 | + | |
1321 | 1448 |
| |
1322 | 1449 |
| |
1323 | 1450 |
| |
| |||
1598 | 1725 |
| |
1599 | 1726 |
| |
1600 | 1727 |
| |
| 1728 | + | |
| 1729 | + | |
| 1730 | + | |
| 1731 | + | |
| 1732 | + | |
| 1733 | + | |
| 1734 | + | |
| 1735 | + | |
| 1736 | + | |
| 1737 | + | |
| 1738 | + | |
| 1739 | + | |
| 1740 | + | |
| 1741 | + | |
| 1742 | + | |
| 1743 | + | |
| 1744 | + | |
| 1745 | + | |
| 1746 | + | |
| 1747 | + | |
1601 | 1748 |
| |
1602 | 1749 |
| |
1603 | 1750 |
| |
| |||
1839 | 1986 |
| |
1840 | 1987 |
| |
1841 | 1988 |
| |
| 1989 | + | |
| 1990 | + | |
| 1991 | + | |
| 1992 | + | |
| 1993 | + | |
| 1994 | + | |
| 1995 | + | |
| 1996 | + | |
| 1997 | + | |
| 1998 | + | |
| 1999 | + | |
| 2000 | + | |
| 2001 | + | |
| 2002 | + | |
| 2003 | + | |
| 2004 | + | |
| 2005 | + | |
| 2006 | + | |
| 2007 | + | |
| 2008 | + | |
1842 | 2009 |
| |
1843 | 2010 |
| |
1844 | 2011 |
| |
|
Lines changed: 19 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
98 | 98 |
| |
99 | 99 |
| |
100 | 100 |
| |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
101 | 107 |
| |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
102 | 115 |
| |
103 | 116 |
| |
104 | 117 |
| |
| |||
168 | 181 |
| |
169 | 182 |
| |
170 | 183 |
| |
| 184 | + | |
| 185 | + | |
171 | 186 |
| |
172 | 187 |
| |
173 | 188 |
| |
| 189 | + | |
| 190 | + | |
174 | 191 |
| |
175 | 192 |
| |
176 | 193 |
| |
| 194 | + | |
| 195 | + | |
177 | 196 |
| |
178 | 197 |
| |
179 | 198 |
| |
|
Lines changed: 8 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1694 | 1694 |
| |
1695 | 1695 |
| |
1696 | 1696 |
| |
1697 |
| - | |
| 1697 | + | |
| 1698 | + | |
| 1699 | + | |
| 1700 | + | |
| 1701 | + | |
| 1702 | + | |
| 1703 | + | |
| 1704 | + | |
1698 | 1705 |
| |
1699 | 1706 |
| |
1700 | 1707 |
| |
|
Lines changed: 196 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
154 | 154 |
| |
155 | 155 |
| |
156 | 156 |
| |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
157 | 161 |
| |
158 | 162 |
| |
159 | 163 |
| |
| |||
173 | 177 |
| |
174 | 178 |
| |
175 | 179 |
| |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
176 | 184 |
| |
177 | 185 |
| |
178 | 186 |
| |
| |||
269 | 277 |
| |
270 | 278 |
| |
271 | 279 |
| |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
272 | 284 |
| |
273 | 285 |
| |
274 | 286 |
| |
275 | 287 |
| |
276 | 288 |
| |
277 | 289 |
| |
278 | 290 |
| |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
279 | 295 |
| |
280 | 296 |
| |
281 | 297 |
| |
| |||
320 | 336 |
| |
321 | 337 |
| |
322 | 338 |
| |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
323 | 343 |
| |
324 | 344 |
| |
325 | 345 |
| |
| |||
371 | 391 |
| |
372 | 392 |
| |
373 | 393 |
| |
| 394 | + | |
| 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 | + | |
374 | 420 |
| |
375 | 421 |
| |
376 | 422 |
| |
| |||
1019 | 1065 |
| |
1020 | 1066 |
| |
1021 | 1067 |
| |
| 1068 | + | |
| 1069 | + | |
| 1070 | + | |
| 1071 | + | |
| 1072 | + | |
| 1073 | + | |
1022 | 1074 |
| |
1023 | 1075 |
| |
1024 | 1076 |
| |
| |||
1068 | 1120 |
| |
1069 | 1121 |
| |
1070 | 1122 |
| |
| 1123 | + | |
| 1124 | + | |
| 1125 | + | |
| 1126 | + | |
| 1127 | + | |
| 1128 | + | |
1071 | 1129 |
| |
1072 | 1130 |
| |
1073 | 1131 |
| |
| |||
1116 | 1174 |
| |
1117 | 1175 |
| |
1118 | 1176 |
| |
| 1177 | + | |
| 1178 | + | |
| 1179 | + | |
| 1180 | + | |
| 1181 | + | |
| 1182 | + | |
1119 | 1183 |
| |
1120 | 1184 |
| |
1121 | 1185 |
| |
| |||
1162 | 1226 |
| |
1163 | 1227 |
| |
1164 | 1228 |
| |
1165 |
| - | |
| 1229 | + | |
1166 | 1230 |
| |
| 1231 | + | |
| 1232 | + | |
| 1233 | + | |
| 1234 | + | |
| 1235 | + | |
| 1236 | + | |
1167 | 1237 |
| |
1168 | 1238 |
| |
1169 | 1239 |
| |
| |||
1663 | 1733 |
| |
1664 | 1734 |
| |
1665 | 1735 |
| |
1666 |
| - | |
| 1736 | + | |
1667 | 1737 |
| |
1668 | 1738 |
| |
1669 | 1739 |
| |
1670 |
| - | |
| 1740 | + | |
1671 | 1741 |
| |
1672 | 1742 |
| |
1673 | 1743 |
| |
1674 |
| - | |
| 1744 | + | |
1675 | 1745 |
| |
1676 | 1746 |
| |
1677 | 1747 |
| |
1678 |
| - | |
| 1748 | + | |
1679 | 1749 |
| |
1680 | 1750 |
| |
1681 | 1751 |
| |
1682 | 1752 |
| |
1683 | 1753 |
| |
1684 | 1754 |
| |
| 1755 | + | |
| 1756 | + | |
| 1757 | + | |
| 1758 | + | |
| 1759 | + | |
| 1760 | + | |
| 1761 | + | |
| 1762 | + | |
| 1763 | + | |
| 1764 | + | |
| 1765 | + | |
| 1766 | + | |
| 1767 | + | |
| 1768 | + | |
| 1769 | + | |
| 1770 | + | |
| 1771 | + | |
| 1772 | + | |
| 1773 | + | |
| 1774 | + | |
| 1775 | + | |
| 1776 | + | |
| 1777 | + | |
1685 | 1778 |
| |
1686 | 1779 |
| |
1687 | 1780 |
| |
| |||
1754 | 1847 |
| |
1755 | 1848 |
| |
1756 | 1849 |
| |
| 1850 | + | |
| 1851 | + | |
| 1852 | + | |
| 1853 | + | |
| 1854 | + | |
| 1855 | + | |
| 1856 | + | |
| 1857 | + | |
| 1858 | + | |
| 1859 | + | |
| 1860 | + | |
| 1861 | + | |
| 1862 | + | |
| 1863 | + | |
| 1864 | + | |
| 1865 | + | |
| 1866 | + | |
| 1867 | + | |
| 1868 | + | |
| 1869 | + | |
| 1870 | + | |
| 1871 | + | |
| 1872 | + | |
| 1873 | + | |
| 1874 | + | |
| 1875 | + | |
| 1876 | + | |
| 1877 | + | |
| 1878 | + | |
| 1879 | + | |
| 1880 | + | |
| 1881 | + | |
| 1882 | + | |
| 1883 | + | |
| 1884 | + | |
| 1885 | + | |
| 1886 | + | |
| 1887 | + | |
| 1888 | + | |
| 1889 | + | |
| 1890 | + | |
| 1891 | + | |
| 1892 | + | |
| 1893 | + | |
| 1894 | + | |
| 1895 | + | |
| 1896 | + | |
1757 | 1897 |
| |
1758 | 1898 |
| |
1759 | 1899 |
| |
1760 | 1900 |
| |
1761 | 1901 |
| |
1762 | 1902 |
| |
1763 | 1903 |
| |
1764 |
| - | |
1765 |
| - | |
| 1904 | + | |
| 1905 | + | |
| 1906 | + | |
| 1907 | + | |
| 1908 | + | |
1766 | 1909 |
| |
1767 | 1910 |
| |
1768 | 1911 |
| |
| |||
2028 | 2171 |
| |
2029 | 2172 |
| |
2030 | 2173 |
| |
| 2174 | + | |
| 2175 | + | |
| 2176 | + | |
| 2177 | + | |
| 2178 | + | |
| 2179 | + | |
| 2180 | + | |
| 2181 | + | |
| 2182 | + | |
| 2183 | + | |
| 2184 | + | |
| 2185 | + | |
| 2186 | + | |
| 2187 | + | |
| 2188 | + | |
| 2189 | + | |
| 2190 | + | |
| 2191 | + | |
| 2192 | + | |
| 2193 | + | |
| 2194 | + | |
| 2195 | + | |
| 2196 | + | |
| 2197 | + | |
| 2198 | + | |
| 2199 | + | |
| 2200 | + | |
| 2201 | + | |
| 2202 | + | |
| 2203 | + | |
| 2204 | + | |
| 2205 | + | |
| 2206 | + | |
| 2207 | + | |
| 2208 | + | |
| 2209 | + | |
| 2210 | + | |
| 2211 | + | |
| 2212 | + | |
| 2213 | + | |
| 2214 | + | |
| 2215 | + | |
| 2216 | + | |
| 2217 | + | |
| 2218 | + | |
| 2219 | + | |
2031 | 2220 |
| |
2032 | 2221 |
| |
2033 | 2222 |
| |
|
Lines changed: 72 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 | + | |
177 | 187 |
| |
178 | 188 |
| |
179 | 189 |
| |
180 | 190 |
| |
181 | 191 |
| |
182 | 192 |
| |
183 |
| - | |
| 193 | + | |
| 194 | + | |
184 | 195 |
| |
185 | 196 |
| |
186 | 197 |
| |
| |||
544 | 555 |
| |
545 | 556 |
| |
546 | 557 |
| |
| 558 | + | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
| 576 | + | |
547 | 577 |
| |
548 | 578 |
| |
549 | 579 |
| |
| |||
620 | 650 |
| |
621 | 651 |
| |
622 | 652 |
| |
| 653 | + | |
| 654 | + | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
| 660 | + | |
| 661 | + | |
| 662 | + | |
| 663 | + | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
| 668 | + | |
623 | 669 |
| |
624 | 670 |
| |
625 | 671 |
| |
| |||
763 | 809 |
| |
764 | 810 |
| |
765 | 811 |
| |
766 |
| - | |
| 812 | + | |
| 813 | + | |
| 814 | + | |
| 815 | + | |
| 816 | + | |
| 817 | + | |
| 818 | + | |
| 819 | + | |
| 820 | + | |
| 821 | + | |
767 | 822 |
| |
768 |
| - | |
| 823 | + | |
769 | 824 |
| |
770 |
| - | |
| 825 | + | |
771 | 826 |
| |
772 |
| - | |
| 827 | + | |
773 | 828 |
| |
774 | 829 |
| |
775 | 830 |
| |
| |||
793 | 848 |
| |
794 | 849 |
| |
795 | 850 |
| |
| 851 | + | |
| 852 | + | |
| 853 | + | |
| 854 | + | |
| 855 | + | |
| 856 | + | |
| 857 | + | |
| 858 | + | |
| 859 | + | |
796 | 860 |
| |
797 | 861 |
| |
798 | 862 |
| |
| |||
891 | 955 |
| |
892 | 956 |
| |
893 | 957 |
| |
| 958 | + | |
| 959 | + | |
| 960 | + | |
894 | 961 |
| |
895 | 962 |
| |
896 | 963 |
| |
|
Lines changed: 130 additions & 70 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
54 | 54 |
| |
55 | 55 |
| |
56 | 56 |
| |
57 |
| - | |
58 |
| - | |
59 |
| - | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
60 | 60 |
| |
61 | 61 |
| |
62 | 62 |
| |
| |||
543 | 543 |
| |
544 | 544 |
| |
545 | 545 |
| |
546 |
| - | |
| 546 | + | |
547 | 547 |
| |
548 | 548 |
| |
549 | 549 |
| |
| |||
854 | 854 |
| |
855 | 855 |
| |
856 | 856 |
| |
857 |
| - | |
| 857 | + | |
858 | 858 |
| |
859 | 859 |
| |
860 | 860 |
| |
| |||
927 | 927 |
| |
928 | 928 |
| |
929 | 929 |
| |
| 930 | + | |
| 931 | + | |
| 932 | + | |
| 933 | + | |
| 934 | + | |
| 935 | + | |
| 936 | + | |
| 937 | + | |
| 938 | + | |
| 939 | + | |
| 940 | + | |
| 941 | + | |
| 942 | + | |
| 943 | + | |
| 944 | + | |
| 945 | + | |
| 946 | + | |
| 947 | + | |
| 948 | + | |
| 949 | + | |
| 950 | + | |
| 951 | + | |
| 952 | + | |
| 953 | + | |
| 954 | + | |
| 955 | + | |
| 956 | + | |
| 957 | + | |
| 958 | + | |
| 959 | + | |
| 960 | + | |
| 961 | + | |
| 962 | + | |
| 963 | + | |
| 964 | + | |
| 965 | + | |
| 966 | + | |
| 967 | + | |
| 968 | + | |
| 969 | + | |
930 | 970 |
| |
931 | 971 |
| |
932 | 972 |
| |
| |||
957 | 997 |
| |
958 | 998 |
| |
959 | 999 |
| |
960 |
| - | |
961 |
| - | |
| 1000 | + | |
| 1001 | + | |
962 | 1002 |
| |
963 |
| - | |
| 1003 | + | |
| 1004 | + | |
| 1005 | + | |
| 1006 | + | |
| 1007 | + | |
| 1008 | + | |
| 1009 | + | |
964 | 1010 |
| |
965 | 1011 |
| |
966 | 1012 |
| |
967 |
| - | |
968 |
| - | |
| 1013 | + | |
| 1014 | + | |
969 | 1015 |
| |
970 | 1016 |
| |
971 | 1017 |
| |
| |||
980 | 1026 |
| |
981 | 1027 |
| |
982 | 1028 |
| |
983 |
| - | |
984 |
| - | |
985 |
| - | |
986 |
| - | |
987 |
| - | |
988 |
| - | |
989 |
| - | |
990 |
| - | |
| 1029 | + | |
| 1030 | + | |
991 | 1031 |
| |
992 |
| - | |
993 |
| - | |
994 |
| - | |
995 |
| - | |
996 |
| - | |
997 |
| - | |
998 |
| - | |
| 1032 | + | |
999 | 1033 |
| |
1000 | 1034 |
| |
1001 | 1035 |
| |
| 1036 | + | |
| 1037 | + | |
| 1038 | + | |
| 1039 | + | |
| 1040 | + | |
| 1041 | + | |
1002 | 1042 |
| |
| 1043 | + | |
| 1044 | + | |
| 1045 | + | |
1003 | 1046 |
| |
1004 | 1047 |
| |
1005 |
| - | |
| 1048 | + | |
1006 | 1049 |
| |
1007 | 1050 |
| |
1008 |
| - | |
1009 |
| - | |
1010 |
| - | |
1011 |
| - | |
1012 |
| - | |
1013 |
| - | |
1014 |
| - | |
1015 |
| - | |
1016 |
| - | |
1017 |
| - | |
1018 |
| - | |
1019 |
| - | |
1020 |
| - | |
1021 |
| - | |
| 1051 | + | |
1022 | 1052 |
| |
1023 | 1053 |
| |
1024 |
| - | |
| 1054 | + | |
1025 | 1055 |
| |
1026 | 1056 |
| |
1027 |
| - | |
1028 |
| - | |
1029 |
| - | |
1030 |
| - | |
1031 |
| - | |
1032 |
| - | |
1033 |
| - | |
1034 |
| - | |
1035 |
| - | |
1036 |
| - | |
1037 |
| - | |
1038 |
| - | |
1039 |
| - | |
1040 |
| - | |
| 1057 | + | |
1041 | 1058 |
| |
1042 | 1059 |
| |
1043 |
| - | |
| 1060 | + | |
1044 | 1061 |
| |
1045 | 1062 |
| |
1046 |
| - | |
| 1063 | + | |
1047 | 1064 |
| |
1048 | 1065 |
| |
1049 | 1066 |
| |
1050 | 1067 |
| |
1051 | 1068 |
| |
1052 | 1069 |
| |
1053 |
| - | |
| 1070 | + | |
1054 | 1071 |
| |
1055 | 1072 |
| |
1056 | 1073 |
| |
1057 | 1074 |
| |
1058 | 1075 |
| |
1059 | 1076 |
| |
1060 |
| - | |
| 1077 | + | |
1061 | 1078 |
| |
1062 | 1079 |
| |
1063 | 1080 |
| |
1064 | 1081 |
| |
1065 | 1082 |
| |
1066 | 1083 |
| |
1067 |
| - | |
| 1084 | + | |
1068 | 1085 |
| |
1069 | 1086 |
| |
1070 | 1087 |
| |
| |||
1083 | 1100 |
| |
1084 | 1101 |
| |
1085 | 1102 |
| |
1086 |
| - | |
| 1103 | + | |
1087 | 1104 |
| |
1088 | 1105 |
| |
1089 | 1106 |
| |
| |||
1096 | 1113 |
| |
1097 | 1114 |
| |
1098 | 1115 |
| |
1099 |
| - | |
| 1116 | + | |
1100 | 1117 |
| |
1101 | 1118 |
| |
1102 | 1119 |
| |
1103 | 1120 |
| |
1104 | 1121 |
| |
1105 | 1122 |
| |
1106 |
| - | |
| 1123 | + | |
1107 | 1124 |
| |
1108 | 1125 |
| |
1109 | 1126 |
| |
| |||
1116 | 1133 |
| |
1117 | 1134 |
| |
1118 | 1135 |
| |
1119 |
| - | |
| 1136 | + | |
1120 | 1137 |
| |
1121 | 1138 |
| |
| 1139 | + | |
| 1140 | + | |
| 1141 | + | |
| 1142 | + | |
| 1143 | + | |
| 1144 | + | |
| 1145 | + | |
| 1146 | + | |
| 1147 | + | |
| 1148 | + | |
| 1149 | + | |
| 1150 | + | |
| 1151 | + | |
| 1152 | + | |
| 1153 | + | |
| 1154 | + | |
| 1155 | + | |
| 1156 | + | |
| 1157 | + | |
| 1158 | + | |
| 1159 | + | |
| 1160 | + | |
| 1161 | + | |
| 1162 | + | |
| 1163 | + | |
| 1164 | + | |
| 1165 | + | |
| 1166 | + | |
| 1167 | + | |
| 1168 | + | |
| 1169 | + | |
| 1170 | + | |
| 1171 | + | |
| 1172 | + | |
| 1173 | + | |
1122 | 1174 |
| |
1123 | 1175 |
| |
1124 | 1176 |
| |
| |||
1300 | 1352 |
| |
1301 | 1353 |
| |
1302 | 1354 |
| |
1303 |
| - | |
1304 |
| - | |
1305 |
| - | |
| 1355 | + | |
| 1356 | + | |
| 1357 | + | |
1306 | 1358 |
| |
1307 | 1359 |
| |
1308 | 1360 |
| |
| |||
1311 | 1363 |
| |
1312 | 1364 |
| |
1313 | 1365 |
| |
1314 |
| - | |
1315 |
| - | |
1316 |
| - | |
| 1366 | + | |
| 1367 | + | |
| 1368 | + | |
1317 | 1369 |
| |
1318 | 1370 |
| |
1319 | 1371 |
| |
| |||
1376 | 1428 |
| |
1377 | 1429 |
| |
1378 | 1430 |
| |
| 1431 | + | |
| 1432 | + | |
| 1433 | + | |
| 1434 | + | |
1379 | 1435 |
| |
1380 | 1436 |
| |
1381 | 1437 |
| |
1382 | 1438 |
| |
1383 | 1439 |
| |
1384 | 1440 |
| |
| 1441 | + | |
1385 | 1442 |
| |
1386 | 1443 |
| |
| 1444 | + | |
1387 | 1445 |
| |
1388 | 1446 |
| |
| 1447 | + | |
1389 | 1448 |
| |
1390 | 1449 |
| |
| 1450 | + | |
1391 | 1451 |
| |
1392 | 1452 |
| |
1393 | 1453 |
| |
|
Lines changed: 85 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
40 | 40 |
| |
41 | 41 |
| |
42 | 42 |
| |
| 43 | + | |
| 44 | + | |
43 | 45 |
| |
44 | 46 |
| |
45 | 47 |
| |
| |||
247 | 249 |
| |
248 | 250 |
| |
249 | 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 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 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 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
250 | 335 |
| |
251 | 336 |
| |
252 | 337 |
| |
|
0 commit comments