forked from 1b-agent/opencadstudio-upstream
feat(sysvars): persist Ortho, running OSNAP and Isolate in the drawing
Ortho and the running object-snap set were app-global (settings.txt only) and Isolate/Hide was a session-only view state, so none survived save/reopen and none were per-drawing. Bind all three to the file like AutoCAD: - Ortho -> header.ortho_mode ($ORTHOMODE); running OSNAP <-> header .object_snap_mode ($OSMODE bitmask) via a new SnapType<->bit map in settings (osmode_from_snaps / snaps_from_osmode, round-trip tested). The header is the per-drawing store, live state mirrors the active drawing: adopt header->live on open and tab-switch, stamp live->header on save and when leaving a tab, a fresh drawing inherits the current values, and SETVAR ORTHOMODE/OSMODE now also update the live state. settings.txt stays as the boot/new-drawing default; the per-file header overrides it on open. - Isolate/Hide now set each entity's persisted invisible flag (DXF code 60, which acadrust round-trips in DXF and DWG) in addition to the session set; End Isolation clears it. The set is reseeded from invisible entities on load and after undo/redo, the commands are undoable and mark the tab dirty. The renderer already skipped invisible entities, so no render change was needed. Co-Authored-By: Claude Opus 4.8 <[email protected]>
This commit is contained in:
1 parent
7cba5c8679
commit
da2c600953
7 files changed
+220
-3
No files matched your search
@@ -116,6 +116,45 @@ impl OpenCADStudio {
|
||||
self.rebuild_ribbon_modules();
|
||||
}
|
||||
|
||||
/// Adopt the per-drawing sysvars stored in tab `i`'s document header —
|
||||
/// Ortho (`$ORTHOMODE`) and the running object-snap set (`$OSMODE`) — into
|
||||
/// the live app state, so each drawing keeps its own. Called when a drawing
|
||||
/// becomes active (open, tab switch). The app-settings values seed the boot
|
||||
/// default; the per-file header overrides it here.
|
||||
pub(in crate::app) fn adopt_header_sysvars(&mut self, i: usize) {
|
||||
if self.tabs[i].is_start {
|
||||
return;
|
||||
}
|
||||
let (ortho, osmode) = {
|
||||
let h = &self.tabs[i].scene.document.header;
|
||||
(h.ortho_mode, h.object_snap_mode)
|
||||
};
|
||||
self.ortho_mode = ortho;
|
||||
// Ortho and Polar are mutually exclusive (ToggleOrtho clears Polar).
|
||||
if ortho {
|
||||
self.polar_mode = false;
|
||||
}
|
||||
let (modes, snap_enabled) = crate::app::settings::snaps_from_osmode(osmode);
|
||||
self.snapper.enabled = modes.into_iter().collect();
|
||||
self.snapper.snap_enabled = snap_enabled;
|
||||
}
|
||||
|
||||
/// Stamp the live per-drawing sysvars (Ortho, running OSNAP) onto tab `i`'s
|
||||
/// document header just before it is written to disk (or before switching
|
||||
/// away from it), so they persist with the drawing.
|
||||
pub(in crate::app) fn stamp_header_sysvars(&mut self, i: usize) {
|
||||
if self.tabs[i].is_start {
|
||||
return;
|
||||
}
|
||||
let osmode = crate::app::settings::osmode_from_snaps(
|
||||
self.snapper.enabled.iter(),
|
||||
self.snapper.snap_enabled,
|
||||
);
|
||||
let h = &mut self.tabs[i].scene.document.header;
|
||||
h.ortho_mode = self.ortho_mode;
|
||||
h.object_snap_mode = osmode;
|
||||
}
|
||||
|
||||
/// Apply the persisted default background(s) to tab `idx`. No-op for the
|
||||
/// start tab or when no default is set. Refreshes the tab's cached wires
|
||||
/// and meshes so background-adaptive colours pick up the change.
|
||||
@@ -311,6 +350,9 @@ pub(super) fn on_open_file(&mut self) -> Task<Message> {
|
||||
self.tabs[i].scene.document = doc;
|
||||
// Follow the file's saved current UCS from the moment it opens.
|
||||
self.tabs[i].adopt_active_ucs_from_header();
|
||||
// Adopt the drawing's own Ortho ($ORTHOMODE) and running OSNAP
|
||||
// ($OSMODE) so each file keeps its state, like AutoCAD.
|
||||
self.adopt_header_sysvars(i);
|
||||
// Route shared CJK ideographs to the language matching this
|
||||
// drawing's code page (web per-language font split). Drop the
|
||||
// glyph cache if it changed so Han re-resolves to the new
|
||||
@@ -406,6 +448,10 @@ pub(super) fn on_open_file(&mut self) -> Task<Message> {
|
||||
self.tabs[i].scene.selected = rustc_hash::FxHashSet::default();
|
||||
self.tabs[i].scene.preview_wires = vec![];
|
||||
self.tabs[i].scene.current_layout = "Model".to_string();
|
||||
// Rebuild the Isolate/Hide set from the entities the file itself
|
||||
// marks invisible (DXF code 60), so hidden objects stay hidden on
|
||||
// reopen and End Isolation can bring them back.
|
||||
self.tabs[i].scene.sync_hidden_from_invisible();
|
||||
crate::io::linetypes::populate_document(&mut self.tabs[i].scene.document);
|
||||
self.tabs[i].properties = PropertiesPanel::empty();
|
||||
// Seed the current table / multileader style from the file's
|
||||
@@ -594,6 +640,9 @@ pub(super) fn on_open_file(&mut self) -> Task<Message> {
|
||||
// reflects them even if they came from settings with no
|
||||
// in-session toggle (#121).
|
||||
self.sync_vport_display(i);
|
||||
// Persist Ortho ($ORTHOMODE) + running OSNAP ($OSMODE) into the
|
||||
// drawing header so they survive save/reopen (per-drawing).
|
||||
self.stamp_header_sysvars(i);
|
||||
// Native: save straight to the known path. Web has no path
|
||||
// (downloads instead), so always go through the Save dialog.
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
@@ -662,6 +711,8 @@ pub(super) fn on_open_file(&mut self) -> Task<Message> {
|
||||
let close = self.close_save_dialog_window();
|
||||
let i = self.active_tab;
|
||||
sync_annotation_scale_header(&mut self.tabs[i].scene);
|
||||
// Persist Ortho / running OSNAP into the header (Save-As path).
|
||||
self.stamp_header_sysvars(i);
|
||||
self.sync_truck_solids_to_acis(i);
|
||||
|
||||
// Native: write to the chosen path. Web: download the bytes
|
||||
|
||||
@@ -664,11 +664,17 @@ impl OpenCADStudio {
|
||||
|
||||
// ── Document tabs ─────────────────────────────────────────────
|
||||
Message::TabNew => {
|
||||
// Preserve the outgoing drawing's Ortho / running OSNAP.
|
||||
self.stamp_header_sysvars(self.active_tab);
|
||||
self.tab_counter += 1;
|
||||
let new_tab = super::document::DocumentTab::new_drawing(self.tab_counter);
|
||||
self.tabs.push(new_tab);
|
||||
self.active_tab = self.tabs.len() - 1;
|
||||
let idx = self.active_tab;
|
||||
// A fresh drawing inherits the app's current Ortho / OSNAP so
|
||||
// creating one doesn't silently reset them (its header default is
|
||||
// 0 = no snaps); saving then persists them into the file.
|
||||
self.stamp_header_sysvars(idx);
|
||||
self.apply_bg_default(idx);
|
||||
self.sync_ribbon_layers();
|
||||
self.sync_ribbon_styles();
|
||||
@@ -687,6 +693,10 @@ impl OpenCADStudio {
|
||||
// The attribute editor is tab-scoped; leaving its tab
|
||||
// drops it (its handle is that document's, not this one's).
|
||||
self.cancel_attr_editor();
|
||||
// Persist the outgoing drawing's Ortho / running OSNAP
|
||||
// before leaving it, so switching back restores them.
|
||||
let prev = self.active_tab;
|
||||
self.stamp_header_sysvars(prev);
|
||||
}
|
||||
self.active_tab = idx;
|
||||
self.sync_ribbon_layers();
|
||||
@@ -698,6 +708,8 @@ impl OpenCADStudio {
|
||||
self.sync_ribbon_from_selection();
|
||||
// Grid/snap follow the newly active drawing's viewport.
|
||||
self.adopt_view_display(idx);
|
||||
// Ortho / running OSNAP follow the newly active drawing.
|
||||
self.adopt_header_sysvars(idx);
|
||||
// Shared CJK ideographs follow the newly active drawing's
|
||||
// language; re-tessellate if it differs from the last. (#141)
|
||||
if crate::scene::text::web_font::set_cjk_lang_from_codepage(
|
||||
|
||||
Reference in new issue
Block a user