1b-agent/OneCAD-Draft
1
0 Fork 0
forked from 1b-agent/opencadstudio-upstream
Code Pull Requests Activity

style: apply cargo fmt across workspace

Browse Source
This commit is contained in:
Karim Jerbi committed 2026-10-11 03:14:29 +01:00
1 parent 85710e5454
commit 9cf9ff2c5c
531 files changed
+57740 -33906
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/app/commands/dim.rs
+98 -95
View File
@@ -30,7 +30,7 @@ fn solid_edge_sources(
entity,
codec::EntityType::Solid3D(_) | codec::EntityType::Surface(_)
)
.then_some(entity.common().handle)
.then_some(entity.common().handle)
})
.collect::<Vec<_>>();
app.tabs[tab].scene.restore_solid_models(&handles);
@@ -199,8 +199,9 @@ impl OpenCADStudio {
_ => None,
};
if text_align.is_none() && mtext_ap.is_none() {
self.command_line
.push_error(crate::t!("JUSTIFYTEXT: unknown justification option.").as_ref());
self.command_line.push_error(
crate::t!("JUSTIFYTEXT: unknown justification option.").as_ref(),
);
return Some(Task::none());
}
self.push_undo_snapshot(i, "JUSTIFYTEXT");
@@ -358,10 +359,7 @@ impl OpenCADStudio {
.selected_entities()
.iter()
.filter(|(_, e)| {
matches!(
e,
codec::EntityType::Text(_) | codec::EntityType::MText(_)
)
matches!(e, codec::EntityType::Text(_) | codec::EntityType::MText(_))
})
.map(|(h, _)| *h)
.filter(|handle| !self.tabs[i].scene.is_layer_locked(*handle))
@@ -421,8 +419,7 @@ impl OpenCADStudio {
"TEXTFIT" => {
use crate::command::SelectThenValueCommand;
let has_sel = !self.tabs[i].scene.selected_entities().is_empty();
let c =
SelectThenValueCommand::new("TEXTFIT", "TEXTFIT target width:", has_sel);
let c = SelectThenValueCommand::new("TEXTFIT", "TEXTFIT target width:", has_sel);
self.command_line.push_info(&c.prompt());
self.tabs[i].active_cmd = Some(Box::new(c));
}
@@ -485,9 +482,9 @@ impl OpenCADStudio {
.map(|handle| (handle, crate::scene::ChangeKind::Modified))
.collect();
self.tabs[i].scene.bump_entities(&changes);
self.command_line.push_output(crate::tf!(
"TEXTFIT: fitted {n} text object(s) to width {target}."
).as_ref());
self.command_line.push_output(
crate::tf!("TEXTFIT: fitted {n} text object(s) to width {target}.").as_ref(),
);
}
// (text sequential numbering)
@@ -505,20 +502,11 @@ impl OpenCADStudio {
cmd if cmd.starts_with("TCOUNT ") => {
let mut args = cmd.split_whitespace().skip(1);
let start: i64 = args
.next()
.and_then(|s| s.parse().ok())
.unwrap_or(1);
let start: i64 = args.next().and_then(|s| s.parse().ok()).unwrap_or(1);
let increment: i64 = args
.next()
.and_then(|s| s.parse().ok())
.unwrap_or(1);
let increment: i64 = args.next().and_then(|s| s.parse().ok()).unwrap_or(1);
let placement = args
.next()
.unwrap_or("O")
.to_uppercase();
let placement = args.next().unwrap_or("O").to_uppercase();
let placement = match placement.as_str() {
"O" | "OVERWRITE" => "O",
@@ -538,9 +526,7 @@ impl OpenCADStudio {
.selected_entities()
.iter()
.filter_map(|(h, e)| match e {
codec::EntityType::Text(t)
if !self.tabs[i].scene.is_layer_locked(*h) =>
{
codec::EntityType::Text(t) if !self.tabs[i].scene.is_layer_locked(*h) => {
Some((*h, t.insertion_point.x, t.insertion_point.y))
}
_ => None,
@@ -558,10 +544,7 @@ impl OpenCADStudio {
texts.sort_by(|a, b| {
b.2.partial_cmp(&a.2)
.unwrap_or(std::cmp::Ordering::Equal)
.then(
a.1.partial_cmp(&b.1)
.unwrap_or(std::cmp::Ordering::Equal),
)
.then(a.1.partial_cmp(&b.1).unwrap_or(std::cmp::Ordering::Equal))
});
self.push_undo_snapshot(i, "TCOUNT");
@@ -589,9 +572,7 @@ impl OpenCADStudio {
let changes: Vec<_> = texts
.iter()
.map(|(handle, _, _)| {
(*handle, crate::scene::ChangeKind::Modified)
})
.map(|(handle, _, _)| (*handle, crate::scene::ChangeKind::Modified))
.collect();
self.tabs[i].scene.bump_entities(&changes);
@@ -618,21 +599,22 @@ impl OpenCADStudio {
.header
.current_mleader_style_name
.clone();
let style = self.tabs[i]
.scene
.document
.objects
.iter()
.find_map(|(handle, object)| match object {
codec::objects::ObjectType::MultiLeaderStyle(style)
if style.name.eq_ignore_ascii_case(&name) =>
{
let mut style = style.clone();
style.handle = *handle;
Some(style)
}
_ => None,
});
let style =
self.tabs[i]
.scene
.document
.objects
.iter()
.find_map(|(handle, object)| match object {
codec::objects::ObjectType::MultiLeaderStyle(style)
if style.name.eq_ignore_ascii_case(&name) =>
{
let mut style = style.clone();
style.handle = *handle;
Some(style)
}
_ => None,
});
let multiplier = self.tabs[i].scene.creation_annotation_multiplier();
let block_sources = self.tabs[i]
.scene
@@ -656,9 +638,11 @@ impl OpenCADStudio {
.iter()
.map(|style| (style.name.clone(), style.handle))
.collect();
let new_cmd = style.map_or_else(MLeaderCommand::new, |style| {
MLeaderCommand::with_style(style, multiplier)
}).with_drawing_resources(block_sources, layers, text_styles);
let new_cmd = style
.map_or_else(MLeaderCommand::new, |style| {
MLeaderCommand::with_style(style, multiplier)
})
.with_drawing_resources(block_sources, layers, text_styles);
self.command_line.push_info(&new_cmd.prompt());
self.tabs[i].active_cmd = Some(Box::new(new_cmd));
}
@@ -686,10 +670,7 @@ impl OpenCADStudio {
.filter(|handle| scene.entity_belongs_to_active_space(*handle))
.and_then(|handle| scene.document.get_entity(handle))
.cloned();
let cmd = DimContinueCommand::new(
recent,
self.dimension_continue_mode == 1,
);
let cmd = DimContinueCommand::new(recent, self.dimension_continue_mode == 1);
self.command_line.push_info(&cmd.prompt());
self.tabs[i].active_cmd = Some(Box::new(cmd));
}
@@ -754,11 +735,8 @@ impl OpenCADStudio {
surface_area: None,
})
.collect();
let cmd = QdimCommand::new(
selection,
dim_spacing,
self.quick_dimension_snap_priority,
);
let cmd =
QdimCommand::new(selection, dim_spacing, self.quick_dimension_snap_priority);
self.command_line.push_info(&cmd.prompt());
self.tabs[i].active_cmd = Some(Box::new(cmd));
}
@@ -829,13 +807,15 @@ impl OpenCADStudio {
"ZOOM EXTENTS ALL" | "ZOOM EXTENTS ALL VIEWPORTS" | "ZOOM EA" | "ZEA" => {
self.tabs[i].scene.remember_current_view();
self.tabs[i].scene.fit_all_model_viewports();
self.command_line.push_output(crate::t!("Zoom Extents — All Viewports").as_ref());
self.command_line
.push_output(crate::t!("Zoom Extents — All Viewports").as_ref());
}
"ZOOM EXTENTS" | "ZOOM E" | "ZOOMEXTENTS" | "ZE" => {
self.tabs[i].scene.remember_current_view();
self.tabs[i].scene.fit_all();
self.command_line.push_output(crate::t!("Zoom Extents").as_ref());
self.command_line
.push_output(crate::t!("Zoom Extents").as_ref());
}
"ZOOM IN" | "ZOOM I" | "ZI" => {
@@ -847,19 +827,22 @@ impl OpenCADStudio {
"ZOOM OUT" | "ZO" => {
self.tabs[i].scene.remember_current_view();
self.tabs[i].scene.zoom_camera(1.5);
self.command_line.push_output(crate::t!("Zoom Out").as_ref());
self.command_line
.push_output(crate::t!("Zoom Out").as_ref());
}
// ZOOM ALL — fit the configured drawing limits.
"ZOOM ALL" | "ZOOM A" | "ZA" => {
self.tabs[i].scene.remember_current_view();
self.tabs[i].scene.fit_all_with_limits();
self.command_line.push_output(crate::t!("Zoom All").as_ref());
self.command_line
.push_output(crate::t!("Zoom All").as_ref());
}
"ZOOM PREVIOUS" | "ZOOM P" | "ZP" => {
if self.tabs[i].scene.restore_previous_view() {
self.command_line.push_output(crate::t!("Zoom Previous").as_ref());
self.command_line
.push_output(crate::t!("Zoom Previous").as_ref());
} else {
self.command_line
.push_error(crate::t!("ZOOM: no previous view.").as_ref());
@@ -881,7 +864,8 @@ impl OpenCADStudio {
} else {
self.tabs[i].scene.remember_current_view();
if self.tabs[i].scene.zoom_to_entities(&handles) {
self.command_line.push_output(crate::t!("Zoom Object").as_ref());
self.command_line
.push_output(crate::t!("Zoom Object").as_ref());
} else {
self.command_line.push_error(
crate::t!("ZOOM: selected objects have no visible bounds.").as_ref(),
@@ -986,7 +970,11 @@ impl OpenCADStudio {
};
(!handles.is_empty()
&& handles.iter().all(|h| {
self.tabs[i].scene.wire_models_for(&[*h]).iter().any(touches)
self.tabs[i]
.scene
.wire_models_for(&[*h])
.iter()
.any(touches)
}))
.then(|| {
(
@@ -1257,25 +1245,30 @@ impl OpenCADStudio {
} else {
// EXPLMODE 0 keeps references that are not uniformly and
// positively scaled whole.
let selected: Vec<_> = if super::blockvars::explmode(&self.tabs[i].scene.document) == 0 {
selected
.into_iter()
.filter(|(_, entity)| match entity {
codec::EntityType::Insert(ins) => {
let (x, y, z) = (ins.x_scale(), ins.y_scale(), ins.z_scale());
let uniform = x > 0.0 && (x - y).abs() <= 1e-10 && (x - z).abs() <= 1e-10;
if !uniform {
self.command_line
.push_output("The object is not uniformly and positively scaled.");
let selected: Vec<_> =
if super::blockvars::explmode(&self.tabs[i].scene.document) == 0 {
selected
.into_iter()
.filter(|(_, entity)| match entity {
codec::EntityType::Insert(ins) => {
let (x, y, z) =
(ins.x_scale(), ins.y_scale(), ins.z_scale());
let uniform = x > 0.0
&& (x - y).abs() <= 1e-10
&& (x - z).abs() <= 1e-10;
if !uniform {
self.command_line.push_output(
"The object is not uniformly and positively scaled.",
);
}
uniform
}
uniform
}
_ => true,
})
.collect()
} else {
selected
};
_ => true,
})
.collect()
} else {
selected
};
let replacements = plan_explode(&selected, &self.tabs[i].scene.document);
let exploded = replacements.len();
if exploded > 0 {
@@ -1288,8 +1281,9 @@ impl OpenCADStudio {
self.command_line
.push_output(crate::tf!("{exploded} object(s) exploded.").as_ref());
} else {
self.command_line
.push_info(crate::t!("EXPLODE: no explodable objects selected.").as_ref());
self.command_line.push_info(
crate::t!("EXPLODE: no explodable objects selected.").as_ref(),
);
}
}
}
@@ -1350,8 +1344,7 @@ impl OpenCADStudio {
})
.collect();
let all_entities: Vec<_> = entities.into_iter().map(|(_, e)| e).collect();
let new_cmd =
TrimCommand::with_cutting_edges(all_entities, initial_edges);
let new_cmd = TrimCommand::with_cutting_edges(all_entities, initial_edges);
self.command_line.push_info(&new_cmd.prompt());
self.tabs[i].active_cmd = Some(Box::new(new_cmd));
}
@@ -1364,7 +1357,12 @@ impl OpenCADStudio {
.iter()
.filter_map(|w| {
let h = Scene::handle_from_wire_name(&w.name)?;
self.tabs[i].scene.document.get_entity(h).cloned().map(|e| (h, e))
self.tabs[i]
.scene
.document
.get_entity(h)
.cloned()
.map(|e| (h, e))
})
.collect();
let new_cmd = ExtrimCommand::new(all);
@@ -1413,7 +1411,10 @@ impl OpenCADStudio {
let text = cmd.strip_prefix("ARCTEXT").unwrap_or("").trim().to_string();
if text.is_empty() {
self.command_line.push_info(
crate::t!("Usage: ARCTEXT <text> (select an arc first; the text follows it)").as_ref(),
crate::t!(
"Usage: ARCTEXT <text> (select an arc first; the text follows it)"
)
.as_ref(),
);
return None;
}
@@ -1433,7 +1434,8 @@ impl OpenCADStudio {
};
let chars: Vec<char> = text.chars().filter(|c| !c.is_control()).collect();
if chars.is_empty() {
self.command_line.push_error(crate::t!("ARCTEXT: no printable text.").as_ref());
self.command_line
.push_error(crate::t!("ARCTEXT: no printable text.").as_ref());
return None;
}
let n = chars.len();
@@ -1456,8 +1458,9 @@ impl OpenCADStudio {
self.tabs[i].scene.add_entity(codec::EntityType::Text(t));
}
self.tabs[i].dirty = true;
self.command_line
.push_output(crate::tf!("ARCTEXT: placed {n} character(s) along the arc.").as_ref());
self.command_line.push_output(
crate::tf!("ARCTEXT: placed {n} character(s) along the arc.").as_ref(),
);
}
_ => return None,