Count: group count, list with an area, field dialog automation

This commit is contained in:
ramox81 committed 2026-10-05 09:10:12 +03:00
1 parent f76b6cb3bb
commit 547b89b5e7
3 files changed
+20 -6

No files matched your search

+7 -4
View File
@@ -183,7 +183,7 @@ impl OpenCADStudio {
.count
.as_ref()
.filter(|m| m.target.is_some())
.map(|m| m.result(&self.tabs[i].scene.document).counted.len())
.map(|m| m.count(&self.tabs[i].scene.document))
.unwrap_or(0),
),
"COUNTPALETTESTATE" => Some(self.count_palette.show as usize),
@@ -374,9 +374,12 @@ impl OpenCADStudio {
.collect(),
_ => Vec::new(),
};
if targets.is_empty() && matches!(area_tokens.first(), Some(&"C") | Some(&"E") | None) {
// List all blocks: the palette, counting in the area when one was drawn.
if targets.is_empty() {
self.set_count_palette(true);
return;
if matches!(area_tokens.first(), Some(&"C") | Some(&"E") | None) {
return;
}
}
let Some((area, boundary)) = self.resolve_count_area(i, area_tokens) else {
return;
@@ -403,7 +406,7 @@ impl OpenCADStudio {
}
let mode = CountMode { area, boundary, target, cursor: None, epoch: 0 };
if let Some(name) = mode.target_name() {
let n = mode.result(&self.tabs[i].scene.document).counted.len();
let n = mode.count(&self.tabs[i].scene.document);
self.command_line.push_output(&format!("{name} ...... {n}"));
}
self.tabs[i].count = Some(mode);
+2
View File
@@ -1088,6 +1088,8 @@ impl OpenCADStudio {
"link_text" => F::HyperlinkText(v.into()),
"link_url" => F::HyperlinkUrl(v.into()),
"plot_scale" => F::PlotScale(index(codec::fields::PLOT_SCALE_FORMATS.len())?),
"count" => F::CountExpression(v.into()),
"show_instances" => F::ShowCountInstances,
_ => return Err(failure("invalid_value", "Unknown field dialog key")),
})
}