Save linked movie clip ranges while retaining the complete movie

README.md

@@ -71,14 +71,15 @@ then write your current edits. Changes made by another program are preserved and
 conflict. Recovery never marks newer edits saved without writing them to both files.
 
 This workflow currently covers audited media-free and local-image experiments, plus selected-member
-updates to existing image archives. The first linked-movie writer supports mass and mark edits in
+updates to existing image archives. The linked-movie writer supports mass, mark and clip-range edits in
 audited constant-rate imports after timestamp indexing; its edited-file Tracker save/reopen acceptance
 has passed for the pinned four-frame AVI case. Later revisions still require their own CI and review.
 Movie timing/calibration/track-identity edits, movie packaging, filters and broader settings remain unfinished. An unsupported export is refused; save a MoTrack copy to retain work.
 Image experiments can retain Clip Settings changes to the starting frame, ending frame and frame
 interval in linked `.trk` files, existing image archives and portable image exports. All source images
 and marks remain available, including those outside the selected clip; image timing stays unchanged.
-The new range-edit cases still require actual Tracker application acceptance before merge.
+Audited linked movies also retain Clip Settings range and interval edits after indexing. The complete
+movie and all measurements stay available; source frame numbers and numeric timing are unchanged.
 The [format guide](docs/native-format.md) records the exact supported edits and compatibility evidence.
 
 ### Export a portable image experiment

docs/migration-plan.md

@@ -168,9 +168,9 @@ and platform evidence before it can be marked complete.
 | --- | --- | --- | --- |
 | R01 | Reproducible native builds, CI, review, numerical tests, at least 90% combined C++ line coverage | Implemented foundation; continue applying gates to every new component. The reference helper executes repeated loader completion callbacks once, fixing the empty-resave race in #105; bounded failure diagnostics remain and no retry or acceptance bypass is added. | 0, every phase |
 | R02 | Open `.trk`/`.trz`; preserve all supported and unknown content, references, metadata, and archive tabs | Partial: supported point masses/vectors/calibration import; one archive tab selected. Native documents retain that tab's original XML, editable-track IDs and source-object associations for new imports. Version 5 embeds the exact original archive, including all tabs/media/unknown files. A partial read-only reference index maps original track names, panel/nested-view selections, table/plot owners (including dataset rows), ordered plot guests, mechanical-tool attachment slots/step targets center-of-mass/vector-sum members, model boosters and dynamic-system members to source nodes and known IDs; unknown subclass relationships remain explicit. Dataset rows have source-structure evidence only; media-backed application acceptance remains. Older native sources retain an explicit unknown-association state. | 1–3 |
-| R03 | Save edited standard files plus optional `.motrack`; reopen in both applications without data loss | Partial: native source/archive preservation and audited standard writers are merged. Depending on the source schema, verified edits include mass/marks, independent vectors, clip ranges, media-free constant timing, fixed/partly fixed/varying calibration, unit labels, audited renames, independent track creation and supported removal/selection/plot/table cleanup. The [format guide](native-format.md) defines those per-schema limits. Linked images, selected image-archive members and indexed constant-rate linked movies have native reopen/relocation and actual Tracker acceptance. Per-output checkpoints, explicit recovery, desktop paired Save and portable image export are merged through #133. Image clip ranges/strides are merged in #134 with all four linked/archive/package application cases, including complete post-resave image inventory checks. Untouched archive experiments are checked independently. Remaining work includes broader schemas and dependencies, dataset-owner removal, movie archives/packaging, broader media timing and full export authoring. Known Tracker table-format losses (#64) and vector-sum losses (#63) retain strict guards and independent failing expectations. | 2–3, every feature |
+| R03 | Save edited standard files plus optional `.motrack`; reopen in both applications without data loss | Partial: native source/archive preservation and audited standard writers are merged. Depending on the source schema, verified edits include mass/marks, independent vectors, clip ranges, media-free constant timing, fixed/partly fixed/varying calibration, unit labels, audited renames, independent track creation and supported removal/selection/plot/table cleanup. The [format guide](native-format.md) defines those per-schema limits. Linked images, selected image-archive members and indexed constant-rate linked movies have native reopen/relocation and actual Tracker acceptance. Per-output checkpoints, explicit recovery, desktop paired Save and portable image export are merged through #133. Image clip ranges/strides are merged in #134 with all four linked/archive/package application cases, including complete post-resave image inventory checks. The next movie clip-range slice has local native/desktop/export checks and a complete post-resave movie-hash oracle; its actual Tracker acceptance and current-head CI/review remain pending. Untouched archive experiments are checked independently. Remaining work includes broader schemas and dependencies, dataset-owner removal, movie archives/packaging, broader media timing and full export authoring. Known Tracker table-format losses (#64) and vector-sum losses (#63) retain strict guards and independent failing expectations. | 2–3, every feature |
 | R04 | Multiple experiment tabs, independent undo/dirty state, tab/project Save As, cross-tab import and reusable views | Partial foundation: document sessions own independent data/history/save checkpoints, and native storage preserves unopened archive tabs. The desktop still has one active experiment; multi-tab controllers/UI, cross-tab import and reusable views remain. | 2–4 |
