glen/dyna3
1
0
Fork 0
Code Issues 11 Pull Requests 1 Actions Projects Releases 2 Wiki Activity

WIP: Clean up the outline view #16

Closed
Vectornaut wants to merge 29 commits from outline-cleanup into main
pull from: outline-cleanup
merge into: glen:main
Conversation 2 Commits 29 Files Changed 13 +49 -13
5 changed files with 49 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e0880d2ad2 - Show all commits

1
app-proto/Cargo.toml
View File

@ -26,6 +26,7 @@ console_error_panic_hook = { version = "0.1.7", optional = true }
version = "0.3.69"
features = [
'HtmlCanvasElement',
'HtmlInputElement',
'Performance',
'WebGl2RenderingContext',
'WebGlBuffer',

11
app-proto/main.css
View File

@ -93,7 +93,7 @@ details[open]:has(li) .elt-switch::after {
display: flex;
}
.elt-rep > div, .cst-rep {
.elt-rep > div {
padding: 2px 0px 0px 0px;
font-size: 10pt;
text-align: center;
@ -104,10 +104,17 @@ details[open]:has(li) .elt-switch::after {
font-style: italic;
}
.cst > input {
.cst > input[type=checkbox] {
margin: 0px 8px 0px 0px;
}
.cst > input[type=number] {
color: #fcfcfc;
background-color: inherit;
border: 1px solid #555;
border-radius: 2px;
}
/* display */
canvas {

17
app-proto/src/add_remove.rs
View File

@ -214,11 +214,14 @@ pub fn AddRemove() -> View {
(arg_vec[0].clone(), arg_vec[1].clone())
}
);
let rep = create_signal(0.0);
let active = create_signal(true);
state.assembly.insert_constraint(Constraint {
args: args,
rep: 0.0,
active: active
rep: rep,
rep_text: create_signal(String::new()),
rep_valid: create_signal(false),
active: active,
});
state.assembly.realize();
state.selection.update(|sel| sel.clear());
@ -233,13 +236,19 @@ pub fn AddRemove() -> View {
&JsValue::from(cst.args.0),
&JsValue::from(cst.args.1),
&JsValue::from(":"),
&JsValue::from(cst.rep)
&JsValue::from(cst.rep.get_untracked())
);
}
});
// make constraint activation trigger a realization update
// update the realization when the constraint activated, or
// edited while active
create_effect(move || {
rep.track();
console::log_2(
&JsValue::from("Constraint rep updated to"),
&JsValue::from(rep.get_untracked())
);
if active.get() {
state.assembly.realize();
}

8
app-proto/src/assembly.rs
View File

@ -22,7 +22,9 @@ pub struct Element {
#[derive(Clone)]
pub struct Constraint {
pub args: (usize, usize),
pub rep: f64,
pub rep: Signal<f64>,
pub rep_text: Signal<String>,
pub rep_valid: Signal<bool>,
pub active: Signal<bool>
}
@ -116,11 +118,11 @@ impl Assembly {
let mut gram_to_be = PartialMatrix::new();
self.constraints.with_untracked(|csts| {
for (_, cst) in csts {
if cst.active.get_untracked() {
if cst.active.get_untracked() && cst.rep_valid.get_untracked() {
let args = cst.args;
let row = elts[args.0].index;
let col = elts[args.1].index;
gram_to_be.push_sym(row, col, cst.rep);
gram_to_be.push_sym(row, col, cst.rep.get_untracked());
}
}
});

25
app-proto/src/outline.rs
View File

@ -1,6 +1,7 @@
use itertools::Itertools;
use sycamore::{prelude::*, web::tags::div};
use web_sys::{Element, KeyboardEvent, MouseEvent, wasm_bindgen::JsCast};
use web_sys::{Element, Event, HtmlInputElement, KeyboardEvent, MouseEvent, wasm_bindgen::JsCast};
use web_sys::{console, wasm_bindgen::JsValue}; /* DEBUG */
use crate::AppState;
@ -51,8 +52,6 @@ pub fn Outline() -> View {
let constrained = elt.constraints.len() > 0;
let details_node = create_node_ref();
view! {
/* [TO DO] switch to integer-valued parameters whenever
that becomes possible again */
li {
details(ref=details_node) {
summary(
@ -138,7 +137,25 @@ pub fn Outline() -> View {
li(class="cst") {
input(r#type="checkbox", bind:checked=cst.active)
div(class="cst-label") { (other_arg_label) }
div(class="cst-rep") { (cst.rep) }
input(
r#type="number",
step="0.01",
bind:value=cst.rep_text,
on:change=move |event: Event| {
let target: HtmlInputElement = event.target().unwrap().unchecked_into();
let rep_valid = target.check_validity() && !target.value().is_empty();
batch(|| {
cst.rep_valid.set(rep_valid);
if rep_valid {
console::log_2(
&JsValue::from("Constraint rep parsed to"),
&JsValue::from(target.value_as_number())
);
cst.rep.set(target.value_as_number());
}
});
}
)
}
}
},