diff --git a/docs/manual/README.md b/docs/manual/README.md index 471ad0e..1336ec6 100644 --- a/docs/manual/README.md +++ b/docs/manual/README.md @@ -174,6 +174,8 @@ the strip at its head narrows it to one group. Exposure, contrast, highlights, shadows, blacks, whites and a tone curve. Hold `Before` to see the photograph as it was. +![Raising exposure, pulling the highlights, lifting the shadows, then holding Before](media/develop-light.gif) + `Tone Mapping`, last in the group, is how the scene is fitted onto the screen, and it runs after every other adjustment. `White Point` says how many stops above middle grey reach white — raise it to bring a bright sky back @@ -181,9 +183,10 @@ from white, lower it for a brighter, punchier picture — and `Contrast` sets the slope of the curve between. Every adjustment above it works on the scene as the camera recorded it, highlights beyond white included, so pulling the highlights recovers what the sensor caught rather than what the screen could -show. +show. A JPEG has been fitted to a screen already, by the camera, so on a +JPEG these two do nothing. -![Raising exposure, pulling the highlights, lifting the shadows, then holding Before](media/develop-light.gif) +![Raising the white point to bring the clouds back from white, lowering it for a brighter picture, raising the contrast, then holding Before](media/develop-tonemap.gif) ### Looking closer @@ -299,7 +302,7 @@ a gradient over the sky whose `Print Exposure` burns it in. Every change is a step; `Undo` and the History panel walk them. `Snapshot` keeps the current state under a name. `Presets`, at the foot of the tool -rail on the left, opens a menu of presets beside the photograph, filed in +rail on the left, opens a menu of presets beside the rail, over the photograph, filed in folders that start closed: your own under `Yours`, then the ones DarkRoom ships — `Essentials`, `Skies`, and `Film`, which holds `Colour`, `Cinema` and `Black and white`, one measured stock each. Choosing a folder opens it; @@ -356,7 +359,7 @@ It opens in develop all the same, on a reduced copy that is drawn from the full resolution wherever you zoom in, and it exports at full size. The same goes for a panorama Lightroom stitched and saved as a DNG. -![Twelve frames aligned, the projections tried, and the border filled](media/panorama.gif) +![Twelve frames aligned, the first left out and brought back, the projections tried, and the border filled](media/panorama.gif) ![The alignment on a cylinder, each frame outlined where it landed](media/panorama-aligned.png) diff --git a/docs/manual/index.html b/docs/manual/index.html index 0a49488..066050c 100644 --- a/docs/manual/index.html +++ b/docs/manual/index.html @@ -263,6 +263,7 @@ the strip at its head narrows it to one group.

Light

Exposure, contrast, highlights, shadows, blacks, whites and a tone curve. Hold Before to see the photograph as it was.

+
Raising exposure, pulling the highlights, lifting the shadows, then holding Before
Raising exposure, pulling the highlights, lifting the shadows, then holding Before

Tone Mapping, last in the group, is how the scene is fitted onto the screen, and it runs after every other adjustment. White Point says how many stops above middle grey reach white — raise it to bring a bright sky back @@ -270,8 +271,9 @@ from white, lower it for a brighter, punchier picture — and Contrast -

Raising exposure, pulling the highlights, lifting the shadows, then holding Before
Raising exposure, pulling the highlights, lifting the shadows, then holding Before
+show. A JPEG has been fitted to a screen already, by the camera, so on a +JPEG these two do nothing.

+
Raising the white point to bring the clouds back from white, lowering it for a brighter picture, raising the contrast, then holding Before
Raising the white point to bring the clouds back from white, lowering it for a brighter picture, raising the contrast, then holding Before

Looking closer

Double-click for 1:1; drag to move about; double-click again to fit. The wheel zooms to any amount in between. Past 1:1 the file's own pixels are @@ -353,7 +355,7 @@ a gradient over the sky whose Print Exposure burns it in.

History, snapshots, presets

Every change is a step; Undo and the History panel walk them. Snapshot keeps the current state under a name. Presets, at the foot of the tool -rail on the left, opens a menu of presets beside the photograph, filed in +rail on the left, opens a menu of presets beside the rail, over the photograph, filed in folders that start closed: your own under Yours, then the ones DarkRoom ships — Essentials, Skies, and Film, which holds Colour, Cinema and Black and white, one measured stock each. Choosing a folder opens it; @@ -398,7 +400,7 @@ preview and in the composite.

It opens in develop all the same, on a reduced copy that is drawn from the full resolution wherever you zoom in, and it exports at full size. The same goes for a panorama Lightroom stitched and saved as a DNG.

-
Twelve frames aligned, the projections tried, and the border filled
Twelve frames aligned, the projections tried, and the border filled
+
Twelve frames aligned, the first left out and brought back, the projections tried, and the border filled
Twelve frames aligned, the first left out and brought back, the projections tried, and the border filled
The alignment on a cylinder, each frame outlined where it landed
The alignment on a cylinder, each frame outlined where it landed
The same, with the ragged border filled by the model rather than cropped away
The same, with the ragged border filled by the model rather than cropped away

Export

diff --git a/docs/manual/media/album-sheet.png b/docs/manual/media/album-sheet.png index 1dd4288..0ec00cc 100644 --- a/docs/manual/media/album-sheet.png +++ b/docs/manual/media/album-sheet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c52d6abc00b812759f6733b0717ca7727607e1f77c7b04eb343bd6fc76ca787 -size 131128 +oid sha256:2de5752565ec61c9bf5c5396f2d8ad1daf0a228a53c45d55a84176510d3f847f +size 130813 diff --git a/docs/manual/media/albums.gif b/docs/manual/media/albums.gif index 8eb8b96..f45192f 100644 --- a/docs/manual/media/albums.gif +++ b/docs/manual/media/albums.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a1e62fd18a37b8877c729cc14ba4e696a01ef3310c2e675fd9b465c2ccbfd58 -size 360016 +oid sha256:8510c4ba3cba3e45161b8b68fad3927e59409af380c49919d5211d6afd0a181f +size 362533 diff --git a/docs/manual/media/albums.png b/docs/manual/media/albums.png index beabc35..3413102 100644 --- a/docs/manual/media/albums.png +++ b/docs/manual/media/albums.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fe50506a5689e83199ac06423e184bb105e7af228026eab52b0230457b090a9 -size 173156 +oid sha256:4b4d0b121114820cf8d54e95bcc8f4bfb7d0c91333ed8e722cf8e1d73069f947 +size 172883 diff --git a/docs/manual/media/compose-perspective.gif b/docs/manual/media/compose-perspective.gif index 37443c9..44759cc 100644 --- a/docs/manual/media/compose-perspective.gif +++ b/docs/manual/media/compose-perspective.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af0357454f5c4eea97f68f9d4e774a84598ff499f78fa5ad7a3548dcc13df686 -size 1550799 +oid sha256:7863ebcd81d481ca4d10cfd356bccb6d5a3f8df6013cd8d8c2b8d1aca7c5a4b7 +size 2756164 diff --git a/docs/manual/media/compose.gif b/docs/manual/media/compose.gif index 148fbcd..d185d14 100644 --- a/docs/manual/media/compose.gif +++ b/docs/manual/media/compose.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f8430464d4da5dacc110652ef65627b91ae381c120aae8fb0bab5c379f33e8e -size 2675747 +oid sha256:0d22eeb30aaed4b443685982c7fc92f6d8897b4083def5c70972dfd445bc5ed0 +size 2960763 diff --git a/docs/manual/media/crop-orphan.gif b/docs/manual/media/crop-orphan.gif index 85c8efe..e09979c 100644 --- a/docs/manual/media/crop-orphan.gif +++ b/docs/manual/media/crop-orphan.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9aa7ced60c9ac10bd41f50ef05f2fa3b24e40d5c2bd216796f958cbbbfd1a965 -size 682821 +oid sha256:0f9a4ee740b56bafbe5a71e346b08787126519daa207af44037ee31d930732ce +size 692323 diff --git a/docs/manual/media/develop-groups.gif b/docs/manual/media/develop-groups.gif index 9ada2ab..3c47520 100644 --- a/docs/manual/media/develop-groups.gif +++ b/docs/manual/media/develop-groups.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fefb9aac091ad77924cb73fcef5ce7fcfc862fdc028912d3d6108bd50e94b298 -size 350252 +oid sha256:d6f678166af91251928e83562e315b48c8f44ffb7c01110e1925777d17648a38 +size 354295 diff --git a/docs/manual/media/develop-light.gif b/docs/manual/media/develop-light.gif index 98c79d5..3126f7f 100644 --- a/docs/manual/media/develop-light.gif +++ b/docs/manual/media/develop-light.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9439cbe3a2962493fa238097cf9e3e60b31bbe8c846b0a7f6c1494ee53729a15 -size 2980883 +oid sha256:f2f1b5c8d26328a8b29a4a0b6c8dd63d81242710474695c6d95d6f30c9de34ae +size 2979138 diff --git a/docs/manual/media/develop-tonemap.gif b/docs/manual/media/develop-tonemap.gif new file mode 100644 index 0000000..e8c0de2 --- /dev/null +++ b/docs/manual/media/develop-tonemap.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9efb093ea43c3726fe1e09a35e98ad69bd910ccf51459bd7cc57935ac15fddf8 +size 2105188 diff --git a/docs/manual/media/develop-wb.gif b/docs/manual/media/develop-wb.gif index 555627b..89331c3 100644 --- a/docs/manual/media/develop-wb.gif +++ b/docs/manual/media/develop-wb.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4267166fc06443bab35bfece47d4ad1cd2eb81f18b1b3e116deb7ced1663907 -size 1661773 +oid sha256:041439638d27f44976aec75a2ae4f9deb27eb782bbf8a6e47235be361f0cc81f +size 1990226 diff --git a/docs/manual/media/develop-zoom.gif b/docs/manual/media/develop-zoom.gif index 9e01efd..9a74fcf 100644 --- a/docs/manual/media/develop-zoom.gif +++ b/docs/manual/media/develop-zoom.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dc9bf4ba4ea4248f3f093f58657a54fe17d55a05fd8325528e57366d306519f -size 8782894 +oid sha256:50ecffa6e75d489cb21f3a3e2993887bc2a6e123bed30262c0d64bcc9099b1f7 +size 8787405 diff --git a/docs/manual/media/develop.png b/docs/manual/media/develop.png index 6f90810..f13febf 100644 --- a/docs/manual/media/develop.png +++ b/docs/manual/media/develop.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64ad63f1154d7664f95e248c6e63a62bf1d7eb5b97261d02446e46549478bb96 -size 1570842 +oid sha256:bf60fdeb1d725cce51c4d5c5f91d6affd74ee56455c29f75761e3cba958a5983 +size 1559338 diff --git a/docs/manual/media/duplicates.png b/docs/manual/media/duplicates.png index 487e0dd..d333cc3 100644 --- a/docs/manual/media/duplicates.png +++ b/docs/manual/media/duplicates.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29adc7d2ad908b5b04f016a3c8612e3c453a3b29000d560b7b1d64ca5baa9cf3 -size 72110 +oid sha256:6fee00b31fc71804eb18b30f6f38f287d2ccfa380ee1ce34ae96b4d21cf60439 +size 72054 diff --git a/docs/manual/media/film-local.gif b/docs/manual/media/film-local.gif index a020b93..bf21d6a 100644 --- a/docs/manual/media/film-local.gif +++ b/docs/manual/media/film-local.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6385b8746474faca6467b31a812e1b0db8987ba25c76f82ff5e0e6a846f35c07 -size 2052473 +oid sha256:b7a98ed815da8b218bf4d6cc3f014e003f8006763778dd16d00d5a243329b3c4 +size 2424515 diff --git a/docs/manual/media/film.gif b/docs/manual/media/film.gif index 123fdc6..ef0e9bc 100644 --- a/docs/manual/media/film.gif +++ b/docs/manual/media/film.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:760b0d3dce1f10365bf9c51725ab5188754e0178a662a7a8dc420c0d548a1ee6 -size 1139042 +oid sha256:ea721bd4b9e64a182df6b2d67ecef4d1dac6e661563603d6fdff047e1cc5e679 +size 1144491 diff --git a/docs/manual/media/library-collections.gif b/docs/manual/media/library-collections.gif index 29aedfd..abffb76 100644 --- a/docs/manual/media/library-collections.gif +++ b/docs/manual/media/library-collections.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:783a60c601444f6bc79930dbb6a4eface2431eb011c594f1d6d2de269fe03598 -size 859024 +oid sha256:6fbaa4cb724325ea488dc4bbed6d27bf31b37caada3f8c7198befe368148a875 +size 852415 diff --git a/docs/manual/media/library-keywords.gif b/docs/manual/media/library-keywords.gif index 5772fe5..e835dca 100644 --- a/docs/manual/media/library-keywords.gif +++ b/docs/manual/media/library-keywords.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfd6dc5c0830662b0372790d72301f90f1b376800d681679e564494ee562a1a6 -size 613484 +oid sha256:8b325fea36a55f850e6c60f2f0cb1f4bbacdb45becf305771963f9eac20e7636 +size 617546 diff --git a/docs/manual/media/library-labels.gif b/docs/manual/media/library-labels.gif index 684520e..edf0225 100644 --- a/docs/manual/media/library-labels.gif +++ b/docs/manual/media/library-labels.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:945bb4782bb29ec09eb16f98bf84a8cce6291918284fd81f848610497e76f721 -size 508232 +oid sha256:e2db8f9659431d0e6fc1661b398cfada44c72106e4fa558b8f8902f22a214260 +size 507752 diff --git a/docs/manual/media/library-nesting.gif b/docs/manual/media/library-nesting.gif index da3b1b5..f92d60a 100644 --- a/docs/manual/media/library-nesting.gif +++ b/docs/manual/media/library-nesting.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa35fc01e084587077b929cf78684914307d5d25698a5a320b7ad7935e6e976c -size 1461555 +oid sha256:d7d9654f56b94487fc04c3585c5d2fefdad491bb031df4ef5c507f67c73cd2dd +size 1475420 diff --git a/docs/manual/media/library-rating.gif b/docs/manual/media/library-rating.gif index 737e85d..2bd490b 100644 --- a/docs/manual/media/library-rating.gif +++ b/docs/manual/media/library-rating.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0420cc70fdf10784d6c7ecfdef3a0a0a911b918a9fc4842c490add0f7a9126f8 -size 494783 +oid sha256:6a6b1fb6c8d52311640287748192ddb607cf90d6ca7eb5a2e287545bd71ae353 +size 495199 diff --git a/docs/manual/media/library-thumbsize.gif b/docs/manual/media/library-thumbsize.gif index 1ff1776..e609f1a 100644 --- a/docs/manual/media/library-thumbsize.gif +++ b/docs/manual/media/library-thumbsize.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40b7720dc2131bc894c1fb621ca44a9bab38009c02f9a3dc81bbc4f7567c13a7 -size 2249561 +oid sha256:0cccfea579316ab540c3fab59bc51d582fcced64e008d8438ace7b1ccc013a0c +size 2166796 diff --git a/docs/manual/media/library-timeline.gif b/docs/manual/media/library-timeline.gif index 95a0979..ef653a4 100644 --- a/docs/manual/media/library-timeline.gif +++ b/docs/manual/media/library-timeline.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28bb3ad71c50f5171916ed22d48b052e6a8cbf024a7622be78592b45d230f0ee -size 978996 +oid sha256:17d6e1908c54a65c65c7187144723d0faa19b252d66cce011594230f4949690c +size 979352 diff --git a/docs/manual/media/local-categories.png b/docs/manual/media/local-categories.png index ba30ace..32b52fc 100644 --- a/docs/manual/media/local-categories.png +++ b/docs/manual/media/local-categories.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a659f8e79ea1b4ca3e841071d687c989c52ec73dc27d5142e08ae54e9a60605 -size 1350767 +oid sha256:d1a740d367762060c19d0aefdad6ca356575a6faea16f73a3ba3a371b9766fb6 +size 1337369 diff --git a/docs/manual/media/local-intersect.gif b/docs/manual/media/local-intersect.gif index 96a111c..acc29fe 100644 --- a/docs/manual/media/local-intersect.gif +++ b/docs/manual/media/local-intersect.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3b12a541f18e6628056bb32fd836c98f6eee9c58bbc52327889d0280e2d52b4 -size 629836 +oid sha256:920ba6dc219ef9eb2f14e3fb576517b1982149577c9fdc33ac38b113111c2ef5 +size 634324 diff --git a/docs/manual/media/local-paint.gif b/docs/manual/media/local-paint.gif index 9045e15..4b5f9c7 100644 --- a/docs/manual/media/local-paint.gif +++ b/docs/manual/media/local-paint.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ba11c3044d4d1b529213df9cc344b8d0f2ec75928b0603db55ac6b8a7e03365 -size 1046089 +oid sha256:e02d3496b5475985e27338010ef654eaa2559a35bc57d82385793b51130375db +size 1053859 diff --git a/docs/manual/media/local-segment.png b/docs/manual/media/local-segment.png index 5470854..fbe7d3c 100644 --- a/docs/manual/media/local-segment.png +++ b/docs/manual/media/local-segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f2ea88b0cc7e77edf3e79b20224312b15c19e9597c6464bc2fbb5a2c52217e7 -size 1361674 +oid sha256:ac8e116223e3142e092f96f64be5718573d59aa113da24b6faf3265b1afa11ea +size 1384337 diff --git a/docs/manual/media/panorama-aligned.png b/docs/manual/media/panorama-aligned.png index 1bfdd30..374f3fd 100644 --- a/docs/manual/media/panorama-aligned.png +++ b/docs/manual/media/panorama-aligned.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1398b449f11c402bc5ca5e98350339e34eb7678a313bc506a916863b3bf13bf7 -size 981716 +oid sha256:62d3b79f776fa4f4ad61f9f866acdcc9232b8020c949f815ac41d3eef7cfcb60 +size 978101 diff --git a/docs/manual/media/panorama-filled.png b/docs/manual/media/panorama-filled.png index fcbca89..803f91a 100644 --- a/docs/manual/media/panorama-filled.png +++ b/docs/manual/media/panorama-filled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bca86573aa7f71e8514242f24cc7566324fbdbf9268b3625fccee2aa5a722276 -size 1045195 +oid sha256:467090bfa5d3e08e21d0db4c7b335b223b2a7a029481b317e6725a29dd85d5b8 +size 1045204 diff --git a/docs/manual/media/panorama.gif b/docs/manual/media/panorama.gif index 9969502..f9bee58 100644 --- a/docs/manual/media/panorama.gif +++ b/docs/manual/media/panorama.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd1f8c63eee8e3baf0046f79776a47b047c99c93780575c75be3eb5859be9811 -size 1328671 +oid sha256:8abcafc408b5c87510da1ad87f3d0408944bf64c06e8753362bbdbba3be0026a +size 2018943 diff --git a/docs/manual/media/repair.gif b/docs/manual/media/repair.gif index 637bd18..bbd92eb 100644 --- a/docs/manual/media/repair.gif +++ b/docs/manual/media/repair.gif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6bf1791c8679e26b8d672c448a57e9f77e0ba51c92978329838312edaf742602 -size 328180 +oid sha256:6bb6c62b1f9bdf77b9089e81d21bb55998946aaed7932c5bae7e781ca8301d45 +size 322005 diff --git a/docs/manual/media/settings-export.png b/docs/manual/media/settings-export.png index cb6aeb2..8559ee1 100644 --- a/docs/manual/media/settings-export.png +++ b/docs/manual/media/settings-export.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21272a4de07ba947f3c46ed006ee93a1b9be38a9d4639f2c8197d44f5b85a1ab -size 89320 +oid sha256:51c403ea059e9ea21b9c1a1db0e8cbcafc6a7fcc6a7763b8583a1de87b1a030a +size 90727 diff --git a/tools/manual/scenes.py b/tools/manual/scenes.py index 2609a93..44381cc 100755 --- a/tools/manual/scenes.py +++ b/tools/manual/scenes.py @@ -784,6 +784,34 @@ def develop_light(): undo_all() +@scene(media=['develop-tonemap.gif'], sources=DEVELOP_SRC + PIPELINE_SRC) +def develop_tonemap(): + """Tone Mapping on an alpine frame whose clouds are nearly white: the + white point raised to bring the clouds back from white, then lowered + for a brighter, harder picture, the contrast raised, and Before held. + Its Contrast is the Light group's second, so it is taken by position.""" + at_develop(ALPS_SKY) + group('Light') + in_column('White Point@Slider') + rec('develop-tonemap') + pause(0.8) + slide('White Point', TONEMAP_WHITE_UP) + pause(1.2) + slide('White Point', -TONEMAP_WHITE_DOWN) + pause(1.2) + x0, y0, x1, y1 = column() + cx, cy = handle(dr.find('Contrast@Slider#-1', within=(x0, y0, x1, y1))) + dr.drag(cx, cy, cx + TONEMAP_CONTRAST, cy, 25) + pause(1.2) + hold_before(1.6) + pause(1.0) + cut() + undo_all() + + +TONEMAP_WHITE_UP, TONEMAP_WHITE_DOWN, TONEMAP_CONTRAST = 80, 110, 90 # pixels along the track + + @scene(media=['develop-zoom.gif'], sources=DEVELOP_SRC + ['ui/dr-ui/src/develop/render.rs']) def develop_zoom(): """1:1 with a double-click, a pan, and then further in with the wheel. @@ -1289,11 +1317,22 @@ def join(name, parts): 'core/dr-pano/src/**']) def panorama(): select_pano() - rec('panorama-a') + rec('panorama-0') dr.click_on('Merge to panorama@Button') + pause(4) + cut() + # Reading and aligning twelve frames is minutes on a busy machine; the + # film shows it start and picks up once the alignment is on the page. dr.wait_for('Fill the border@RadioButton', 600) pause(3) shot('panorama-aligned') + rec('panorama-a') + pause(1) + # The first frame left out and brought back: the rest are solved again + # from the pairs already matched, so each takes a moment, not a re-read. + for _ in range(2): + dr.click(*dr.centre(f'{PANO_FIRST}.CR2@CheckBox')) + pause(4) for projection in ('Perspective', 'Spherical', 'Cylindrical'): dr.click_on(f'{projection}@RadioButton') pause(5) @@ -1312,7 +1351,7 @@ def panorama(): dr.click_on('Merge@Button') pause(8) cut() - join('panorama', ['panorama-a', 'panorama-b']) + join('panorama', ['panorama-0', 'panorama-a', 'panorama-b']) # The merge itself takes minutes too; the scene is done when the DNG is. wait_for_new(DEMO_LIBRARY, '.dng', started, 600) if DEMO_LIBRARY else pause(60) pause(5)