Commit 8b29097
1 parent b242324 commit 8b29097
File tree
8 files changed
+107
-39
lines changed- python/core/composer
- src
- app/composer
- core/composer
- tests
- src/core
- testdata/control_images
- expected_composermap_verticaldescending_inside
- expected_composermap_verticaldescending_outside
8 files changed
+107
-39
lines changedLines changed: 3 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
163 | 163 |
| |
164 | 164 |
| |
165 | 165 |
| |
166 |
| - | |
167 |
| - | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
168 | 169 |
| |
169 | 170 |
| |
170 | 171 |
| |
|
Lines changed: 14 additions & 29 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
914 | 914 |
| |
915 | 915 |
| |
916 | 916 |
| |
917 |
| - | |
918 |
| - | |
| 917 | + | |
| 918 | + | |
| 919 | + | |
919 | 920 |
| |
920 | 921 |
| |
921 | 922 |
| |
| |||
979 | 980 |
| |
980 | 981 |
| |
981 | 982 |
| |
982 |
| - | |
| 983 | + | |
983 | 984 |
| |
984 | 985 |
| |
985 | 986 |
| |
| |||
988 | 989 |
| |
989 | 990 |
| |
990 | 991 |
| |
991 |
| - | |
992 |
| - | |
993 |
| - | |
994 |
| - | |
995 |
| - | |
996 |
| - | |
997 |
| - | |
998 |
| - | |
| 992 | + | |
999 | 993 |
| |
1000 | 994 |
| |
1001 | 995 |
| |
| |||
1039 | 1033 |
| |
1040 | 1034 |
| |
1041 | 1035 |
| |
1042 |
| - | |
1043 |
| - | |
1044 |
| - | |
1045 |
| - | |
1046 |
| - | |
1047 |
| - | |
1048 |
| - | |
1049 |
| - | |
1050 |
| - | |
1051 |
| - | |
| 1036 | + | |
1052 | 1037 |
| |
1053 | 1038 |
| |
1054 | 1039 |
| |
| |||
2026 | 2011 |
| |
2027 | 2012 |
| |
2028 | 2013 |
| |
2029 |
| - | |
| 2014 | + | |
2030 | 2015 |
| |
2031 |
| - | |
| 2016 | + | |
2032 | 2017 |
| |
2033 | 2018 |
| |
2034 |
| - | |
| 2019 | + | |
2035 | 2020 |
| |
2036 |
| - | |
| 2021 | + | |
2037 | 2022 |
| |
2038 | 2023 |
| |
2039 |
| - | |
| 2024 | + | |
2040 | 2025 |
| |
2041 |
| - | |
| 2026 | + | |
2042 | 2027 |
| |
2043 | 2028 |
| |
2044 |
| - | |
| 2029 | + | |
2045 | 2030 |
| |
2046 |
| - | |
| 2031 | + | |
2047 | 2032 |
| |
2048 | 2033 |
| |
2049 | 2034 |
| |
|
Lines changed: 5 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
119 | 119 |
| |
120 | 120 |
| |
121 | 121 |
| |
122 |
| - | |
123 |
| - | |
124 |
| - | |
125 |
| - | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
126 | 126 |
| |
127 | 127 |
| |
128 | 128 |
| |
| |||
184 | 184 |
| |
185 | 185 |
| |
186 | 186 |
| |
187 |
| - | |
| 187 | + | |
188 | 188 |
| |
189 | 189 |
| |
190 | 190 |
| |
|
Lines changed: 50 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1088 | 1088 |
| |
1089 | 1089 |
| |
1090 | 1090 |
| |
| 1091 | + | |
| 1092 | + | |
| 1093 | + | |
| 1094 | + | |
| 1095 | + | |
| 1096 | + | |
1091 | 1097 |
| |
1092 | 1098 |
| |
1093 | 1099 |
| |
| |||
1106 | 1112 |
| |
1107 | 1113 |
| |
1108 | 1114 |
| |
| 1115 | + | |
| 1116 | + | |
| 1117 | + | |
| 1118 | + | |
| 1119 | + | |
| 1120 | + | |
1109 | 1121 |
| |
1110 | 1122 |
| |
1111 | 1123 |
| |
| |||
1137 | 1149 |
| |
1138 | 1150 |
| |
1139 | 1151 |
| |
1140 |
| - | |
| 1152 | + | |
1141 | 1153 |
| |
1142 | 1154 |
| |
1143 | 1155 |
| |
1144 | 1156 |
| |
1145 | 1157 |
| |
| 1158 | + | |
| 1159 | + | |
| 1160 | + | |
| 1161 | + | |
| 1162 | + | |
| 1163 | + | |
1146 | 1164 |
| |
1147 | 1165 |
| |
1148 | 1166 |
| |
| |||
1155 | 1173 |
| |
1156 | 1174 |
| |
1157 | 1175 |
| |
1158 |
| - | |
| 1176 | + | |
1159 | 1177 |
| |
1160 | 1178 |
| |
1161 | 1179 |
| |
1162 | 1180 |
| |
1163 | 1181 |
| |
| 1182 | + | |
| 1183 | + | |
| 1184 | + | |
| 1185 | + | |
| 1186 | + | |
| 1187 | + | |
1164 | 1188 |
| |
1165 | 1189 |
| |
1166 | 1190 |
| |
| |||
1196 | 1220 |
| |
1197 | 1221 |
| |
1198 | 1222 |
| |
| 1223 | + | |
| 1224 | + | |
| 1225 | + | |
| 1226 | + | |
| 1227 | + | |
| 1228 | + | |
1199 | 1229 |
| |
1200 | 1230 |
| |
1201 | 1231 |
| |
| |||
1214 | 1244 |
| |
1215 | 1245 |
| |
1216 | 1246 |
| |
| 1247 | + | |
| 1248 | + | |
| 1249 | + | |
| 1250 | + | |
| 1251 | + | |
| 1252 | + | |
1217 | 1253 |
| |
1218 | 1254 |
| |
1219 | 1255 |
| |
| |||
1250 | 1286 |
| |
1251 | 1287 |
| |
1252 | 1288 |
| |
| 1289 | + | |
| 1290 | + | |
| 1291 | + | |
| 1292 | + | |
| 1293 | + | |
| 1294 | + | |
1253 | 1295 |
| |
1254 | 1296 |
| |
1255 | 1297 |
| |
| |||
1268 | 1310 |
| |
1269 | 1311 |
| |
1270 | 1312 |
| |
| 1313 | + | |
| 1314 | + | |
| 1315 | + | |
| 1316 | + | |
| 1317 | + | |
| 1318 | + | |
1271 | 1319 |
| |
1272 | 1320 |
| |
1273 | 1321 |
| |
|
Lines changed: 2 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
199 | 199 |
| |
200 | 200 |
| |
201 | 201 |
| |
202 |
| - | |
| 202 | + | |
| 203 | + | |
203 | 204 |
| |
204 | 205 |
| |
205 | 206 |
| |
|
Lines changed: 33 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
52 | 52 |
| |
53 | 53 |
| |
54 | 54 |
| |
| 55 | + | |
55 | 56 |
| |
56 | 57 |
| |
57 | 58 |
| |
| |||
608 | 609 |
| |
609 | 610 |
| |
610 | 611 |
| |
| 612 | + | |
| 613 | + | |
| 614 | + | |
611 | 615 |
| |
| 616 | + | |
| 617 | + | |
| 618 | + | |
| 619 | + | |
| 620 | + | |
| 621 | + | |
| 622 | + | |
| 623 | + | |
| 624 | + | |
| 625 | + | |
| 626 | + | |
| 627 | + | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
612 | 645 |
| |
613 | 646 |
| |
614 | 647 |
|
0 commit comments