forked from StudioInfinity/dyna3
Rename observables to regulators
This commit is contained in:
parent
de7122d871
commit
24139ad5e9
4 changed files with 87 additions and 87 deletions
|
|
@ -6,8 +6,8 @@ use crate::{
|
|||
AppState,
|
||||
assembly::{
|
||||
Assembly,
|
||||
Observable,
|
||||
ObservableRole,
|
||||
Regulator,
|
||||
RegulatorRole,
|
||||
Element
|
||||
},
|
||||
engine::Q
|
||||
|
|
@ -210,8 +210,8 @@ pub fn AddRemove() -> View {
|
|||
}
|
||||
);
|
||||
let desired = create_signal(0.0);
|
||||
let role = create_signal(ObservableRole::Measurement);
|
||||
state.assembly.insert_observable(Observable {
|
||||
let role = create_signal(RegulatorRole::Measurement);
|
||||
state.assembly.insert_regulator(Regulator {
|
||||
subjects: subjects,
|
||||
measured: measured,
|
||||
desired: desired,
|
||||
|
|
@ -221,22 +221,22 @@ pub fn AddRemove() -> View {
|
|||
state.selection.update(|sel| sel.clear());
|
||||
|
||||
/* DEBUG */
|
||||
// print updated observable list
|
||||
console::log_1(&JsValue::from("Observables:"));
|
||||
state.assembly.observables.with(|obsls| {
|
||||
for (_, obs) in obsls.into_iter() {
|
||||
// print updated regulator list
|
||||
console::log_1(&JsValue::from("Regulators:"));
|
||||
state.assembly.regulators.with(|regs| {
|
||||
for (_, reg) in regs.into_iter() {
|
||||
console::log_5(
|
||||
&JsValue::from(" "),
|
||||
&JsValue::from(obs.subjects.0),
|
||||
&JsValue::from(obs.subjects.1),
|
||||
&JsValue::from(reg.subjects.0),
|
||||
&JsValue::from(reg.subjects.1),
|
||||
&JsValue::from(":"),
|
||||
&JsValue::from(obs.desired.get_untracked())
|
||||
&JsValue::from(reg.desired.get_untracked())
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
// update the realization when the observable becomes
|
||||
// constrained, or is edited while constrained
|
||||
// update the realization when the regulator becomes
|
||||
// a constraint, or is edited while acting as a constraint
|
||||
create_effect(move || {
|
||||
console::log_1(&JsValue::from(
|
||||
format!("Updated constraint with subjects ({}, {})", subjects.0, subjects.1)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue