ui: Relax Nodes takes picked faces (#471)

Use selection puts the selected design faces in the form as faces, in
place of a sphere; Shift/Ctrl-click picks faces while the form is open,
and every click does once the form lists faces.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UhhZMBTviDQxZvwnyP89fo
This commit is contained in:
jyvikoandClaude Opus 5.5 authored and Irakli Kourtis committed 2026-10-16 09:21:21 -04:00
1 parent 3ee622f62a
commit 7d269c58f9
5 files changed
+77 -7

No files matched your search

+27 -1
View File
@@ -855,6 +855,9 @@ pub enum Target {
/// The selected faces as an extrusion's `source` while it has none, then as its
/// `to_surface`: pick the source face, then the target surface.
ExtrudeFaces,
/// The selected geometry faces as `faces: [{body, face}]`, in place of a sphere or labels
/// (the faces Relax Nodes relaxes).
Faces,
}
/// Where command `id`'s form takes the selection, if it does. `params` (the form's current
@@ -867,6 +870,7 @@ pub fn target(id: &str, params: &Value) -> Option<Target> {
"geometry.datum.point" | "geometry.datum.point.edit" => Some(Target::DatumPoint),
"mesh.cells" => Some(Target::Bodies),
"mesh.hex.extrude" => Some(Target::ExtrudeFaces),
"mesh.node.relax" => Some(Target::Faces),
"model.boundary_condition.create" | "model.boundary_condition.edit" => Some(Target::TargetSet),
"model.section.create" | "model.section.edit" | "model.coupling.create" | "model.coupling.edit" | "interaction.rigid_wall" => {
Some(Target::Set)
@@ -929,6 +933,28 @@ pub fn with_edges(params: &Value, selection: &Selection) -> Option<Value> {
Some(Value::Object(out))
}
/// `params` with the selection's geometry faces as `faces`, and no sphere, nodes or elements
/// (what Relax Nodes relaxes); `None` when no face is selected.
pub fn with_faces(params: &Value, selection: &Selection) -> Option<Value> {
let faces: Vec<Value> = selection
.items()
.iter()
.filter_map(|i| match i {
Item::Geometry(g) if matches!(g.entity, Entity::Face(_)) => Some(json!(g)),
_ => None,
})
.collect();
if faces.is_empty() {
return None;
}
let mut out = params.as_object().cloned().unwrap_or_default();
for key in ["center", "radius", "around_element", "nodes", "elements"] {
out.remove(key);
}
out.insert("faces".into(), Value::Array(faces));
Some(Value::Object(out))
}
/// The key of an extrusion's form the selected faces go into: `source` while it names no face
/// (and no `source_set`), then `to_surface`.
pub fn extrude_key(params: &Value) -> &'static str {
@@ -969,7 +995,7 @@ pub fn with_set(params: &Value, target: Target, set: &str) -> Value {
Target::Set => {
out.insert("set".into(), json!(set));
}
Target::Members | Target::Edges | Target::Position | Target::DatumPoint | Target::Bodies | Target::ExtrudeFaces => {}
Target::Members | Target::Edges | Target::Position | Target::DatumPoint | Target::Bodies | Target::ExtrudeFaces | Target::Faces => {}
}
Value::Object(out)
}