fix(io): resolve root named-objects dict robustly on foreign DWGs
Some DWGs written by other programs leave the root named-objects dictionary unrecoverable: the header pointer names a non-dictionary and the real NOD child dicts are owned by a table-control handle, so nothing has owner==NULL. Navigating the root then silently no-ops, and registering a new named-object entry (page setup, annotation scale, CTAB) against the missing root orphans it — it never round-trips. Add shared annotative::root_named_dict_handle(): resolve the header pointer, else adopt the richest owner==NULL dict, else synthesise a fresh root and write it back. Route ensure_plotsettings_dict, add_scale's scalelist-create branch, and set_saved_active_layout through it. Resolve the plot-settings dict via the PlotSettings owner when the header pointer is stale, mirroring scalelist_dict_handle. Verified page setups survive a DWG save/reload on the repro file with layouts intact. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
parent
0c4272fbb0
commit
04bd49c715
5 changed files with 227 additions and 32 deletions
128
tests/page_setup_root_repair.rs
Normal file
128
tests/page_setup_root_repair.rs
Normal file
|
|
@ -0,0 +1,128 @@
|
|||
// Some DWGs written by other programs leave the header's root named-objects
|
||||
// dictionary pointer unresolvable — it names a handle that never loaded (or a
|
||||
// non-dictionary), while the real named-object sub-dictionaries are owned by an
|
||||
// unrelated handle. Navigating that root then silently no-ops, so registering a
|
||||
// new named-object entry (a page setup, the CTAB current-tab variable, an
|
||||
// annotation scale) would vanish instead of persisting.
|
||||
//
|
||||
// `annotative::root_named_dict_handle` resolves the root robustly and, when it
|
||||
// truly can't be found, synthesises a fresh one so registration sticks. These
|
||||
// guards exercise that repair through the page-setup and CTAB write paths.
|
||||
|
||||
use acadrust::objects::{ObjectType, PlotSettings};
|
||||
use acadrust::Handle;
|
||||
use OpenCADStudio::scene::Scene;
|
||||
|
||||
/// Break a document the way a foreign DWG does: dangle the header root pointer
|
||||
/// and re-home the real root under a non-dictionary owner, so neither the
|
||||
/// pointer nor the `owner == NULL` heuristic can rediscover it.
|
||||
fn break_root_pointer(scene: &mut Scene) {
|
||||
let doc = &mut scene.document;
|
||||
let real_root = doc.header.named_objects_dict_handle;
|
||||
if let Some(ObjectType::Dictionary(d)) = doc.objects.get_mut(&real_root) {
|
||||
// Owner points at the dimstyle-control handle (0x0A) — present in the
|
||||
// file but not a dictionary, exactly like the repro drawing.
|
||||
d.owner = Handle::new(0x0A);
|
||||
}
|
||||
doc.header.named_objects_dict_handle = Handle::new(0x00DE_AD00);
|
||||
doc.header.acad_plotsettings_dict_handle = Handle::new(0x00BA_D000);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn page_setup_persists_when_root_pointer_is_unresolvable() {
|
||||
let mut scene = Scene::new();
|
||||
break_root_pointer(&mut scene);
|
||||
|
||||
scene.page_setup_save("Metric-A4", PlotSettings::new("Metric-A4"));
|
||||
|
||||
// The setup is retrievable again…
|
||||
assert!(
|
||||
scene.page_setup_names().contains(&"Metric-A4".to_string()),
|
||||
"saved page setup must be listed back"
|
||||
);
|
||||
assert!(
|
||||
scene.page_setup_get("Metric-A4").is_some(),
|
||||
"saved page setup must be resolvable"
|
||||
);
|
||||
|
||||
// …and it is linked into a *resolvable* root named-objects dictionary, so it
|
||||
// will round-trip through a save rather than dangling.
|
||||
let root_h = scene.document.header.named_objects_dict_handle;
|
||||
let ObjectType::Dictionary(root) = scene
|
||||
.document
|
||||
.objects
|
||||
.get(&root_h)
|
||||
.expect("root handle must resolve to a loaded object")
|
||||
else {
|
||||
panic!("root handle must resolve to a dictionary");
|
||||
};
|
||||
assert!(
|
||||
root.entries.iter().any(|(k, _)| k == "ACAD_PLOTSETTINGS"),
|
||||
"ACAD_PLOTSETTINGS must be registered in the (repaired) root NOD"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn page_setup_survives_a_dwg_roundtrip_after_root_repair() {
|
||||
let mut scene = Scene::new();
|
||||
break_root_pointer(&mut scene);
|
||||
scene.page_setup_save("Wide", PlotSettings::new("Wide"));
|
||||
|
||||
// Full DWG write/read cycle: the repaired root must carry the setup across.
|
||||
let bytes = OpenCADStudio::io::save_to_bytes(&scene.document, "dwg", scene.document.version)
|
||||
.expect("save to DWG bytes");
|
||||
let doc = OpenCADStudio::io::load_bytes("roundtrip.dwg", bytes).expect("reload DWG bytes");
|
||||
|
||||
let mut reloaded = Scene::new();
|
||||
reloaded.document = doc;
|
||||
assert!(
|
||||
reloaded.page_setup_names().contains(&"Wide".to_string()),
|
||||
"page setup must persist across a DWG save/reload once the root is repaired"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn existing_but_unlinked_plot_settings_are_still_listed() {
|
||||
// A drawing whose ACAD_PLOTSETTINGS dictionary exists but whose header
|
||||
// pointer to it is stale: the setups must still be discoverable via the
|
||||
// PlotSettings objects' owner, mirroring the scale-list fallback.
|
||||
let mut scene = Scene::new();
|
||||
scene.page_setup_save("Draft", PlotSettings::new("Draft"));
|
||||
// Now stale the header pointer (leave the dictionary + object intact).
|
||||
scene.document.header.acad_plotsettings_dict_handle = Handle::new(0x00BA_D000);
|
||||
|
||||
assert!(
|
||||
scene.page_setup_names().contains(&"Draft".to_string()),
|
||||
"page setup must be found via the PlotSettings owner when the header \
|
||||
plot-settings pointer is stale"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ctab_is_created_against_a_repaired_root() {
|
||||
let mut scene = Scene::new();
|
||||
break_root_pointer(&mut scene);
|
||||
|
||||
// Switching the active layout records CTAB; with a broken root pointer this
|
||||
// used to silently drop the record.
|
||||
scene.set_current_layout("Layout1".to_string());
|
||||
assert_eq!(
|
||||
OpenCADStudio::io::saved_active_layout(&scene.document).as_deref(),
|
||||
Some("Layout1"),
|
||||
"CTAB must persist even when the root pointer needed repair"
|
||||
);
|
||||
|
||||
let root_h = scene.document.header.named_objects_dict_handle;
|
||||
let ObjectType::Dictionary(root) = scene
|
||||
.document
|
||||
.objects
|
||||
.get(&root_h)
|
||||
.expect("root must resolve")
|
||||
else {
|
||||
panic!("root must be a dictionary");
|
||||
};
|
||||
assert!(
|
||||
root.entries.iter().any(|(k, _)| k == "CTAB"),
|
||||
"CTAB must be registered in the repaired root NOD"
|
||||
);
|
||||
}
|
||||
Loading…
Reference in a new issue