From 78049da309e9bedce1e9268aa9341d00e0ca067b Mon Sep 17 00:00:00 2001 From: Seth Trowbridge Date: Sat, 10 Dec 2022 13:24:31 -0500 Subject: [PATCH] cursor, initialization --- src/app.js | 30 ++++++++++++++---------------- src/store.js | 30 ++++++++++++++++++++++-------- store.d.ts | 6 +++--- 3 files changed, 39 insertions(+), 27 deletions(-) diff --git a/src/app.js b/src/app.js index b6d1198..c74f500 100644 --- a/src/app.js +++ b/src/app.js @@ -48,32 +48,30 @@ const Controls =()=> const Audiogram =()=> { const [State] = Store.Consumer(); - - /** @type {(inAmount:number)=>string} */ const Perc =(inAmount)=> (inAmount*100)+"%"; - const testMarksL = State.Draw.TestL.Points.map(p=>html`<${UI.Mark} x=${Perc(p.X)} y=${Perc(p.Y)} response=${p.Mark.Resp} right=${false}/>`); - const userMarksL = State.Draw.UserL.Points.map(p=>html`<${UI.Mark} x=${Perc(p.X)} y=${Perc(p.Y)} response=${p.Mark.Resp} right=${false} classes=${State.Live.Mark == p.Mark ? "stroke-bold":""}/>`); - const testMarksR = State.Draw.TestR.Points.map(p=>html`<${UI.Mark} x=${Perc(p.X)} y=${Perc(p.Y)} response=${p.Mark.Resp} right=${true} />`); - const userMarksR = State.Draw.UserR.Points.map(p=>html`<${UI.Mark} x=${Perc(p.X)} y=${Perc(p.Y)} response=${p.Mark.Resp} right=${true} classes=${State.Live.Mark == p.Mark ? "stroke-bold":""}/>`); + const testMarksL = State.Draw.TestL.Points.map(p=>html`<${UI.Mark} x=${p.X} y=${p.Y} response=${p.Mark?.Resp} right=${false}/>`); + const userMarksL = State.Draw.UserL.Points.map(p=>html`<${UI.Mark} x=${p.X} y=${p.Y} response=${p.Mark?.Resp} right=${false} classes=${State.Live.Mark == p.Mark ? "stroke-bold":""}/>`); + const testMarksR = State.Draw.TestR.Points.map(p=>html`<${UI.Mark} x=${p.X} y=${p.Y} response=${p.Mark?.Resp} right=${true} />`); + const userMarksR = State.Draw.UserR.Points.map(p=>html`<${UI.Mark} x=${p.X} y=${p.Y} response=${p.Mark?.Resp} right=${true} classes=${State.Live.Mark == p.Mark ? "stroke-bold":""}/>`); - const testLinesL = State.Draw.TestL.Paths.map( p=>html``); - const userLinesL = State.Draw.UserL.Paths.map( p=>html``); - const testLinesR = State.Draw.TestR.Paths.map( p=>html``); - const userLinesR = State.Draw.UserR.Paths.map( p=>html``); + const testLinesL = State.Draw.TestL.Paths.map( p=>html``); + const userLinesL = State.Draw.UserL.Paths.map( p=>html``); + const testLinesR = State.Draw.TestR.Paths.map( p=>html``); + const userLinesR = State.Draw.UserR.Paths.map( p=>html``); return html` ${testMarksL}${testLinesL} ${testMarksR}${testLinesR} ${userMarksL}${userLinesL} ${userMarksR}${userLinesR} - - - + + + - - - + + + diff --git a/src/store.js b/src/store.js index 2e65e35..c6a751e 100644 --- a/src/store.js +++ b/src/store.js @@ -25,6 +25,9 @@ export const ColumnLookup =(inFrequency)=> return false; }; +/** @type {(inDecimal:number)=>string} */ +const Perc =(inDecimal)=> `${inDecimal*100}%`; + /** Creates a new Store.Context object that contain the current selections * @type {(inState:Store.State, inTest?:Store.Test)=>Store.Context} */ const Reselect =(inState, inTest)=> @@ -69,8 +72,8 @@ const Redraw =(inTest, inChan, inStim, inIsUser)=> { /** @type {Store.DrawPoint} */ const point = { - X: lookup[1], - Y: (mark.Stim - inStim.Min)/(inStim.Max - inStim.Min), + X: Perc(lookup[1]), + Y: Perc((mark.Stim - inStim.Min)/(inStim.Max - inStim.Min)), Mark: mark }; output.Points.push(point); @@ -81,14 +84,21 @@ const Redraw =(inTest, inChan, inStim, inIsUser)=> { /** @type {Store.DrawLine} */ const line = {Head:output.Points[i-1], Tail:output.Points[i]}; - if(line.Head.Mark.Resp && line.Tail.Mark.Resp) + if(line.Head.Mark?.Resp && line.Tail.Mark?.Resp) { output.Paths.push(line); } } } return output; -} +}; + +/** Create a new cursor position from the state + * @type {(inState:Store.State)=>Store.DrawPoint} */ +const Reposition =(inState)=> ({ + X: Perc(ColumnMapping[inState.Freq.Value][1]), + Y: Perc((inState.Stim.Value - inState.Stim.Min)/(inState.Stim.Max - inState.Stim.Min)) +}); /** @type {Store.Reducer} */ export function Reducer(inState, inAction) @@ -100,7 +110,9 @@ export function Reducer(inState, inAction) { const test = clone.Tests[Data]; clone.Live = Reselect(clone, test); - clone.Draw = { + clone.Draw = + { + Cross: Reposition(clone), UserL: Redraw(test, 0, clone.Stim, true ), UserR: Redraw(test, 1, clone.Stim, true ), TestL: Redraw(test, 0, clone.Stim, false), @@ -123,6 +135,8 @@ export function Reducer(inState, inAction) tone.Value += Data*tone.Step; tone.Value = Math.max(tone.Value, tone.Min); tone.Value = Math.min(tone.Value, tone.Max); + + clone.Draw.Cross = Reposition(clone); if(Name != "Stim") { clone.Live = Reselect(clone); @@ -133,7 +147,7 @@ export function Reducer(inState, inAction) } /** @type {Store.State} */ -export const Initial = +export const Initial = Reducer( { Chan: { Min:0, Max:1, Value:0, Step:1 }, Freq: { Min:2, Max:8, Value:2, Step:1 }, @@ -166,7 +180,7 @@ export const Initial = ] } ] -}; +}, {Name:"Test", Data:0}); /** @type {preact.Context} */ export const Context = React.createContext([Initial, (_a)=>{}]); @@ -175,7 +189,7 @@ export const Context = React.createContext([Initial, (_a)=>{}]); export const Provider =(props)=> { /** @type {Store.Binding} */ - const reducer = React.useReducer(Reducer, Initial, ()=>Reducer(Initial, {Name:"Test", Data:0})); + const reducer = React.useReducer(Reducer, Initial); return React.createElement(Context.Provider, {value:reducer, children:props.children}); }; diff --git a/store.d.ts b/store.d.ts index 93701ab..7d5e7f7 100644 --- a/store.d.ts +++ b/store.d.ts @@ -25,7 +25,7 @@ declare namespace Store { Freq: Range; Stim: Range; Live: Context; - Draw: DrawTest; + Draw: DrawChart; Tests: Array; }; @@ -42,10 +42,10 @@ declare namespace Store { type PlotKeyTest = "TestL" | "TestR"; type PlotKey = PlotKeyUser | PlotKeyTest; - type DrawPoint = { X: number; Y: number; Mark: TestFrequencySample }; + type DrawPoint = { X: string; Y: string; Mark?: TestFrequencySample }; type DrawLine = { Head:DrawPoint, Tail:DrawPoint}; type DrawGroup = { Points: Array; Paths: Array }; - type DrawTest = { UserL: DrawGroup, UserR: DrawGroup, TestL: DrawGroup, TestR: DrawGroup }; + type DrawChart = { Cross?:DrawPoint, UserL: DrawGroup, UserR: DrawGroup, TestL: DrawGroup, TestR: DrawGroup }; type Binding = [state:State, dispatch:(inAction:Action)=>void] }