Count: Current area counts all of model space; Properties cleared after the pick

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ramox81andClaude Opus 5.5 committed 2026-10-05 12:54:22 +03:00
1 parent 0a26709d13
commit 789687659b
2 files changed
+7 -21

No files matched your search

+7 -19
View File
@@ -278,7 +278,6 @@ impl OpenCADStudio {
pub(in crate::app) fn close_count(&mut self, i: usize) { pub(in crate::app) fn close_count(&mut self, i: usize) {
if let Some(mode) = self.tabs[i].count.take() { if let Some(mode) = self.tabs[i].count.take() {
self.drop_count_boundary(i, mode.boundary); self.drop_count_boundary(i, mode.boundary);
self.drop_count_boundary(i, mode.remembered.and_then(|(_, b)| b));
} }
self.tabs[i].scene.set_count_display(None); self.tabs[i].scene.set_count_display(None);
} }
@@ -311,13 +310,9 @@ impl OpenCADStudio {
let mode = self.tabs[i].count.as_ref(); let mode = self.tabs[i].count.as_ref();
Some((mode.and_then(|m| m.area.clone()), mode.and_then(|m| m.boundary))) Some((mode.and_then(|m| m.area.clone()), mode.and_then(|m| m.boundary)))
} }
// Current area: the count area in use (also one Entire model space // Current area counts all of model space (the view and an area
// set aside), else all of model space. // in use take no part).
"C" => Some(match self.tabs[i].count.as_ref() { "C" => Some((None, None)),
Some(m) if m.area.is_some() => (m.area.clone(), m.boundary),
Some(m) => m.remembered.clone().map_or((None, None), |(a, b)| (Some(a), b)),
None => (None, None),
}),
"R" => { "R" => {
let p = points(); let p = points();
let (a, b) = (p.first()?, p.get(1)?); let (a, b) = (p.first()?, p.get(1)?);
@@ -408,18 +403,11 @@ impl OpenCADStudio {
}; };
// The picked targets do not stay selected. // The picked targets do not stay selected.
self.tabs[i].scene.deselect_all(); self.tabs[i].scene.deselect_all();
// Entire model space counts without the area but keeps it for a later self.refresh_properties();
// Current area; a new area replaces it. if let Some(old) = self.tabs[i].count.take().filter(|o| o.boundary != boundary) {
let mut remembered = None; self.drop_count_boundary(i, old.boundary);
if let Some(old) = self.tabs[i].count.take() {
let old_area = old.area.map(|a| (a, old.boundary)).or(old.remembered);
if area.is_none() {
remembered = old_area;
} else if let Some((_, b)) = old_area.filter(|(_, b)| *b != boundary) {
self.drop_count_boundary(i, b);
}
} }
let mode = CountMode { area, boundary, target, remembered, ..CountMode::default() }; let mode = CountMode { area, boundary, target, ..CountMode::default() };
if let Some(name) = mode.target_name() { if let Some(name) = mode.target_name() {
let n = mode.count(&self.tabs[i].scene.document); let n = mode.count(&self.tabs[i].scene.document);
self.command_line.push_output(&format!("{name} ...... {n}")); self.command_line.push_output(&format!("{name} ...... {n}"));
-2
View File
@@ -51,8 +51,6 @@ pub struct CountMode {
pub cursor: Option<usize>, pub cursor: Option<usize>,
/// The scene geometry epoch the colouring was computed at. /// The scene geometry epoch the colouring was computed at.
pub epoch: u64, pub epoch: u64,
/// The area Entire model space set aside, for a later Current area.
pub remembered: Option<(Vec<[f64; 2]>, Option<(Handle, bool)>)>,
/// The result and count at `epoch` (recomputed when the drawing changes). /// The result and count at `epoch` (recomputed when the drawing changes).
pub cache: Option<(CountResult, usize)>, pub cache: Option<(CountResult, usize)>,
} }