Repository navigation
fix(process): Color settings on a B&W roll shouldn't carry to a color roll - #1693
Draft
kurtwindisch wants to merge 6 commits into
Draft
kurtwindisch wants to merge 6 commits into
kurtwindisch wants to merge 6 commits into
Conversation
…6#1642) Chroma carries to a fresh file, and a black-and-white frame hides it. A Chroma of 0 on a B&W roll then carried to the next color roll unseen, and a switch to Color kept it, so the frame stayed gray until Reset Settings. - Leaving black and white (Film Mode, or B&W off on a Slide) sets a Chroma of 0 back to 1 (chroma_for_mono). Any other value stays, and a pasted Chroma still wins. - A black-and-white frame does not carry its hidden color controls (Chroma, Skin Protection, Chroma Denoise) to a fresh file. Verified in the app: a fresh color file after a B&W frame with Chroma 0 opens gray, and the switch to Color gives Chroma 1 and a color render. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A user hit by the bug can hold Color with Chroma 0 in the carried settings: autodetect switched the fresh frame to Color and the next edit saved it. No mode switch then runs, so fresh files stay gray. A one-time migration sets that carried 0 back to 1. Saved edits are left alone. A roll's Color film default now restores Chroma on a saved B&W frame with Chroma 0, so THUMBNAIL_RENDER_VERSION moves to 39. The guide and PIPELINE.md sentences are gone: the reset is an automatic edge case, and PIPELINE.md leaves UI behavior to the guide. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…arcinz606#1642) Pushing Film Mode from the Setup card sets only the roll's default, so with_process_mode never ran on the other frames. A roll given Chroma 0, then B&W, then Color kept Chroma 0 on every frame but the open one. The push now applies chroma_for_mono to each loaded frame that follows the roll's Film card and leaves black and white. The write is inside the Apply to Roll batch, so Undo restores it. A frame locked on Film keeps its own Chroma. Verified in the app on a three-frame roll: after Chroma 0, B&W and Color pushed to the roll, every frame is Color with Chroma 1 and renders in color. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # negpy/desktop/controller.py # negpy/services/assets/thumbnail_fingerprint.py # tests/thumbnail_fingerprint_defaults.json
…ay profile (marcinz606#1642) Soft Proof is on by default and proofs through the export profile until a proof profile is chosen. The export profile carries to every file, so a Greyscale export set on a B&W roll made every later color roll preview gray, with nothing on the frame's cards to explain it. The canvas strip now holds a standing warning in its message slot, in the amber of a warning message: "Gray preview from the {profile} profile. Choose another profile or turn off Proof on Screen." A timed or held message still takes the slot and the warning comes back after it. CanvasHud.set_advisory is the one place for other standing warnings about the preview. The warning shows only while Soft Proof is active, the proof profile has a gray color space (ICC header) and the frame's Film Mode is color. The Soft Proof guide panel says so in every language. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note
This is based on a previously suspected cause for #1642, which would be a user error if accurate. The fix here addresses both a possible user error and the behavior that makes it hard for the user to recognize the error (carrying color settings from a B&W frame that hides them from the panels).
Summary
Related to #1642. After B&W rolls, new color rolls rendered gray. A switch between B&W and Color changed the tone but not the gray, and only Reset Settings brought the color back.
Chroma (
lab.saturation) is a carried setting by default. A B&W frame hides the Chroma slider and leaves it out of the edited count, so a Chroma of 0 on a B&W roll is invisible. It still carried to the next fresh file with Film Mode B&W, and a switch to Color kept the 0.Changes
features/process/models.py: leaving black and white (Film Mode, or B&W off on a Slide) sets a Chroma of exactly 0 back to 1 (chroma_for_mono, besidecast_removal_for_mode).with_process_modeandwith_slide_bwapply it, so every mode change gets it, autodetect on load included. Any other value stays, and a pasted Chroma still wins.desktop/session.py: a black-and-white frame does not carry its hidden color controls (Chroma, Skin Protection, Chroma Denoise) to a fresh file.BW_UNUSED_LAB_FIELDSis now public, so one constant says what B&W hides and what it does not carry.desktop/sticky.py: a one-time migration sets a carried Chroma of 0 back to 1. A user already hit by the bug can hold Color with Chroma 0 in the carried settings, where no mode switch runs. Saved edits are left alone.desktop/controller.py: a Film Mode push to the roll (the Setup card's Roll button) sets only the roll's default, sowith_process_modenever runs on the other frames. The push now applieschroma_for_monoto each loaded frame that follows the roll's Film card and leaves black and white. The write is inside the Apply to Roll batch, so Undo restores it. A frame locked on Film keeps its own Chroma.desktop/view/canvas/hud.py,main_window.py: the reporter's gray came from a Greyscale export profile, which Soft Proof (on by default) previews until a proof profile is chosen, and which carries to every file. The canvas strip now shows a standing amber warning while a color frame previews through a gray profile: "Gray preview from the {profile} profile. Choose another profile or turn off Proof on Screen." A message still takes the slot, and the warning comes back after it.CanvasHud.set_advisoryis the one place for other standing warnings about the preview, as the owner suggested on [Bug]: Roll stuck on black and white #1642. The gray check reads the ICC header (icc_profile.is_gray_profile). The Soft Proof guide panel says so in every language.THUMBNAIL_RENDER_VERSION42 → 43: a roll's Color film default now restores Chroma on a saved B&W frame with Chroma 0.No guide change: the reset is an automatic edge case.
Known trade-off
A Chroma of 0 chosen on a color frame is lost on a round trip through B&W and back to Color. The B&W frame cannot tell it from a hidden carried 0.
A Film Mode push to the roll reaches only the frames loaded in the Film Strip, as every roll push does. A member that is not loaded, such as a file on a disconnected drive, keeps its Chroma.
Merge order
No order is required.
mainis merged in. Open PRs that bumpTHUMBNAIL_RENDER_VERSION(#1584) or edittests/thumbnail_fingerprint_defaults.json(#1431) conflict on those lines: whichever merges second takes one more thanmain's version and re-records the defaults (NEGPY_RECORD_THUMBNAIL_DEFAULTS=1).Test plan
make all(one unrelated flaky test,test_frame_merge.py::test_finish_keeps_the_composite_of_a_stitch_that_failed, passed on rerun)🤖 Generated with Claude Code