Vectornaut/dyna3
1
0
Fork 0
forked from glen/dyna3
Code Pull requests Activity

Move set point spec validation into Regulator

Browse source
This commit is contained in:
Aaron Fenyes 2025-02-18 12:28:55 -08:00
parent 302d93638d
commit bbd0835a8f
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app-proto/src/assembly.rs
View file

@ -120,6 +120,19 @@ pub struct Regulator {
pub set_point_spec: Signal<String> pub set_point_spec: Signal<String>
} }
impl Regulator {
pub fn try_specify_set_point(&self, spec: String) -> bool {
match spec.parse::<f64>() {
Err(_) if !spec.is_empty() => false,
set_pt => {
self.set_point.set(set_pt.ok());
self.set_point_spec.set(spec);
true
}
}
}
}
// the velocity is expressed in uniform coordinates // the velocity is expressed in uniform coordinates
pub struct ElementMotion<'a> { pub struct ElementMotion<'a> {
pub key: ElementKey, pub key: ElementKey,

14
app-proto/src/outline.rs
View file

@ -50,17 +50,9 @@ fn RegulatorInput(regulator: Regulator) -> View {
}, },
placeholder=regulator.measurement.with(|result| result.to_string()), placeholder=regulator.measurement.with(|result| result.to_string()),
bind:value=value, bind:value=value,
on:change=move |_| { on:change=move |_| valid.set(
let value_val = value.get_clone_untracked(); regulator.try_specify_set_point(value.get_clone_untracked())
match value_val.parse::<f64>() { ),
Err(_) if !value_val.is_empty() => valid.set(false),
set_pt => batch(|| {
regulator.set_point.set(set_pt.ok());
regulator.set_point_spec.set(value_val);
valid.set(true);
})
};
},
on:keydown={ on:keydown={
move |event: KeyboardEvent| { move |event: KeyboardEvent| {
match event.key().as_str() { match event.key().as_str() {