humza/sml-projects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
441e5fdd69e22d794a3d124188cf01096ab7cc25
sml-projects/functional-core/app/app-with.sml

996 lines
22 KiB
Standard ML
Raw Normal View History

begin refactoring to use square pixels instead of triangles, focusing on functional core first
2025-07-06 01:38:02 +01:00
structure AppWith =
begin refactoring
2024-08-08 00:18:03 +01:00
struct
open AppType
add redo stack, and adjust functions to clear it when new triangle or triangle_stage is added; when an undo function is called, the undoHd becomes the redoHd, and undo becomes undoTl, which is expected behaviour. Still need to implement REDO_ACTION though.
2024-08-08 23:10:38 +01:00
(* add to undo, clear redo *)
fun addTriangleStage
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
(app: app_type, newTriangleStage: triangle_stage, newUndoHd, arrowX, arrowY) :
app_type =
undo implemented and working fine
2024-08-08 21:35:48 +01:00
let
val
{ triangleStage = _
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
, mode
undo implemented and working fine
2024-08-08 21:35:48 +01:00
, triangles
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
undo implemented and working fine
2024-08-08 21:35:48 +01:00
, xClickPoints
, yClickPoints
, windowWidth
, windowHeight
, undo
add redo stack, and adjust functions to clear it when new triangle or triangle_stage is added; when an undo function is called, the undoHd becomes the redoHd, and undo becomes undoTl, which is expected behaviour. Still need to implement REDO_ACTION though.
2024-08-08 23:10:38 +01:00
, redo = _
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, showGraph
refactor a little bit, making signature of app-update.sml simpler to use by storing mouseX and mouseY inside the app_type
2024-08-08 21:58:50 +01:00
, mouseX
, mouseY
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX = _
, arrowY = _
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath
, fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r
, g
, b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num
undo implemented and working fine
2024-08-08 21:35:48 +01:00
} = app
refactor a little bit, making signature of app-update.sml simpler to use by storing mouseX and mouseY inside the app_type
2024-08-08 21:58:50 +01:00
add redo stack, and adjust functions to clear it when new triangle or triangle_stage is added; when an undo function is called, the undoHd becomes the redoHd, and undo becomes undoTl, which is expected behaviour. Still need to implement REDO_ACTION though.
2024-08-08 23:10:38 +01:00
val newUndo = newUndoHd :: undo
undo implemented and working fine
2024-08-08 21:35:48 +01:00
in
{ triangleStage = newTriangleStage
add redo stack, and adjust functions to clear it when new triangle or triangle_stage is added; when an undo function is called, the undoHd becomes the redoHd, and undo becomes undoTl, which is expected behaviour. Still need to implement REDO_ACTION though.
2024-08-08 23:10:38 +01:00
, undo = newUndo
, redo = []
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
, mode = mode
undo implemented and working fine
2024-08-08 21:35:48 +01:00
, triangles = triangles
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
undo implemented and working fine
2024-08-08 21:35:48 +01:00
, xClickPoints = xClickPoints
, yClickPoints = yClickPoints
, windowWidth = windowWidth
, windowHeight = windowHeight
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, showGraph = showGraph
refactor a little bit, making signature of app-update.sml simpler to use by storing mouseX and mouseY inside the app_type
2024-08-08 21:58:50 +01:00
, mouseX = mouseX
, mouseY = mouseY
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX = arrowX
, arrowY = arrowY
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath = openFilePath
, fileBrowser = fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx = fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r = r
, g = g
, b = b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num = num
undo implemented and working fine
2024-08-08 21:35:48 +01:00
}
end
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
fun addTriangle
(app: app_type, x1, y1, x2, y2, x3, y3, newUndoHd, arrowX, arrowY) :
app_type =
begin refactoring
2024-08-08 00:18:03 +01:00
let
val
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode
, triangles
add redo stack, and adjust functions to clear it when new triangle or triangle_stage is added; when an undo function is called, the undoHd becomes the redoHd, and undo becomes undoTl, which is expected behaviour. Still need to implement REDO_ACTION though.
2024-08-08 23:10:38 +01:00
, triangleStage = _
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
begin refactoring
2024-08-08 00:18:03 +01:00
, xClickPoints
, yClickPoints
, windowWidth
, windowHeight
scaffolding in preparation for implementing undo
2024-08-08 06:34:40 +01:00
, undo
add redo stack, and adjust functions to clear it when new triangle or triangle_stage is added; when an undo function is called, the undoHd becomes the redoHd, and undo becomes undoTl, which is expected behaviour. Still need to implement REDO_ACTION though.
2024-08-08 23:10:38 +01:00
, redo = _
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, showGraph
refactor a little bit, making signature of app-update.sml simpler to use by storing mouseX and mouseY inside the app_type
2024-08-08 21:58:50 +01:00
, mouseX
, mouseY
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX = _
, arrowY = _
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath
, fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r
, g
, b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num
begin refactoring
2024-08-08 00:18:03 +01:00
} = app
add redo stack, and adjust functions to clear it when new triangle or triangle_stage is added; when an undo function is called, the undoHd becomes the redoHd, and undo becomes undoTl, which is expected behaviour. Still need to implement REDO_ACTION though.
2024-08-08 23:10:38 +01:00
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
val newTriangle =
{ x1 = x1
, y1 = y1
, x2 = x2
, y2 = y2
, x3 = x3
, y3 = y3
, r = r
, g = g
, b = b
}
add redo stack, and adjust functions to clear it when new triangle or triangle_stage is added; when an undo function is called, the undoHd becomes the redoHd, and undo becomes undoTl, which is expected behaviour. Still need to implement REDO_ACTION though.
2024-08-08 23:10:38 +01:00
val newTriangles = newTriangle :: triangles
val newUndo = newUndoHd :: undo
begin refactoring
2024-08-08 00:18:03 +01:00
in
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode = mode
, triangleStage = NO_TRIANGLE
add redo stack, and adjust functions to clear it when new triangle or triangle_stage is added; when an undo function is called, the undoHd becomes the redoHd, and undo becomes undoTl, which is expected behaviour. Still need to implement REDO_ACTION though.
2024-08-08 23:10:38 +01:00
, triangles = newTriangles
, undo = newUndo
, redo = []
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
begin refactoring
2024-08-08 00:18:03 +01:00
, xClickPoints = xClickPoints
, yClickPoints = yClickPoints
, windowWidth = windowWidth
, windowHeight = windowHeight
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, showGraph = showGraph
refactor a little bit, making signature of app-update.sml simpler to use by storing mouseX and mouseY inside the app_type
2024-08-08 21:58:50 +01:00
, mouseX = mouseX
, mouseY = mouseY
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX = arrowX
, arrowY = arrowY
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath = openFilePath
, fileBrowser = fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx = fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r = r
, g = g
, b = b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num = num
begin refactoring
2024-08-08 00:18:03 +01:00
}
end
progress towards supporting arrow input
2024-09-20 12:33:31 +01:00
fun arrowX (app: app_type, arrowX) =
let
val
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode
, xClickPoints
progress towards supporting arrow input
2024-09-20 12:33:31 +01:00
, yClickPoints
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
progress towards supporting arrow input
2024-09-20 12:33:31 +01:00
, windowWidth
, windowHeight
, triangles
, triangleStage
, undo
, redo
, showGraph
, mouseX
, mouseY
, arrowX = _
, arrowY
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath
, fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r
, g
, b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num
progress towards supporting arrow input
2024-09-20 12:33:31 +01:00
} = app
in
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode = mode
, xClickPoints = xClickPoints
progress towards supporting arrow input
2024-09-20 12:33:31 +01:00
, yClickPoints = yClickPoints
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
progress towards supporting arrow input
2024-09-20 12:33:31 +01:00
, triangles = triangles
, triangleStage = triangleStage
, windowWidth = windowWidth
, windowHeight = windowHeight
, undo = undo
, redo = redo
, showGraph = showGraph
, mouseX = mouseX
, mouseY = mouseY
, arrowX = arrowX
, arrowY = arrowY
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath = openFilePath
, fileBrowser = fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx = fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r = r
, g = g
, b = b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num = num
progress towards supporting arrow input
2024-09-20 12:33:31 +01:00
}
end
fun arrowY (app: app_type, arrowY) =
let
val
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode
, xClickPoints
progress towards supporting arrow input
2024-09-20 12:33:31 +01:00
, yClickPoints
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
progress towards supporting arrow input
2024-09-20 12:33:31 +01:00
, windowWidth
, windowHeight
, triangles
, triangleStage
, undo
, redo
, showGraph
, mouseX
, mouseY
, arrowX
, arrowY = _
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath
, fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r
, g
, b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num
progress towards supporting arrow input
2024-09-20 12:33:31 +01:00
} = app
in
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode = mode
, xClickPoints = xClickPoints
progress towards supporting arrow input
2024-09-20 12:33:31 +01:00
, yClickPoints = yClickPoints
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
progress towards supporting arrow input
2024-09-20 12:33:31 +01:00
, triangles = triangles
, triangleStage = triangleStage
, windowWidth = windowWidth
, windowHeight = windowHeight
, undo = undo
, redo = redo
, showGraph = showGraph
, mouseX = mouseX
, mouseY = mouseY
, arrowX = arrowX
, arrowY = arrowY
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath = openFilePath
, fileBrowser = fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx = fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r = r
, g = g
, b = b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num = num
progress towards supporting arrow input
2024-09-20 12:33:31 +01:00
}
end
remove instances of 'local ... in ... end', replacing it with opauque structures with signatures, because I like the lower indentation level and additional whitespace in the latter
2024-08-08 01:37:46 +01:00
fun helpWindowResize
(app: app_type, windowWidth, windowHeight, wStart, wFinish, hStart, hFinish) :
app_type =
let
val
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode
, xClickPoints = _
remove instances of 'local ... in ... end', replacing it with opauque structures with signatures, because I like the lower indentation level and additional whitespace in the latter
2024-08-08 01:37:46 +01:00
, yClickPoints = _
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
remove instances of 'local ... in ... end', replacing it with opauque structures with signatures, because I like the lower indentation level and additional whitespace in the latter
2024-08-08 01:37:46 +01:00
, windowWidth = _
, windowHeight = _
, triangles
, triangleStage
scaffolding in preparation for implementing undo
2024-08-08 06:34:40 +01:00
, undo
add redo stack, and adjust functions to clear it when new triangle or triangle_stage is added; when an undo function is called, the undoHd becomes the redoHd, and undo becomes undoTl, which is expected behaviour. Still need to implement REDO_ACTION though.
2024-08-08 23:10:38 +01:00
, redo
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, showGraph
refactor a little bit, making signature of app-update.sml simpler to use by storing mouseX and mouseY inside the app_type
2024-08-08 21:58:50 +01:00
, mouseX
, mouseY
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX
, arrowY
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath
, fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r
, g
, b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num
remove instances of 'local ... in ... end', replacing it with opauque structures with signatures, because I like the lower indentation level and additional whitespace in the latter
2024-08-08 01:37:46 +01:00
} = app
add redo stack, and adjust functions to clear it when new triangle or triangle_stage is added; when an undo function is called, the undoHd becomes the redoHd, and undo becomes undoTl, which is expected behaviour. Still need to implement REDO_ACTION though.
2024-08-08 23:10:38 +01:00
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
val xClickPoints = ClickPoints.generate (wStart, wFinish, numClickPointsX)
val yClickPoints = ClickPoints.generate (hStart, hFinish, numClickPointsY)
remove instances of 'local ... in ... end', replacing it with opauque structures with signatures, because I like the lower indentation level and additional whitespace in the latter
2024-08-08 01:37:46 +01:00
in
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode = mode
, xClickPoints = xClickPoints
remove instances of 'local ... in ... end', replacing it with opauque structures with signatures, because I like the lower indentation level and additional whitespace in the latter
2024-08-08 01:37:46 +01:00
, yClickPoints = yClickPoints
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
remove instances of 'local ... in ... end', replacing it with opauque structures with signatures, because I like the lower indentation level and additional whitespace in the latter
2024-08-08 01:37:46 +01:00
, triangles = triangles
, triangleStage = triangleStage
, windowWidth = windowWidth
, windowHeight = windowHeight
scaffolding in preparation for implementing undo
2024-08-08 06:34:40 +01:00
, undo = undo
add redo stack, and adjust functions to clear it when new triangle or triangle_stage is added; when an undo function is called, the undoHd becomes the redoHd, and undo becomes undoTl, which is expected behaviour. Still need to implement REDO_ACTION though.
2024-08-08 23:10:38 +01:00
, redo = redo
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, showGraph = showGraph
refactor a little bit, making signature of app-update.sml simpler to use by storing mouseX and mouseY inside the app_type
2024-08-08 21:58:50 +01:00
, mouseX = mouseX
, mouseY = mouseY
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX = arrowX
, arrowY = arrowY
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath = openFilePath
, fileBrowser = fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx = fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r = r
, g = g
, b = b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num = num
remove instances of 'local ... in ... end', replacing it with opauque structures with signatures, because I like the lower indentation level and additional whitespace in the latter
2024-08-08 01:37:46 +01:00
}
end
fun windowResize (app: app_type, windowWidth, windowHeight) =
if windowWidth = windowHeight then
helpWindowResize
(app, windowWidth, windowHeight, 0, windowWidth, 0, windowHeight)
else if windowWidth > windowHeight then
let
val difference = windowWidth - windowHeight
val wStart = difference div 2
val wFinish = wStart + windowHeight
in
helpWindowResize
(app, windowWidth, windowHeight, wStart, wFinish, 0, windowHeight)
end
else
begin refactoring
2024-08-08 00:18:03 +01:00
let
remove instances of 'local ... in ... end', replacing it with opauque structures with signatures, because I like the lower indentation level and additional whitespace in the latter
2024-08-08 01:37:46 +01:00
val difference = windowHeight - windowWidth
val hStart = difference div 2
val hFinish = hStart + windowWidth
begin refactoring
2024-08-08 00:18:03 +01:00
in
remove instances of 'local ... in ... end', replacing it with opauque structures with signatures, because I like the lower indentation level and additional whitespace in the latter
2024-08-08 01:37:46 +01:00
helpWindowResize
(app, windowWidth, windowHeight, 0, windowWidth, hStart, hFinish)
begin refactoring
2024-08-08 00:18:03 +01:00
end
refactor a little bit, making signature of app-update.sml simpler to use by storing mouseX and mouseY inside the app_type
2024-08-08 21:58:50 +01:00
fun mousePosition (app: app_type, mouseX, mouseY) =
let
val
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode
, mouseX = _
refactor a little bit, making signature of app-update.sml simpler to use by storing mouseX and mouseY inside the app_type
2024-08-08 21:58:50 +01:00
, mouseY = _
, triangles
, triangleStage
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
refactor a little bit, making signature of app-update.sml simpler to use by storing mouseX and mouseY inside the app_type
2024-08-08 21:58:50 +01:00
, xClickPoints
, yClickPoints
, windowWidth
, windowHeight
, undo
add redo stack, and adjust functions to clear it when new triangle or triangle_stage is added; when an undo function is called, the undoHd becomes the redoHd, and undo becomes undoTl, which is expected behaviour. Still need to implement REDO_ACTION though.
2024-08-08 23:10:38 +01:00
, redo
progress towards toggling graph
2024-08-14 02:31:28 +01:00
, showGraph
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX
, arrowY
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath
, fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r
, g
, b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num
refactor a little bit, making signature of app-update.sml simpler to use by storing mouseX and mouseY inside the app_type
2024-08-08 21:58:50 +01:00
} = app
in
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode = mode
, mouseX = mouseX
refactor a little bit, making signature of app-update.sml simpler to use by storing mouseX and mouseY inside the app_type
2024-08-08 21:58:50 +01:00
, mouseY = mouseY
, triangles = triangles
, triangleStage = triangleStage
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
refactor a little bit, making signature of app-update.sml simpler to use by storing mouseX and mouseY inside the app_type
2024-08-08 21:58:50 +01:00
, xClickPoints = xClickPoints
, yClickPoints = yClickPoints
, windowWidth = windowWidth
, windowHeight = windowHeight
, undo = undo
add redo stack, and adjust functions to clear it when new triangle or triangle_stage is added; when an undo function is called, the undoHd becomes the redoHd, and undo becomes undoTl, which is expected behaviour. Still need to implement REDO_ACTION though.
2024-08-08 23:10:38 +01:00
, redo = redo
progress towards toggling graph
2024-08-14 02:31:28 +01:00
, showGraph = showGraph
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX = arrowX
, arrowY = arrowY
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath = openFilePath
, fileBrowser = fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx = fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r = r
, g = g
, b = b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num = num
refactor a little bit, making signature of app-update.sml simpler to use by storing mouseX and mouseY inside the app_type
2024-08-08 21:58:50 +01:00
}
end
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
(* add to redo, pop one from undo *)
fun undo (app: app_type, newTriangleStage, newTriangles, newRedoHd) =
let
val
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode
, triangleStage = _
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
, triangles = _
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
, xClickPoints
, yClickPoints
, windowWidth
, windowHeight
, undo
, redo
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, showGraph
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
, mouseX
, mouseY
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX
, arrowY
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath
, fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r
, g
, b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
} = app
val newUndo =
case undo of
hd :: tl => tl
| empty => empty
val newRedo = newRedoHd :: redo
in
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode = mode
, triangleStage = newTriangleStage
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
, triangles = newTriangles
, undo = newUndo
, redo = newRedo
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
, xClickPoints = xClickPoints
, yClickPoints = yClickPoints
, windowWidth = windowWidth
, windowHeight = windowHeight
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, showGraph = showGraph
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
, mouseX = mouseX
, mouseY = mouseY
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX = arrowX
, arrowY = arrowY
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath = openFilePath
, fileBrowser = fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx = fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r = r
, g = g
, b = b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num = num
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
}
end
(* add to undo, pop one from redo *)
fun redo (app: app_type, newTriangleStage, newTriangles, newUndoHd) =
let
val
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode
, triangleStage = _
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
, triangles = _
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
, xClickPoints
, yClickPoints
, windowWidth
, windowHeight
, undo
, redo
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, showGraph
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
, mouseX
, mouseY
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX
, arrowY
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath
, fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r
, g
, b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
} = app
val newUndo = newUndoHd :: undo
val newRedo =
case redo of
hd :: tl => tl
| empty => empty
in
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode = mode
, triangleStage = newTriangleStage
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
, triangles = newTriangles
, undo = newUndo
, redo = newRedo
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
, xClickPoints = xClickPoints
, yClickPoints = yClickPoints
, windowWidth = windowWidth
, windowHeight = windowHeight
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, showGraph = showGraph
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
, mouseX = mouseX
, mouseY = mouseY
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX = arrowX
, arrowY = arrowY
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath = openFilePath
, fileBrowser = fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx = fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r = r
, g = g
, b = b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num = num
progress towards toggling graph
2024-08-14 02:31:28 +01:00
}
end
fun graphVisibility (app: app_type, shouldShowGraph) =
let
val
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode
, triangleStage
progress towards toggling graph
2024-08-14 02:31:28 +01:00
, triangles
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
progress towards toggling graph
2024-08-14 02:31:28 +01:00
, xClickPoints
, yClickPoints
, windowWidth
, windowHeight
, undo
, redo
, mouseX
, mouseY
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX
, arrowY
progress towards toggling graph
2024-08-14 02:31:28 +01:00
, showGraph = _
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath
, fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r
, g
, b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num
progress towards toggling graph
2024-08-14 02:31:28 +01:00
} = app
in
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
{ mode = mode
, showGraph = shouldShowGraph
progress towards toggling graph
2024-08-14 02:31:28 +01:00
, triangleStage = triangleStage
, triangles = triangles
, undo = undo
, redo = redo
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
progress towards toggling graph
2024-08-14 02:31:28 +01:00
, xClickPoints = xClickPoints
, yClickPoints = yClickPoints
, windowWidth = windowWidth
, windowHeight = windowHeight
, mouseX = mouseX
, mouseY = mouseY
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX = arrowX
, arrowY = arrowY
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath = openFilePath
, fileBrowser = fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx = fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r = r
, g = g
, b = b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num = num
progress towards adding load functionality'
2024-09-25 10:17:57 +01:00
}
end
fun mode (app: app_type, newMode) =
let
val
{ mode = _
, triangleStage
, triangles
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
progress towards adding load functionality'
2024-09-25 10:17:57 +01:00
, xClickPoints
, yClickPoints
, windowWidth
, windowHeight
, undo
, redo
, mouseX
, mouseY
, arrowX
, arrowY
, showGraph
, openFilePath
, fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r
, g
, b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num
progress towards adding load functionality'
2024-09-25 10:17:57 +01:00
} = app
in
{ mode = newMode
, showGraph = showGraph
, triangleStage = triangleStage
, triangles = triangles
, undo = undo
, redo = redo
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
progress towards adding load functionality'
2024-09-25 10:17:57 +01:00
, xClickPoints = xClickPoints
, yClickPoints = yClickPoints
, windowWidth = windowWidth
, windowHeight = windowHeight
, mouseX = mouseX
, mouseY = mouseY
, arrowX = arrowX
, arrowY = arrowY
, openFilePath = openFilePath
, fileBrowser = fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx = fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r = r
, g = g
, b = b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num = num
done with functional-core logic for redo (now just need to send REDO_ACTION on key callback when shortcut is pressed)
2024-08-08 23:43:38 +01:00
}
end
done with loading file into app (loaded triangles are visible, etc.)
2024-08-29 05:38:58 +01:00
add load functionality (but note that saving is still hardcoded right now)
2024-09-29 22:26:07 +01:00
fun useTrianglesAndSetNormalMode (app: app_type, triangles) =
done with loading file into app (loaded triangles are visible, etc.)
2024-08-29 05:38:58 +01:00
let
val
add load functionality (but note that saving is still hardcoded right now)
2024-09-29 22:26:07 +01:00
{ mode = _
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
, xClickPoints
done with loading file into app (loaded triangles are visible, etc.)
2024-08-29 05:38:58 +01:00
, yClickPoints
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
done with loading file into app (loaded triangles are visible, etc.)
2024-08-29 05:38:58 +01:00
, windowWidth
, windowHeight
, undo
, redo
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, showGraph
done with loading file into app (loaded triangles are visible, etc.)
2024-08-29 05:38:58 +01:00
, mouseX
, mouseY
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX
, arrowY
done with loading file into app (loaded triangles are visible, etc.)
2024-08-29 05:38:58 +01:00
, triangles = _
, triangleStage = _
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath
, fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r
, g
, b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num
done with loading file into app (loaded triangles are visible, etc.)
2024-08-29 05:38:58 +01:00
} = app
val triangleStage = NO_TRIANGLE
in
add load functionality (but note that saving is still hardcoded right now)
2024-09-29 22:26:07 +01:00
{ mode = AppType.NORMAL_MODE
add new field to app type, to distinguish between modes (one mode for normal insertion/deleteion, another mode for saving, etc.)
2024-09-24 21:54:19 +01:00
, triangleStage = triangleStage
done with loading file into app (loaded triangles are visible, etc.)
2024-08-29 05:38:58 +01:00
, triangles = triangles
, undo = []
, redo = []
, showGraph = showGraph
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
done with loading file into app (loaded triangles are visible, etc.)
2024-08-29 05:38:58 +01:00
, xClickPoints = xClickPoints
, yClickPoints = yClickPoints
, windowWidth = windowWidth
, windowHeight = windowHeight
, mouseX = mouseX
, mouseY = mouseY
adjust app type by adding arrowX and arrowY integer fields, and subsequent refactoring, as preparation for being able to draw with arrow keys
2024-09-20 10:17:57 +01:00
, arrowX = arrowX
, arrowY = arrowY
progress towards being able to load files dynamically
2024-09-25 08:08:15 +01:00
, openFilePath = openFilePath
, fileBrowser = fileBrowser
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx = fileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r = r
, g = g
, b = b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num = num
done with loading file into app (loaded triangles are visible, etc.)
2024-08-29 05:38:58 +01:00
}
end
add todo note
2024-09-25 20:34:59 +01:00
fun fileBrowserAndPath (app: app_type, fileBrowser, path) =
let
val
{ mode
, xClickPoints
, yClickPoints
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
add todo note
2024-09-25 20:34:59 +01:00
, windowWidth
, windowHeight
, triangles
, triangleStage
, undo
, redo
, showGraph
, mouseX
, mouseY
, arrowX
, arrowY
, openFilePath = _
, fileBrowser = _
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowserIdx = _
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r
, g
, b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num
add todo note
2024-09-25 20:34:59 +01:00
} = app
in
{ mode = mode
, xClickPoints = xClickPoints
, yClickPoints = yClickPoints
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
add todo note
2024-09-25 20:34:59 +01:00
, triangles = triangles
, triangleStage = triangleStage
, windowWidth = windowWidth
, windowHeight = windowHeight
, undo = undo
, redo = redo
, showGraph = showGraph
, mouseX = mouseX
, mouseY = mouseY
, arrowX = arrowX
, arrowY = arrowY
, openFilePath = path
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, fileBrowser = fileBrowser
, fileBrowserIdx = 0
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r = r
, g = g
, b = b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num = num
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
}
end
fun fileBrowserIdx (app: app_type, newFileBrowserIdx) =
let
val
{ mode
, xClickPoints
, yClickPoints
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, windowWidth
, windowHeight
, triangles
, triangleStage
, undo
, redo
, showGraph
, mouseX
, mouseY
, arrowX
, arrowY
, openFilePath = openFilePath
, fileBrowser = fileBrowser
, fileBrowserIdx = _
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r
, g
, b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
} = app
in
{ mode = mode
, xClickPoints = xClickPoints
, yClickPoints = yClickPoints
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
add fileBrowserIdx field to track which item is selected in the browser
2024-09-29 12:32:11 +01:00
, triangles = triangles
, triangleStage = triangleStage
, windowWidth = windowWidth
, windowHeight = windowHeight
, undo = undo
, redo = redo
, showGraph = showGraph
, mouseX = mouseX
, mouseY = mouseY
, arrowX = arrowX
, arrowY = arrowY
, openFilePath = openFilePath
, fileBrowser = fileBrowser
, fileBrowserIdx = newFileBrowserIdx
add [r, g, b] field to triangle, so we can draw coloured objects (next: add ability to change current colour)
2024-12-29 20:18:29 +00:00
, r = r
, g = g
, b = b
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, num = num
}
end
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
fun num (app: app_type, newNum) : app_type =
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
let
val
{ triangleStage
, mode
, triangles
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, xClickPoints
, yClickPoints
, windowWidth
, windowHeight
, undo
, redo
, showGraph
, mouseX
, mouseY
, arrowX
, arrowY
, openFilePath
, fileBrowser
, fileBrowserIdx
, r
, g
, b
, num = _
} = app
in
{ triangleStage = triangleStage
, undo = undo
, redo = []
, mode = mode
, triangles = triangles
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, xClickPoints = xClickPoints
, yClickPoints = yClickPoints
, windowWidth = windowWidth
, windowHeight = windowHeight
, showGraph = showGraph
, mouseX = mouseX
, mouseY = mouseY
, arrowX = arrowX
, arrowY = arrowY
, openFilePath = openFilePath
, fileBrowser = fileBrowser
, fileBrowserIdx = fileBrowserIdx
, r = r
, g = g
, b = b
, num = newNum
}
end
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
fun r (app: app_type) : app_type =
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
let
val
{ triangleStage
, mode
, triangles
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, xClickPoints
, yClickPoints
, windowWidth
, windowHeight
, undo
, redo
, showGraph
, mouseX
, mouseY
, arrowX
, arrowY
, openFilePath
, fileBrowser
, fileBrowserIdx
, r = _
, g
, b
, num
} = app
val newR = Real32.fromInt num / 255.0
in
{ triangleStage = triangleStage
, undo = undo
, redo = []
, mode = mode
, triangles = triangles
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, xClickPoints = xClickPoints
, yClickPoints = yClickPoints
, windowWidth = windowWidth
, windowHeight = windowHeight
, showGraph = showGraph
, mouseX = mouseX
, mouseY = mouseY
, arrowX = arrowX
, arrowY = arrowY
, openFilePath = openFilePath
, fileBrowser = fileBrowser
, fileBrowserIdx = fileBrowserIdx
, r = newR
, g = g
, b = b
, num = 0
}
end
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
fun g (app: app_type) : app_type =
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
let
val
{ triangleStage
, mode
, triangles
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, xClickPoints
, yClickPoints
, windowWidth
, windowHeight
, undo
, redo
, showGraph
, mouseX
, mouseY
, arrowX
, arrowY
, openFilePath
, fileBrowser
, fileBrowserIdx
, r
, g = _
, b
, num
} = app
val newG = Real32.fromInt num / 255.0
in
{ triangleStage = triangleStage
, undo = undo
, redo = []
, mode = mode
, triangles = triangles
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, xClickPoints = xClickPoints
, yClickPoints = yClickPoints
, windowWidth = windowWidth
, windowHeight = windowHeight
, showGraph = showGraph
, mouseX = mouseX
, mouseY = mouseY
, arrowX = arrowX
, arrowY = arrowY
, openFilePath = openFilePath
, fileBrowser = fileBrowser
, fileBrowserIdx = fileBrowserIdx
, r = r
, g = newG
, b = b
, num = 0
}
end
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
fun b (app: app_type) : app_type =
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
let
val
{ triangleStage
, mode
, triangles
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX
, numClickPointsY
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, xClickPoints
, yClickPoints
, windowWidth
, windowHeight
, undo
, redo
, showGraph
, mouseX
, mouseY
, arrowX
, arrowY
, openFilePath
, fileBrowser
, fileBrowserIdx
, r
, g
, b = _
, num
} = app
val newB = Real32.fromInt num / 255.0
in
{ triangleStage = triangleStage
, undo = undo
, redo = []
, mode = mode
, triangles = triangles
allow width and height to have a different number of click points
2025-02-18 11:53:28 +00:00
, numClickPointsX = numClickPointsX
, numClickPointsY = numClickPointsY
progress with setting rgb (add functions to set in app type)
2024-12-30 04:14:07 +00:00
, xClickPoints = xClickPoints
, yClickPoints = yClickPoints
, windowWidth = windowWidth
, windowHeight = windowHeight
, showGraph = showGraph
, mouseX = mouseX
, mouseY = mouseY
, arrowX = arrowX
, arrowY = arrowY
, openFilePath = openFilePath
, fileBrowser = fileBrowser
, fileBrowserIdx = fileBrowserIdx
, r = r
, g = g
, b = newB
, num = 0
add todo note
2024-09-25 20:34:59 +01:00
}
end
begin refactoring
2024-08-08 00:18:03 +01:00
end
Reference in New Issue Copy Permalink