-| R05 | Movies, stills, image sequences and zipped sequences; accurate clip/time/frame controls and media properties | Partial: local movies/images, trim/stride, indexing, orientation, bounded caching and playback exist. Media-free duration/time-origin edits have history and export oracles. Four-image and four-frame constant-rate AVI fixtures independently check pixels, order, timestamps, clip time and calibrated marks. The movie baseline (#132) passes actual Tracker load/save/fresh reopen; existing mass/mark export (#133) also passes native reimport; movie edits require unchanged timing/calibration/identity and a matching completed native index. Image clip edits (#134) pass all four linked/archive/package cases while preserving source frame numbers, measurements and every image, including excluded frames. See the merged CI table above. Variable-rate timing, movie archives, broader formats/properties/controls, numeric media timing edits and media export remain. The synthetic AVI does not reproduce or resolve the historical MOV/Open Recent report in #65. | 1, 3–4, 6 |
+| R05 | Movies, stills, image sequences and zipped sequences; accurate clip/time/frame controls and media properties | Partial: local movies/images, trim/stride, indexing, orientation, bounded caching and playback exist. Media-free duration/time-origin edits have history and export oracles. Four-image and four-frame constant-rate AVI fixtures independently check pixels, order, timestamps, clip time and calibrated marks. The movie baseline (#132) passes actual Tracker load/save/fresh reopen; existing mass/mark export (#133) also passes native reimport; movie edits require unchanged timing/calibration/identity and a matching completed native index. Image clip edits (#134) pass all four linked/archive/package cases while preserving source frame numbers, measurements and every image, including excluded frames. See the merged CI table above. Strided/single-frame movie range saving now has local native/desktop tests and two new reference modes pending actual Tracker acceptance. Variable-rate timing, movie archives, broader formats/properties/controls, numeric media timing edits and media export remain. The synthetic AVI does not reproduce or resolve the historical MOV/Open Recent report in #65. | 1, 3–4, 6 |
 | R06 | Complete point-mass editing and appearance: selection, dragging/nudging, numeric positions, multiselect, locks, labels, trails, paths, and vector overlays | Partial: manual marking/replacement, repeat, rename/delete, mass, and undo exist. Finish manipulation, appearance, path length, and selection behavior. | 4–5 |
 | R07 | Independent vectors, linked vectors, sums, their data, editing, and persistence | Partial: independent vectors import/display/edit/undo/native-save. Internal sample export, new-vector creation and unreferenced removal have independent empty/sparse/zero-vector reference cases; native selection-cleanup regressions cover empty and replacement vectors; creation retains the snapping/precision guards and requires an audited independent-vector/axes source. A Java-authored vector-sum case retains independent expected results but reproduces a Tracker 6.3.5 defect: members never resolve and resave loses their names. This is explicitly not accepted round-trip evidence; the internal writer rejects edited projects containing vector sums, including empty member tracks. Native read-only indexing now records original member links with explicit ambiguity/unclassified targets. Native links/sum evaluation, analysis and desktop standard saving remain. | 3–5 |
 | R08 | Center-of-mass tracks, constituents, dependent updates, and moving reference frames | Native evaluation/editing missing. A Java-authored center-of-mass reference checks named constituents, total mass and independent weighted positions; native member-link indexing and constituent-name export preserve original targets. The rename case requires unchanged 5 kg total mass and weighted positions through actual Tracker resave; native dependency evaluation, constituent editing and moving reference frames remain. | 2, 5 |

docs/native-format.md

@@ -650,9 +650,9 @@ Windows/macOS and actual Tracker package acceptance, with 95.72% combined C++ li
 ### Linked constant-rate movie edits
 
 The document writer accepts the explicitly audited `XuggleVideo`/`VideoClipControl` schema only through
-its movie adapter. Existing point-mass values and image-coordinate marks, plus the linked media path,
-may change. Original names, membership, calibration, unit labels, clip timing/range and other parsed
-fields must remain unchanged. Filters, vectors, other track types except axes, display-orientation
+its movie adapter. Existing point-mass values and image-coordinate marks, clip start/step/count and the
+linked media path may change. Original names, membership, calibration, unit labels, numeric clip timing
+and other parsed fields must remain unchanged. Filters, vectors, other track types except axes, display-orientation
 transforms and archived movies remain refused. The archive entry point rejects movie documents before
 clearing archive metadata for its internal snapshot; this also applies after indexing and native reopen.
 This opt-in schema does not enable movie renames or
@@ -667,7 +667,9 @@ index limit. Clip endpoints and marks must fit that index. The native runtime fr
 the complete index or the clip endpoint inferred on import; it is removed from the export snapshot,
 not written as a standard-file edit. Existing saved `video_framecount`, when present, must match the
 index. Decoded timestamps stay in seconds; preserved XML clip time origin and interval use milliseconds.
-Native movie analysis remains aligned to the imported clip's time origin.
+Native movie analysis remains aligned to the imported clip's time origin. Range edits retain every
+original-frame mark and the full movie index; no frames are renumbered or movie bytes rewritten. The
+shared clip writer retains its 500000 last-frame bound and checks Tracker's temporary Java-int count.
 
 Movie links use the same physical-directory, retained-location and atomic-write checks as images.
 Preflight verifies current readability and identity, not general codec compatibility or protection
@@ -686,3 +688,14 @@ and review at d9a24c6 in [PR #133](https://github.com/mgradwohl/MoTrack/pull/133
 [run 42549945960](https://github.com/mgradwohl/MoTrack/actions/runs/42549945960), including the edited
 Tracker movie case and 95.71% combined coverage. This scoped acceptance does not establish full
 movie interchange or resolve #65.
+
+
+The movie-range extension adds strided and single-frame native export/reopen cases, desktop Clip
+Settings/undo/redo/paired-save checks and two actual-Tracker acceptance modes. Independent whole-XML
+expectations permit only the requested range, mass, mark and path; every mark outside the clip remains.
+After Tracker saves and freshly reopens, the saved movie reference must resolve locally to the complete
+pinned byte count/SHA-256, including excluded frames. Local Windows validation passes all nine CTest
+groups (124.80 seconds), 86 Python tests, both native export/oracle/reimport cases, formatting and
+static analysis for all four changed C++ source files, with 95.64% line coverage (8838/9241). Three
+existing LLVM function-profile mismatch warnings remain visible. Current-head three-platform CI,
+actual Tracker movie-range acceptance and review remain required before merging this extension.

src/tracker_writer.cpp

@@ -129,14 +129,21 @@ void patchUnit(QDomDocument& xml, const QString& name, const std::string& unit)
     patchScalar(xml, xml.documentElement(), name, "string", label);
 }
 
-void patchClipRange(QDomDocument& xml, const Clip& clip, bool linkedImages)
+enum class LinkedMedia : std::uint8_t
+{
+    None,
+    Images,
+    Movie
+};
+
+void patchClipRange(QDomDocument& xml, const Clip& clip, LinkedMedia media)
 {
     if (clip.frameDurationMs)
     {
         auto timing = clip;
-        // Audited image sequences use the same constant interval arithmetic. This private
+        // Audited media use the same constant interval arithmetic. This private
         // numeric check does not change the saved source inventory or enable timing edits.
-        if (linkedImages)
+        if (media != LinkedMedia::None)
             timing.mediaReferences.clear();
         require(validConstantClipTiming(timing));
     }
@@ -152,12 +159,13 @@ void patchClipRange(QDomDocument& xml, const Clip& clip, bool linkedImages)
     require(property.attribute("type") == "object" && object.attribute("class") == "org.opensourcephysics.media.core.VideoClip" &&
             object.nextSiblingElement().isNull());
     require(uniqueProperty(object, "frameshift").isNull());
-    if (linkedImages)
+    if (media != LinkedMedia::None)
     {
-        // The image schema, complete source-frame inventory and optional saved count were
-        // checked before patching. Trimming changes only the clip, never the image inventory.
+        // The media schema, complete frame inventory/index and optional saved count were
+        // checked before patching. Trimming changes only the clip, never the source media.
         require(uniqueProperty(object, "video").firstChildElement("object").attribute("class") ==
-                "org.opensourcephysics.media.core.ImageVideo");
+                (media == LinkedMedia::Images ? "org.opensourcephysics.media.core.ImageVideo"
+                                              : "org.opensourcephysics.media.xuggle.XuggleVideo"));
     }
     else
         require(uniqueProperty(object, "video").isNull() && uniqueProperty(object, "video_framecount").isNull());
@@ -1006,22 +1014,18 @@ bool patchLinkedImagePaths(QDomDocument& xml, const LegacyProject& project, Lega
     return true;
 }
 
-enum class LinkedMedia : std::uint8_t
-{
-    None,
-    Images,
-    Movie
-};
-
 bool patchLinkedMoviePath(QDomDocument& xml, const LegacyProject& project, LegacyProject& baseline, std::span<const double> frameTimes)
 {
     validateTrackerMovieEditSchema(xml);
     require(project.clip.mediaReferences.size() == 1 && baseline.clip.mediaReferences.size() == 1 && project.vectors.empty() &&
             std::ranges::all_of(project.unsupportedTrackTypes,
                                 [](const auto& type) { return type == "org.opensourcephysics.cabrillo.tracker.CoordAxes"; }));
-    // The first movie slice changes only existing mass values, marks and the linked path.
+    // Movie edits retain original timing, geometry and identity. Clip ranges keep source frame numbers.
     auto unchanged = project;
     unchanged.clip.mediaReferences = baseline.clip.mediaReferences;
+    unchanged.clip.firstFrame = baseline.clip.firstFrame;
+    unchanged.clip.stepSize = baseline.clip.stepSize;
+    unchanged.clip.stepCount = baseline.clip.stepCount;
     require(unchanged.pointMasses.size() == baseline.pointMasses.size());
     for (std::size_t index = 0; index < unchanged.pointMasses.size(); ++index)
     {
@@ -1227,7 +1231,7 @@ std::string renderTrackerProjectImpl(const LegacyProject& project,
     if (expected.clip.firstFrame != baseline.project.clip.firstFrame || expected.clip.stepSize != baseline.project.clip.stepSize ||
         expected.clip.stepCount != baseline.project.clip.stepCount)
     {
-        patchClipRange(xml, expected.clip, media == LinkedMedia::Images);
+        patchClipRange(xml, expected.clip, media);
         baseline.project.clip.firstFrame = expected.clip.firstFrame;
         baseline.project.clip.stepSize = expected.clip.stepSize;
         baseline.project.clip.stepCount = expected.clip.stepCount;

src/tracker_writer.hpp

@@ -18,9 +18,9 @@ struct WorkspaceDocument;
 void writeTrackerProject(const QString& path, const LegacyProject& project, const TrackerSource& source);
 /// Atomically export a standalone document. mediaProjectPath is the absolute current project file path;
 /// local image references use its physical parent directory, resolving existing filesystem aliases before rebasing.
-/// The source/native snapshot remains unchanged. Audited constant-rate linked movies permit existing mass/mark edits
+/// The source/native snapshot remains unchanged. Audited constant-rate linked movies permit existing mass/mark and clip-range edits
 /// after native timestamp indexing; their original timing, calibration and other fields stay unchanged.
-/// Archives, filters, movie rename/membership edits and media timing/range edits are refused.
+/// Archives, filters, movie rename/membership edits and numeric media timing edits are refused.
 /// All linked files must be readable. Symbolic-link output files and unsafe generated references are refused.
 /// No media is copied and no session save checkpoint is changed.
 void writeTrackerDocument(const QString& path, const WorkspaceDocument& document, const QString& mediaProjectPath);