forked from 1b-agent/opencadstudio-upstream
Phase 6: Auto-fit viewport and annotation scale hints
- Add model_space_extents() to Scene: collects key_vertices from all model-space entities to compute an AABB. - Add auto_fit_viewport() to Scene: sets view_target to model centroid and derives custom_scale / view_height so the content fits the new viewport with a 10% margin. - Call auto_fit_viewport() in commit_entity() after a viewport is added to a paper-space layout, so newly placed viewports immediately show model-space content at a sensible scale. - Scale line_weight_px by the viewport scale factor when projecting model-space wires into paper space, so dimension arrows and annotation lines appear at the correct visual thickness. Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
This commit is contained in:
1 parent
403264d3ab
commit
ace83a0953
2 files changed
+67
-1
No files matched your search
@@ -220,7 +220,10 @@ impl H7CAD {
|
||||
.document
|
||||
.add_entity_to_layout(entity, &layout)
|
||||
{
|
||||
Ok(_) => {}
|
||||
Ok(new_handle) => {
|
||||
// Auto-fit the new viewport to show model-space content.
|
||||
self.tabs[i].scene.auto_fit_viewport(new_handle);
|
||||
}
|
||||
Err(e) => self
|
||||
.command_line
|
||||
.push_error(&format!("Viewport could not be added: {e}")),
|
||||
|
||||
@@ -376,6 +376,66 @@ impl Scene {
|
||||
.unwrap_or(Handle::NULL)
|
||||
}
|
||||
|
||||
/// Compute the axis-aligned bounding box of all model-space entities by
|
||||
/// collecting their `key_vertices`. Returns `None` when there are no
|
||||
/// vertices (empty drawing).
|
||||
fn model_space_extents(&self) -> Option<(glam::Vec3, glam::Vec3)> {
|
||||
let model_block = self.model_space_block_handle();
|
||||
if model_block.is_null() {
|
||||
return None;
|
||||
}
|
||||
let mut min = glam::Vec3::splat(f32::INFINITY);
|
||||
let mut max = glam::Vec3::splat(f32::NEG_INFINITY);
|
||||
let mut any = false;
|
||||
for entity in self.document.entities() {
|
||||
let c = entity.common();
|
||||
if c.owner_handle != model_block || c.invisible {
|
||||
continue;
|
||||
}
|
||||
for wire in self.tessellate_one(entity) {
|
||||
for &[x, y, z] in &wire.key_vertices {
|
||||
if x.is_finite() && y.is_finite() && z.is_finite() {
|
||||
min = min.min(glam::Vec3::new(x, y, z));
|
||||
max = max.max(glam::Vec3::new(x, y, z));
|
||||
any = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if any { Some((min, max)) } else { None }
|
||||
}
|
||||
|
||||
/// Set a newly created viewport's `view_target` and `view_height` so that
|
||||
/// all model-space content is visible at a reasonable scale.
|
||||
pub fn auto_fit_viewport(&mut self, vp_handle: Handle) {
|
||||
let extents = self.model_space_extents();
|
||||
let (min, max) = match extents {
|
||||
Some(e) => e,
|
||||
None => return,
|
||||
};
|
||||
let center = (min + max) * 0.5;
|
||||
let content_w = (max.x - min.x).max(1e-3);
|
||||
let content_h = (max.y - min.y).max(1e-3);
|
||||
|
||||
let vp = match self.document.get_entity_mut(vp_handle) {
|
||||
Some(acadrust::EntityType::Viewport(vp)) => vp,
|
||||
_ => return,
|
||||
};
|
||||
// Set the view target to the model-space centroid (XY plane, z=0).
|
||||
vp.view_target.x = center.x as f64;
|
||||
vp.view_target.y = center.y as f64;
|
||||
vp.view_target.z = 0.0;
|
||||
|
||||
// Choose the scale that fits both dimensions with a small margin.
|
||||
let margin = 1.1_f64;
|
||||
let scale_w = vp.width / (content_w as f64 * margin);
|
||||
let scale_h = vp.height / (content_h as f64 * margin);
|
||||
let fit_scale = scale_w.min(scale_h).min(1000.0).max(1e-6);
|
||||
|
||||
vp.custom_scale = fit_scale;
|
||||
vp.view_height = vp.height / fit_scale;
|
||||
}
|
||||
|
||||
fn viewport_content_wires(&self, paper_block: Handle) -> Vec<WireModel> {
|
||||
use acadrust::entities::Viewport;
|
||||
use std::collections::HashSet as HSet;
|
||||
@@ -500,6 +560,9 @@ impl Scene {
|
||||
let mut projected = wire.clone();
|
||||
projected.points = pts;
|
||||
projected.color = [r * 0.80, g * 0.80, b * 0.80, a * 0.85];
|
||||
// Scale line weight proportionally so annotation lines (dimensions,
|
||||
// text outlines) appear at the correct visual thickness in paper space.
|
||||
projected.line_weight_px = wire.line_weight_px * scale;
|
||||
result.push(projected);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user