fix(phase4): close the owner review 1 phase 4 findings
Routing sizes render jobs from the resolved preset, and the node wait applies the same routing as the claim, so a re-routed job neither keeps a stale size nor waits for a node that will never take it. Settings an older server cannot read stay on this side for the remote editor, archive sync and workspace push, and the reason is shown where it applies. A turn on one side and a framing on the other merge as one conflict. Orientation and framing fixes: an out-of-range crop turns with the content it shows, the aspect text transposes exactly, the Rotation row counts turns as shown on screen, and Reset framing undoes the orientation press by press, so keyframes and aspect stay on their content. The advisor places the horizon in the view as shown. A look at zero strength is cleared and no longer reaches the motion vectors. Preview changes: the middle button pans, a press inside a box with no slack pans while zoomed, the selected box shows a ring, and screen readers hear when the crop value changes. Tooltips in en and it updated; stale translations of changed tooltips removed so they fall back to English. Test changes: the pinned hash is OS-independent, and the tautological encoder and warning assertions became real checks. Added a non-screen test of the Straighten slider binding. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
4e21aaa548
commit
eeaddc2d14
83 files changed
+823
-270
No files matched your search
@@ -47,16 +47,63 @@ public sealed class ProjectMergeTests
|
||||
{
|
||||
var basis = new ProjectSettings { Camera = new CameraSettings { Aspect = new Auto<string>().WithManual("9:16") } };
|
||||
var ours = basis with { Camera = basis.Camera with { Crop = [0.1, 0, 0.3, 0.9] } };
|
||||
var theirs = basis with { Camera = basis.Camera with { Crop = [0.5, 0.05, 0.2, 0.6], Mirror = true } };
|
||||
var theirs = basis with { Camera = basis.Camera with { Crop = [0.5, 0.05, 0.2, 0.6] } };
|
||||
|
||||
var result = ProjectMerge.MergeWithConflicts(basis, ours, theirs);
|
||||
|
||||
// The box is one value: never the x of one side and the width of the other.
|
||||
Assert.SequenceEqual(["camera.crop"], result.Conflicts.Select(c => c.Path));
|
||||
Assert.SequenceEqual([0.1, 0, 0.3, 0.9], Assert.NotNull(result.Merged.Camera.Crop));
|
||||
Assert.True(result.Merged.Camera.Mirror);
|
||||
Assert.SequenceEqual([0.5, 0.05, 0.2, 0.6], Assert.NotNull(
|
||||
ProjectMerge.MergeWithConflicts(basis, ours, theirs, new HashSet<string> { "camera.crop" }).Merged.Camera.Crop));
|
||||
|
||||
// With a mirror on their side too, the crop and the mirror are one conflict: their crop is in the mirrored frame.
|
||||
var mirrored = theirs with { Camera = theirs.Camera with { Mirror = true } };
|
||||
var coupled = ProjectMerge.MergeWithConflicts(basis, ours, mirrored);
|
||||
Assert.SequenceEqual(["camera.mirror"], coupled.Conflicts.Select(c => c.Path));
|
||||
Assert.SequenceEqual([0.1, 0, 0.3, 0.9], Assert.NotNull(coupled.Merged.Camera.Crop), "ours: our crop");
|
||||
Assert.False(coupled.Merged.Camera.Mirror, "and unmirrored");
|
||||
var taken = ProjectMerge.MergeWithConflicts(basis, ours, mirrored, new HashSet<string> { "camera.mirror" }).Merged;
|
||||
Assert.SequenceEqual([0.5, 0.05, 0.2, 0.6], Assert.NotNull(taken.Camera.Crop));
|
||||
Assert.True(taken.Camera.Mirror);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A turn of a project without a crop changes only the orientation and the aspect (nothing else to move), so member by
|
||||
/// member a crop or keyframes the other side placed in the unturned frame would apply to the turned one: one conflict.
|
||||
/// </summary>
|
||||
[Test]
|
||||
public void ATurnOnOneSideAndAFramingOnTheOtherAreOneConflict()
|
||||
{
|
||||
var basis = new ProjectSettings { Camera = new CameraSettings { Aspect = new Auto<string>().WithManual("16:9") } };
|
||||
var turned = basis with { Camera = Chronos.Core.Imaging.Geometry.OrientationEdit.Apply(basis.Camera, Chronos.Core.Imaging.Geometry.OrientationOp.RotateRight) };
|
||||
Assert.Null(turned.Camera.Crop);
|
||||
var cropped = basis with { Camera = basis.Camera with { Crop = [0.1, 0.2, 0.6, 0.3375] } };
|
||||
|
||||
foreach (var (ours, theirs) in new[] { (turned, cropped), (cropped, turned) })
|
||||
{
|
||||
var result = ProjectMerge.MergeWithConflicts(basis, ours, theirs);
|
||||
Assert.SequenceEqual(["camera.rotate"], result.Conflicts.Select(c => c.Path));
|
||||
Assert.Equal(ours.ToJson(), result.Merged.ToJson(), "ours whole: the orientation and the framing of one side");
|
||||
var other = ProjectMerge.MergeWithConflicts(basis, ours, theirs, new HashSet<string> { "camera.rotate" }).Merged;
|
||||
Assert.Equal(theirs.ToJson(), other.ToJson());
|
||||
}
|
||||
|
||||
// Keyframes placed in the unturned frame, on the camera and on a photo that waits.
|
||||
var keyed = basis with
|
||||
{
|
||||
Camera = basis.Camera with { Keyframes = [new CameraKey(0, 0.8, 0.5, 2, 0)] },
|
||||
};
|
||||
Assert.SequenceEqual(["camera.rotate"], ProjectMerge.MergeWithConflicts(basis, turned, keyed).Conflicts.Select(c => c.Path));
|
||||
var photo = Photo(1);
|
||||
var waiting = basis with { PendingFrames = [Waiting(photo) with { Keyframes = [new CameraKey(0, 0.8, 0.5, 2, 0)] }] };
|
||||
Assert.SequenceEqual(["camera.rotate"], ProjectMerge.MergeWithConflicts(basis, waiting, turned).Conflicts.Select(c => c.Path));
|
||||
|
||||
// Anything else on the other side merges with the turn as before.
|
||||
var brighter = basis with { Exposure = basis.Exposure with { ExposureOffsetEv = 0.3 } };
|
||||
var merged = ProjectMerge.MergeWithConflicts(basis, turned, brighter);
|
||||
Assert.False(merged.HasConflicts);
|
||||
Assert.Equal((90, 0.3), (merged.Merged.Camera.Rotate, merged.Merged.Exposure.ExposureOffsetEv));
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
Reference in new issue
Block a user