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/modules/draw/modify/mledit.rs
+37 -104
View File
@@ -1,9 +1,9 @@
use codec::entities::MLine;
use codec::objects::MLineStyle;
use codec::{EntityType, Handle};
use glam::DVec3;
use kernel::geom2d::{Curve, Line};
use kernel::space::{PlanarCurve, Plane, Vec3 as KernelVec3};
use glam::DVec3;
use rustc_hash::FxHashMap as HashMap;
use crate::command::{CadCommand, CmdOption, CmdResult};
@@ -63,10 +63,7 @@ impl MlineEditCommand {
}
fn replace(handle: Handle, mline: MLine) -> CmdResult {
CmdResult::ReplaceMany(
vec![(handle, vec![EntityType::MLine(mline)])],
Vec::new(),
)
CmdResult::ReplaceMany(vec![(handle, vec![EntityType::MLine(mline)])], Vec::new())
}
fn edit_vertex(&self, tool: Tool, handle: Handle, point: DVec3) -> Option<CmdResult> {
@@ -85,8 +82,8 @@ impl MlineEditCommand {
let data = mline.vertices[segment].segments.get(element)?.clone();
let curve = segment_curve(start, end, normal)?;
let length = curve.length();
let split = curve.parameter_at(projected.to_array())?.clamp(0.0, 1.0)
* length;
let split =
curve.parameter_at(projected.to_array())?.clamp(0.0, 1.0) * length;
Some((data, length, split))
})
.collect();
@@ -95,11 +92,7 @@ impl MlineEditCommand {
}
let insert = segment + 1;
let mut vertex = mline.vertices[segment].clone();
vertex.position = codec::types::Vector3::new(
projected.x,
projected.y,
projected.z,
);
vertex.position = codec::types::Vector3::new(projected.x, projected.y, projected.z);
mline.vertices.insert(insert, vertex);
crate::entities::mline::rebuild_mline_geometry(&mut mline);
crate::modules::draw::draw::mline::sync_mline_element_parameters(
@@ -171,9 +164,7 @@ impl MlineEditCommand {
}
Tool::DeleteVertex => {
let vertex = closest_vertex(&mline, point)?;
if mline.vertices.len() <= 2
|| (mline.is_closed() && mline.vertices.len() <= 3)
{
if mline.vertices.len() <= 2 || (mline.is_closed() && mline.vertices.len() <= 3) {
return None;
}
let count = mline.vertices.len();
@@ -263,46 +254,25 @@ impl MlineEditCommand {
drawn.extend(
drawn_ranges(&second.parameters, second_length)
.into_iter()
.map(|range| {
(range.0 + first_length, range.1 + first_length)
}),
.map(|range| (range.0 + first_length, range.1 + first_length)),
);
let mut cuts = cut_ranges(&first.area_fill_parameters, first_length);
cuts.extend(
cut_ranges(&second.area_fill_parameters, second_length)
.into_iter()
.map(|range| {
(range.0 + first_length, range.1 + first_length)
}),
.map(|range| (range.0 + first_length, range.1 + first_length)),
);
let drawn = merge_ranges(remap_ranges(
&drawn,
0.0,
total,
target_length,
));
let cuts = merge_ranges(remap_ranges(
&cuts,
0.0,
total,
target_length,
));
let drawn = merge_ranges(remap_ranges(&drawn, 0.0, total, target_length));
let cuts = merge_ranges(remap_ranges(&cuts, 0.0, total, target_length));
let target = &mut mline.vertices[previous].segments[element];
store_drawn_ranges(&mut target.parameters, target_length, &drawn);
store_cut_ranges(
&mut target.area_fill_parameters,
target_length,
&cuts,
);
store_cut_ranges(&mut target.area_fill_parameters, target_length, &cuts);
}
}
}
_ => return None,
}
crate::modules::draw::draw::mline::sync_mline_element_parameters(
&mut mline,
&target.style,
);
crate::modules::draw::draw::mline::sync_mline_element_parameters(&mut mline, &target.style);
Some(Self::replace(handle, mline))
}
@@ -387,9 +357,7 @@ impl MlineEditCommand {
Tool::ClosedCross | Tool::OpenCross | Tool::MergedCross => {
on_segment(first_fraction) && on_segment(second_fraction)
}
Tool::ClosedTee | Tool::OpenTee | Tool::MergedTee => {
on_segment(second_fraction)
}
Tool::ClosedTee | Tool::OpenTee | Tool::MergedTee => on_segment(second_fraction),
Tool::CornerJoint => true,
_ => false,
};
@@ -402,22 +370,10 @@ impl MlineEditCommand {
match tool {
Tool::ClosedCross => {
gap_elements(
&mut first,
first_segment,
intersection,
first_gap,
None,
);
gap_elements(&mut first, first_segment, intersection, first_gap, None);
}
Tool::OpenCross => {
gap_elements(
&mut first,
first_segment,
intersection,
first_gap,
None,
);
gap_elements(&mut first, first_segment, intersection, first_gap, None);
gap_elements(
&mut second,
second_segment,
@@ -443,12 +399,7 @@ impl MlineEditCommand {
);
}
Tool::ClosedTee | Tool::OpenTee | Tool::MergedTee => {
move_closest_end(
&mut first,
&first_target.style,
first_end?,
intersection,
);
move_closest_end(&mut first, &first_target.style, first_end?, intersection);
let elements = match tool {
Tool::ClosedTee => None,
Tool::OpenTee => Some(outer_element_indices(&second_target.style)),
@@ -464,18 +415,8 @@ impl MlineEditCommand {
);
}
Tool::CornerJoint => {
move_closest_end(
&mut first,
&first_target.style,
first_end?,
intersection,
);
move_closest_end(
&mut second,
&second_target.style,
second_end?,
intersection,
);
move_closest_end(&mut first, &first_target.style, first_end?, intersection);
move_closest_end(&mut second, &second_target.style, second_end?, intersection);
}
_ => return None,
}
@@ -499,12 +440,11 @@ impl CadCommand for MlineEditCommand {
match self.mode {
Mode::Choose => crate::t!("MLEDIT Choose an edit tool:").into_owned(),
Mode::PickFirst(_) => crate::t!("MLEDIT Select first multiline:").into_owned(),
Mode::PickSecond { .. } => {
crate::t!("MLEDIT Select second multiline:").into_owned()
}
Mode::PickRangeEnd { tool: Tool::WeldAll, .. } => {
crate::t!("MLEDIT Specify the end of the weld range:").into_owned()
}
Mode::PickSecond { .. } => crate::t!("MLEDIT Select second multiline:").into_owned(),
Mode::PickRangeEnd {
tool: Tool::WeldAll,
..
} => crate::t!("MLEDIT Specify the end of the weld range:").into_owned(),
Mode::PickRangeEnd { .. } => {
crate::t!("MLEDIT Specify the second cut point:").into_owned()
}
@@ -733,8 +673,8 @@ fn restore_shifted_segment_data(
let Some(endpoints) = element_segment(mline, segment, element) else {
continue;
};
let Some(target_length) = segment_curve(endpoints.0, endpoints.1, normal)
.map(|curve| curve.length())
let Some(target_length) =
segment_curve(endpoints.0, endpoints.1, normal).map(|curve| curve.length())
else {
continue;
};
@@ -1032,12 +972,7 @@ fn gap_elements(
}
}
fn move_closest_end(
mline: &mut MLine,
style: &MLineStyle,
index: usize,
intersection: DVec3,
) {
fn move_closest_end(mline: &mut MLine, style: &MLineStyle, index: usize, intersection: DVec3) {
if mline.vertices.is_empty() || mline.is_closed() || index >= mline.vertices.len() {
return;
}
@@ -1055,13 +990,11 @@ fn move_closest_end(
} else {
(mline.vertices.len() > 2).then_some(last_index - 2)
};
let peripheral = peripheral_segment
.and_then(|segment| snapshot_segment_data(mline, segment, normal).map(|data| (segment, data)));
mline.vertices[index].position = codec::types::Vector3::new(
intersection.x,
intersection.y,
intersection.z,
);
let peripheral = peripheral_segment.and_then(|segment| {
snapshot_segment_data(mline, segment, normal).map(|data| (segment, data))
});
mline.vertices[index].position =
codec::types::Vector3::new(intersection.x, intersection.y, intersection.z);
crate::entities::mline::rebuild_mline_geometry(mline);
crate::modules::draw::draw::mline::sync_mline_element_parameters(mline, style);
restore_shifted_segment_data(mline, segment, normal, source, index == 0);
@@ -1083,7 +1016,11 @@ fn selected_terminal_end(mline: &MLine, segment: usize, pick: DVec3) -> Option<u
let last = &mline.vertices[last_vertex].position;
let first_distance = KernelVec3::new(first.x, first.y, first.z).distance_squared(pick);
let last_distance = KernelVec3::new(last.x, last.y, last.z).distance_squared(pick);
Some(if first_distance <= last_distance { 0 } else { last_vertex })
Some(if first_distance <= last_distance {
0
} else {
last_vertex
})
}
(true, false) => Some(0),
(false, true) => Some(last_vertex),
@@ -1100,11 +1037,7 @@ fn segment_intersection(
- kernel::space::Vec3::from(first.0.to_array()))
.normalize()?
.to_array();
let plane = kernel::space::Plane::orthonormal(
first.0.to_array(),
axis,
normal.to_array(),
)?;
let plane = kernel::space::Plane::orthonormal(first.0.to_array(), axis, normal.to_array())?;
let points = [
first.0.to_array(),
first.1.to_array(),