Show the displacement of a single shape move

This commit is contained in:
Jan Petykiewicz 2026-11-18 23:01:57 -08:00
commit 4789638e22

View file

@ -169,6 +169,10 @@ struct ShapeCounts {
}
impl ShapeCounts {
fn total(&self) -> usize {
self.rectangles + self.polygons + self.boxes
}
fn add(&mut self, object: &ObjectChange, replacement: Option<&ObjectChange>) {
let is_rectangle =
|object: &ObjectChange| XY::closed_rectangle(object_xy(object)).is_some();
@ -188,6 +192,7 @@ struct LayerPolygonChanges {
moved: ShapeCounts,
removed: ShapeCounts,
added: ShapeCounts,
displacement: Option<[i64; 2]>,
}
#[derive(Default)]
@ -196,15 +201,18 @@ pub(super) struct PolygonChanges(BTreeMap<Option<Layer>, LayerPolygonChanges>);
impl PolygonChanges {
pub fn replacement(&mut self, old: &ObjectChange, new: &ObjectChange) {
let counts = self.0.entry(old.layer).or_default();
let moved = old.properties == new.properties
&& translation(object_xy(old), object_xy(new)).is_some()
&& field_changes(old, new).all(|(tag, _, _)| tag == RTAG_XY);
let shapes = if moved {
&mut counts.moved
let displacement = if old.properties == new.properties {
translation(object_xy(old), object_xy(new))
.filter(|_| field_changes(old, new).all(|(tag, _, _)| tag == RTAG_XY))
} else {
&mut counts.changed
None
};
shapes.add(old, Some(new));
if let Some(shift) = displacement {
counts.displacement = Some(shift);
counts.moved.add(old, Some(new));
} else {
counts.changed.add(old, Some(new));
}
}
pub fn unmatched(&mut self, object: &ObjectChange, removed: bool) {
@ -226,13 +234,31 @@ impl PolygonChanges {
} else {
out.push_str("unknown layer: ");
}
let mut separator = "";
for (action, shapes) in [
let groups = [
("changed", &counts.changed),
("moved", &counts.moved),
("removed", &counts.removed),
("added", &counts.added),
] {
];
if let Some([dx, dy]) = counts.displacement
&& groups
.iter()
.map(|(_, shapes)| shapes.total())
.sum::<usize>()
== 1
{
let shape = if counts.moved.rectangles == 1 {
"rectangle"
} else if counts.moved.boxes == 1 {
"box"
} else {
"polygon"
};
writeln!(out, "{shape} moved by ({dx}, {dy}) dbu").unwrap();
continue;
}
let mut separator = "";
for (action, shapes) in groups {
let terms = [
(shapes.rectangles, "rectangle", "rectangles"),
(shapes.polygons, "polygon", "polygons"),