improve graph lines
This commit is contained in:
@@ -5,133 +5,80 @@ end
|
||||
|
||||
structure GraphLines :> GRAPH_LINES =
|
||||
struct
|
||||
(*
|
||||
* This function only produces the desired result
|
||||
* when the window is a square and has the aspect ratio 1:1.
|
||||
* This is because the function assumes it can use
|
||||
* the same position coordinates both horizontally and vertically.
|
||||
*)
|
||||
fun helpGenGraphLinesSquare (pos: Real32.real, limit, acc) =
|
||||
if pos >= limit then
|
||||
fun toNdc (cur, half) = (cur - half) / half
|
||||
|
||||
fun helpGenGraphLinesX (pos, xClickPoints, yClickPoints, acc,
|
||||
windowWidth, windowHeight) =
|
||||
if pos = Vector.length xClickPoints then
|
||||
Vector.concat acc
|
||||
else
|
||||
let
|
||||
val vec =
|
||||
#[ (* x = _.1 *)
|
||||
pos - 0.001, ~1.0
|
||||
, pos + 0.001, ~1.0
|
||||
, pos + 0.001, 1.0
|
||||
val halfWidth = windowHeight div 2
|
||||
val halfWidth = Real32.fromInt halfWidth
|
||||
val halfHeight = windowHeight div 2
|
||||
val halfHeight = Real32.fromInt halfHeight
|
||||
|
||||
, pos + 0.001, 1.0
|
||||
, pos - 0.001, 1.0
|
||||
, pos - 0.001, ~1.0
|
||||
|
||||
(* y = _.1 *)
|
||||
, ~1.0, pos - 0.001
|
||||
, ~1.0, pos + 0.001
|
||||
, 1.0, pos + 0.001
|
||||
|
||||
, 1.0, pos + 0.001
|
||||
, 1.0, pos - 0.001
|
||||
, ~1.0, pos - 0.001
|
||||
]
|
||||
val acc = vec :: acc
|
||||
val nextPos = pos + 0.1
|
||||
in
|
||||
helpGenGraphLinesSquare (nextPos, limit, acc)
|
||||
end
|
||||
|
||||
fun helpGenGraphLinesHorizontal
|
||||
(pos, xClickPoints, acc, halfWidth, yMin, yMax) =
|
||||
if pos = Vector.length xClickPoints then
|
||||
acc
|
||||
else
|
||||
let
|
||||
val curX = Vector.sub (xClickPoints, pos)
|
||||
val ndc = (curX - halfWidth) / halfWidth
|
||||
val acc =
|
||||
#[
|
||||
ndc - 0.001, yMin
|
||||
, ndc + 0.001, yMin
|
||||
, ndc + 0.001, yMax
|
||||
val curYNdc = toNdc (curX, halfWidth)
|
||||
|
||||
, ndc + 0.001, yMax
|
||||
, ndc - 0.001, yMax
|
||||
, ndc - 0.001, yMin
|
||||
] :: acc
|
||||
val minY = Vector.sub (xClickPoints, 0)
|
||||
val minY = toNdc (minY, halfWidth)
|
||||
val maxY = Vector.sub (xClickPoints, Vector.length xClickPoints - 1)
|
||||
val maxY = toNdc (maxY, halfWidth)
|
||||
|
||||
val acc =
|
||||
#[ curYNdc - 0.001, minY
|
||||
, curYNdc + 0.001, minY
|
||||
, curYNdc + 0.001, maxY
|
||||
|
||||
, curYNdc + 0.001, maxY
|
||||
, curYNdc - 0.001, maxY
|
||||
, curYNdc - 0.001, minY
|
||||
] :: acc
|
||||
in
|
||||
helpGenGraphLinesHorizontal
|
||||
(pos + 1, xClickPoints, acc, halfWidth, yMin, yMax)
|
||||
helpGenGraphLinesX
|
||||
(pos + 1, xClickPoints, yClickPoints, acc, windowWidth, windowHeight)
|
||||
end
|
||||
|
||||
fun helpGenGraphLinesVertical (pos, yClickPoints, acc, halfHeight, xMin, xMax) =
|
||||
fun helpGenGraphLinesY (pos, yClickPoints, xClickPoints, acc,
|
||||
windowWidth, windowHeight) =
|
||||
if pos = Vector.length yClickPoints then
|
||||
acc
|
||||
else
|
||||
let
|
||||
val curY = Vector.sub (yClickPoints, pos)
|
||||
val ndc = (curY - halfHeight) / halfHeight
|
||||
val acc =
|
||||
#[
|
||||
xMin, ndc - 0.001
|
||||
, xMin, ndc + 0.001
|
||||
, xMax, ndc + 0.001
|
||||
val halfWidth = windowHeight div 2
|
||||
val halfWidth = Real32.fromInt halfWidth
|
||||
val halfHeight = windowHeight div 2
|
||||
val halfHeight = Real32.fromInt halfHeight
|
||||
|
||||
, xMax, ndc + 0.001
|
||||
, xMax, ndc - 0.001
|
||||
, xMin, ndc - 0.001
|
||||
val curY = Vector.sub (yClickPoints, pos)
|
||||
val curYNdc = toNdc (curY, halfHeight)
|
||||
|
||||
val minX = Vector.sub (xClickPoints, 0)
|
||||
val minX = toNdc (minX, halfWidth)
|
||||
val maxX = Vector.sub (xClickPoints, Vector.length xClickPoints - 1)
|
||||
val maxX = toNdc (maxX, halfWidth)
|
||||
|
||||
val acc =
|
||||
#[ minX, curYNdc - 0.001
|
||||
, minX, curYNdc + 0.001
|
||||
, maxX, curYNdc + 0.001
|
||||
|
||||
, maxX, curYNdc + 0.001
|
||||
, maxX, curYNdc - 0.001
|
||||
, minX, curYNdc - 0.001
|
||||
] :: acc
|
||||
in
|
||||
helpGenGraphLinesVertical
|
||||
(pos + 1, yClickPoints, acc, halfHeight, xMin, xMax)
|
||||
helpGenGraphLinesY
|
||||
(pos + 1, yClickPoints, xClickPoints, acc, windowWidth, windowHeight)
|
||||
end
|
||||
|
||||
fun helpGenerate (windowWidth, windowHeight, xClickPoints, yClickPoints) =
|
||||
if windowWidth = windowHeight then
|
||||
helpGenGraphLinesSquare (~1.0, 1.0, [])
|
||||
else if windowWidth > windowHeight then
|
||||
let
|
||||
val difference = windowWidth - windowHeight
|
||||
val offset = difference div 2
|
||||
|
||||
val halfWidth = Real32.fromInt (windowWidth div 2)
|
||||
val halfHeight = Real32.fromInt (windowHeight div 2)
|
||||
|
||||
val start = offset - (windowWidth div 2)
|
||||
val start = Real32.fromInt start / halfWidth
|
||||
|
||||
val finish = (windowWidth - offset) - (windowWidth div 2)
|
||||
val finish = Real32.fromInt finish / halfWidth
|
||||
|
||||
val lines = helpGenGraphLinesHorizontal
|
||||
(0, xClickPoints, [], halfWidth, ~1.0, 1.0)
|
||||
val lines = helpGenGraphLinesVertical
|
||||
(0, yClickPoints, lines, halfHeight, start, finish)
|
||||
in
|
||||
Vector.concat lines
|
||||
end
|
||||
else
|
||||
(* windowWidth < windowHeight *)
|
||||
let
|
||||
val difference = windowHeight - windowWidth
|
||||
val offset = difference div 2
|
||||
|
||||
val halfWidth = Real32.fromInt (windowWidth div 2)
|
||||
val halfHeight = Real32.fromInt (windowHeight div 2)
|
||||
|
||||
val start = offset - (windowHeight div 2)
|
||||
val start = Real32.fromInt start / halfHeight
|
||||
|
||||
val finish = (windowHeight - offset) - (windowHeight div 2)
|
||||
val finish = Real32.fromInt finish / halfHeight
|
||||
|
||||
val lines = helpGenGraphLinesHorizontal
|
||||
(0, xClickPoints, [], halfWidth, start, finish)
|
||||
val lines = helpGenGraphLinesVertical
|
||||
(0, yClickPoints, lines, halfHeight, ~1.0, 1.0)
|
||||
in
|
||||
Vector.concat lines
|
||||
end
|
||||
let
|
||||
val acc = helpGenGraphLinesY (0, yClickPoints, xClickPoints, [], windowWidth, windowHeight)
|
||||
in
|
||||
helpGenGraphLinesX (0, xClickPoints, yClickPoints, acc, windowWidth, windowHeight)
|
||||
end
|
||||
|
||||
fun generate (app: AppType.app_type) =
|
||||
let
|
||||
|
||||
Reference in New Issue
Block a user