Merge branch 'codex/updatefield-count' into codex/automation-select-layout

This commit is contained in:
ramox81 committed 2026-10-07 11:28:27 +03:00
commit 4ef92c3ef1
5 files changed
+41 -23

No files matched your search

+21 -15
View File
@@ -546,6 +546,12 @@ impl OpenCADStudio {
/// its attributes and the texts of its block definition; a table, the /// its attributes and the texts of its block definition; a table, the
/// cell texts of its drawing (its `*T` block). /// cell texts of its drawing (its `*T` block).
fn update_fields(&mut self, i: usize, handles: &[Handle]) { fn update_fields(&mut self, i: usize, handles: &[Handle]) {
// Every run is an undo step, as in the reference, even with nothing
// selected, no field found or no value changed.
self.push_undo_mark(i, "UPDATEFIELD");
if handles.is_empty() {
return;
}
let doc = &self.tabs[i].scene.document; let doc = &self.tabs[i].scene.document;
let mut hosts = handles.to_vec(); let mut hosts = handles.to_vec();
for h in handles { for h in handles {
@@ -572,25 +578,25 @@ impl OpenCADStudio {
}) })
.flatten() .flatten()
.collect(); .collect();
let found = hosts let hosting = hosts.iter().any(|h| match doc.get_entity(*h) {
.iter() Some(entity) => crate::entities::field::hosts_field(doc, entity),
.filter(|h| match doc.get_entity(**h) { None => attributes
Some(entity) => crate::entities::field::hosts_field(doc, entity), .iter()
None => attributes.iter().any(|common| { .any(|common| common.handle == *h && crate::entities::field::common_hosts_field(doc, common)),
common.handle == **h && crate::entities::field::common_hosts_field(doc, common) });
}), if !hosting {
}) self.command_line.push_output(&crate::tf!("{found} field(s) found.", found = 0));
.count(); self.command_line.push_output(&crate::tf!("{updated} field(s) updated.", updated = 0));
self.command_line.push_output(&crate::tf!("{found} field(s) found."));
if found == 0 {
return; return;
} }
self.push_undo_snapshot(i, "UPDATEFIELD"); // The reference counts fields, not the texts holding them, and
let updated = self.tabs[i].scene.update_fields(32, Some(&hosts)); // reports every field it evaluated as updated, changed or not.
if updated > 0 { let (changed, found) = self.tabs[i].scene.update_fields(32, Some(&hosts));
if changed > 0 {
self.tabs[i].dirty = true; self.tabs[i].dirty = true;
} }
self.command_line.push_output(&crate::tf!("{updated} field(s) updated.")); self.command_line.push_output(&crate::tf!("{found} field(s) found."));
self.command_line.push_output(&crate::tf!("{updated} field(s) updated.", updated = found));
} }
/// A count table at `point`: `Item` | `Count`, one row per block (all /// A count table at `point`: `Item` | `Count`, one row per block (all
+2
View File
@@ -901,4 +901,6 @@ pub(super) struct PendingHistorySnapshot {
pub(super) dirty_before: bool, pub(super) dirty_before: bool,
pub(super) structure_before: CadDocument, pub(super) structure_before: CadDocument,
pub(super) recorder: Arc<codec::document::EntityChangeRecorder>, pub(super) recorder: Arc<codec::document::EntityChangeRecorder>,
/// Kept as an undo step even when nothing changed.
pub(super) keep_empty: bool,
} }
+12 -1
View File
@@ -313,7 +313,8 @@ impl OpenCADStudio {
let selected_after: Vec<Handle> = self.tabs[i].scene.selected.iter().copied().collect(); let selected_after: Vec<Handle> = self.tabs[i].scene.selected.iter().copied().collect();
let dirty_after = self.tabs[i].dirty; let dirty_after = self.tabs[i].dirty;
let active_layer_after = self.tabs[i].active_layer.clone(); let active_layer_after = self.tabs[i].active_layer.clone();
if entities.is_empty() if !pending.keep_empty
&& entities.is_empty()
&& !structure_changed && !structure_changed
&& pending.selected_before == selected_after && pending.selected_before == selected_after
&& pending.dirty_before == dirty_after && pending.dirty_before == dirty_after
@@ -365,9 +366,19 @@ impl OpenCADStudio {
dirty_before, dirty_before,
structure_before, structure_before,
recorder, recorder,
keep_empty: false,
}); });
} }
/// [`Self::push_undo_snapshot`] for a command that is an undo step even
/// when it changes nothing (UNDO and U then name it and undo nothing).
pub(super) fn push_undo_mark(&mut self, i: usize, label: impl Into<String>) {
self.push_undo_snapshot(i, label);
if let Some(pending) = self.tabs[i].history.pending.as_mut() {
pending.keep_empty = true;
}
}
/// Begin undo capture for an entity edit that will touch `touched` entities. /// Begin undo capture for an entity edit that will touch `touched` entities.
/// Starts a cheap Scene delta recording and returns the pre-command state to /// Starts a cheap Scene delta recording and returns the pre-command state to
/// pass to [`OpenCADStudio::commit_undo_delta`] after the mutation. A command /// pass to [`OpenCADStudio::commit_undo_delta`] after the mutation. A command
+1 -3
View File
@@ -434,9 +434,7 @@ impl CadCommand for UpdateFieldCommand {
} }
fn on_enter(&mut self) -> CmdResult { fn on_enter(&mut self) -> CmdResult {
if self.selected.is_empty() { // An empty selection still runs (the reference keeps an undo step).
return CmdResult::Cancel;
}
let handles: Vec<String> = self.selected.iter().map(|h| format!("{:X}", h.value())).collect(); let handles: Vec<String> = self.selected.iter().map(|h| format!("{:X}", h.value())).collect();
CmdResult::Dispatch(format!("_UPDATEFIELDRUN {}", handles.join(","))) CmdResult::Dispatch(format!("_UPDATEFIELDRUN {}", handles.join(",")))
} }
+5 -4
View File
@@ -3419,13 +3419,14 @@ impl Scene {
/// Update the fields an evaluation event re-evaluates (see /// Update the fields an evaluation event re-evaluates (see
/// [`crate::entities::field::update_fields`]) and redraw the hosts whose /// [`crate::entities::field::update_fields`]) and redraw the hosts whose
/// text changed. Returns the number of fields the hosts hold. /// text changed. Returns the number of hosts whose text changed and the
pub fn update_fields(&mut self, event: i32, hosts: Option<&[Handle]>) -> usize { /// number of fields the hosts hold.
let changed = crate::entities::field::update_fields(&mut self.document, event, hosts).0; pub fn update_fields(&mut self, event: i32, hosts: Option<&[Handle]>) -> (usize, usize) {
let (changed, found) = crate::entities::field::update_fields(&mut self.document, event, hosts);
if !changed.is_empty() { if !changed.is_empty() {
self.bump_text_hosts(&changed); self.bump_text_hosts(&changed);
} }
changed.len() (changed.len(), found)
} }
/// Redraw text hosts whose stored text changed (re-evaluated fields). An /// Redraw text hosts whose stored text changed (re-evaluated fields). An