ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to have stable sorting for end cap artifacts (#6589)

Browse Source 
* Fix to have stable sorting for end cap artifacts

* Update output
This commit is contained in:
Jonathan Tran
2025-04-30 00:34:35 -04:00
committed by GitHub
parent 644c561815
commit 14ce66bcc1
52 changed files with 3074 additions and 3065 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rust/kcl-lib/src/execution/artifact.rs
View File

@ -265,7 +265,7 @@ pub struct Wall {
/// This is for the sketch-on-face plane, not for the wall itself. Traverse
/// to the extrude and/or segment to get the wall's code_ref.
pub face_code_ref: CodeRef,
/// The command ID that got the data for this wall.
/// The command ID that got the data for this wall. Used for stable sorting.
pub cmd_id: uuid::Uuid,
}
@ -283,6 +283,8 @@ pub struct Cap {
/// This is for the sketch-on-face plane, not for the cap itself. Traverse
/// to the extrude and/or segment to get the cap's code_ref.
pub face_code_ref: CodeRef,
/// The command ID that got the data for this cap. Used for stable sorting.
pub cmd_id: uuid::Uuid,
}
#[derive(Debug, Clone, Copy, Serialize, PartialEq, Ord, PartialOrd, Eq, ts_rs::TS)]
@ -490,6 +492,9 @@ impl PartialOrd for Artifact {
if a.sub_type != b.sub_type {
return Some(a.sub_type.cmp(&b.sub_type));
}
if a.cmd_id != b.cmd_id {
return Some(a.cmd_id.cmp(&b.cmd_id));
}
if a.sweep_id != b.sweep_id {
return Some(a.sweep_id.cmp(&b.sweep_id));
}
@ -874,6 +879,7 @@ fn artifacts_to_update(
sweep_id: cap.sweep_id,
path_ids: cap.path_ids.clone(),
face_code_ref: cap.face_code_ref.clone(),
cmd_id: artifact_command.cmd_id,
})]);
}
Some(_) | None => {
@ -935,6 +941,7 @@ fn artifacts_to_update(
sweep_id: cap.sweep_id,
path_ids: vec![id],
face_code_ref: cap.face_code_ref.clone(),
cmd_id: artifact_command.cmd_id,
}));
}
return Ok(return_arr);
@ -1141,6 +1148,7 @@ fn artifacts_to_update(
range: sketch_on_face_source_range,
path_to_node: Vec::new(),
},
cmd_id: artifact_command.cmd_id,
}));
let Some(Artifact::Sweep(sweep)) = artifacts.get(&path_sweep_id) else {
continue;