forked from StudioInfinity/dyna3
Rename observables to regulators
This commit is contained in:
Aaron Fenyes
parent
de7122d871
commit
24139ad5e9
4 changed files with 87 additions and 87 deletions
|
|
@ -12,33 +12,33 @@ use crate::{
|
|||
AppState,
|
||||
assembly,
|
||||
assembly::{
|
||||
Observable,
|
||||
ObservableKey,
|
||||
ObservableRole::*,
|
||||
Regulator,
|
||||
RegulatorKey,
|
||||
RegulatorRole::*,
|
||||
ElementKey
|
||||
}
|
||||
};
|
||||
|
||||
// an editable view of the Lorentz product representing an observable
|
||||
// an editable view of a regulator
|
||||
#[component(inline_props)]
|
||||
fn ObservableInput(observable: Observable) -> View {
|
||||
fn RegulatorInput(regulator: Regulator) -> View {
|
||||
view! {
|
||||
input(
|
||||
r#type="text",
|
||||
placeholder=observable.measured.with(|result| result.to_string()),
|
||||
bind:value=observable.desired_text,
|
||||
placeholder=regulator.measured.with(|result| result.to_string()),
|
||||
bind:value=regulator.desired_text,
|
||||
on:change=move |event: Event| {
|
||||
let target: HtmlInputElement = event.target().unwrap().unchecked_into();
|
||||
let value = target.value();
|
||||
if value.is_empty() {
|
||||
observable.role.set(Measurement);
|
||||
regulator.role.set(Measurement);
|
||||
} else {
|
||||
match target.value().parse::<f64>() {
|
||||
Ok(desired) => batch(|| {
|
||||
observable.desired.set(desired);
|
||||
observable.role.set(Constraint(true));
|
||||
regulator.desired.set(desired);
|
||||
regulator.role.set(Constraint(true));
|
||||
}),
|
||||
Err(_) => observable.role.set(Constraint(false))
|
||||
Err(_) => regulator.role.set(Constraint(false))
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -46,30 +46,30 @@ fn ObservableInput(observable: Observable) -> View {
|
|||
}
|
||||
}
|
||||
|
||||
// a list item that shows an observable in an outline view of an element
|
||||
// a list item that shows a regulator in an outline view of an element
|
||||
#[component(inline_props)]
|
||||
fn ObservableOutlineItem(observable_key: ObservableKey, element_key: ElementKey) -> View {
|
||||
fn RegulatorOutlineItem(regulator_key: RegulatorKey, element_key: ElementKey) -> View {
|
||||
let state = use_context::<AppState>();
|
||||
let assembly = &state.assembly;
|
||||
let observable = assembly.observables.with(|obsls| obsls[observable_key].clone());
|
||||
let other_subject = if observable.subjects.0 == element_key {
|
||||
observable.subjects.1
|
||||
let regulator = assembly.regulators.with(|regs| regs[regulator_key].clone());
|
||||
let other_subject = if regulator.subjects.0 == element_key {
|
||||
regulator.subjects.1
|
||||
} else {
|
||||
observable.subjects.0
|
||||
regulator.subjects.0
|
||||
};
|
||||
let other_subject_label = assembly.elements.with(|elts| elts[other_subject].label.clone());
|
||||
let class = observable.role.map(
|
||||
let class = regulator.role.map(
|
||||
|role| match role {
|
||||
Measurement => "observable",
|
||||
Constraint(true) => "observable valid-constraint",
|
||||
Constraint(false) => "observable invalid-constraint"
|
||||
Measurement => "regulator",
|
||||
Constraint(true) => "regulator valid-constraint",
|
||||
Constraint(false) => "regulator invalid-constraint"
|
||||
}
|
||||
);
|
||||
view! {
|
||||
li(class=class.get()) {
|
||||
div(class="observable-label") { (other_subject_label) }
|
||||
div(class="observable-type") { "Inversive distance" }
|
||||
ObservableInput(observable=observable)
|
||||
div(class="regulator-label") { (other_subject_label) }
|
||||
div(class="regulator-type") { "Inversive distance" }
|
||||
RegulatorInput(regulator=regulator)
|
||||
div(class="status")
|
||||
}
|
||||
}
|
||||
|
|
@ -93,9 +93,9 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View {
|
|||
).collect::<Vec<_>>()
|
||||
)
|
||||
};
|
||||
let observed = element.observables.map(|obsls| obsls.len() > 0);
|
||||
let observable_list = element.observables.map(
|
||||
|obsls| obsls.clone().into_iter().collect()
|
||||
let regulated = element.regulators.map(|regs| regs.len() > 0);
|
||||
let regulator_list = element.regulators.map(
|
||||
|regs| regs.clone().into_iter().collect()
|
||||
);
|
||||
let details_node = create_node_ref();
|
||||
view! {
|
||||
|
|
@ -110,7 +110,7 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View {
|
|||
state.select(key, event.shift_key());
|
||||
event.prevent_default();
|
||||
},
|
||||
"ArrowRight" if observed.get() => {
|
||||
"ArrowRight" if regulated.get() => {
|
||||
let _ = details_node
|
||||
.get()
|
||||
.unchecked_into::<web_sys::Element>()
|
||||
|
|
@ -157,16 +157,16 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View {
|
|||
div(class="status")
|
||||
}
|
||||
}
|
||||
ul(class="observables") {
|
||||
ul(class="regulators") {
|
||||
Keyed(
|
||||
list=observable_list,
|
||||
view=move |obs_key| view! {
|
||||
ObservableOutlineItem(
|
||||
observable_key=obs_key,
|
||||
list=regulator_list,
|
||||
view=move |reg_key| view! {
|
||||
RegulatorOutlineItem(
|
||||
regulator_key=reg_key,
|
||||
element_key=key
|
||||
)
|
||||
},
|
||||
key=|obs_key| obs_key.clone()
|
||||
key=|reg_key| reg_key.clone()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
@ -174,9 +174,9 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View {
|
|||
}
|
||||
}
|
||||
|
||||
// a component that lists the elements of the current assembly, showing the
|
||||
// observables associated with each element as a collapsible sub-list. its
|
||||
// implementation is based on Kate Morley's HTML + CSS tree views:
|
||||
// a component that lists the elements of the current assembly, showing each
|
||||
// element's regulators in a collapsible sub-list. its implementation is based
|
||||
// on Kate Morley's HTML + CSS tree views:
|
||||
//
|
||||
// https://iamkate.com/code/tree-views/
|
||||
//
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue