aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/dataloader/NodeTools.hpp
diff options
context:
space:
mode:
author George L. Albany <Megacake1234@gmail.com>2023-12-24 23:00:36 +0100
committer GitHub <noreply@github.com>2023-12-24 23:00:36 +0100
commitbf4e7368600bb425b6612231fbb84de34ec99a27 (patch)
treed3b29714d3286b9edbe380f877bbce541344a635 /src/openvic-simulation/dataloader/NodeTools.hpp
parentf036506b88af02508242f279ca29b743ef713976 (diff)
parent3770de7a03879a8ff6b8cf22b402217c19fa2b53 (diff)
Merge pull request #100 from OpenVicProject/change/colour_t_to_struct
Diffstat (limited to 'src/openvic-simulation/dataloader/NodeTools.hpp')
-rw-r--r--src/openvic-simulation/dataloader/NodeTools.hpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/openvic-simulation/dataloader/NodeTools.hpp b/src/openvic-simulation/dataloader/NodeTools.hpp
index 02ff239..c3eaf65 100644
--- a/src/openvic-simulation/dataloader/NodeTools.hpp
+++ b/src/openvic-simulation/dataloader/NodeTools.hpp
@@ -106,8 +106,10 @@ namespace OpenVic {
callback_t<std::string_view> expect_fixed_point_str(callback_t<fixed_point_t> callback);
node_callback_t expect_fixed_point(callback_t<fixed_point_t> callback);
+ /* Expect a list of 3 base 10 values, each either in the range [0, 1] or (1, 255], representing RGB components. */
node_callback_t expect_colour(callback_t<colour_t> callback);
- node_callback_t expect_colour_hex(callback_t<colour_t> callback);
+ /* Expect a hexadecimal value representing a colour in ARGB format. */
+ node_callback_t expect_colour_hex(callback_t<colour_argb_t> callback);
callback_t<std::string_view> expect_date_str(callback_t<Date> callback);
node_callback_t expect_date(callback_t<Date> callback);