Ludvig
commited on
Commit
·
ed3da92
1
Parent(s):
e05fa45
Fixes reading defaults for custom gradients. Adds custom gradients for sum tiles
Browse files
design.py
CHANGED
|
@@ -207,16 +207,36 @@ def design_section(
|
|
| 207 |
st.session_state["selected_design_settings"][
|
| 208 |
"palette_use_custom"
|
| 209 |
] = add_toggle_vertical(
|
| 210 |
-
label="Use custom gradient",
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 211 |
)
|
| 212 |
with col3:
|
| 213 |
st.session_state["selected_design_settings"][
|
| 214 |
"palette_custom_low"
|
| 215 |
-
] = st.color_picker(
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 216 |
with col4:
|
| 217 |
st.session_state["selected_design_settings"][
|
| 218 |
"palette_custom_high"
|
| 219 |
-
] = st.color_picker(
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 220 |
|
| 221 |
# Ask for output parameters
|
| 222 |
col1, col2, col3 = st.columns(3)
|
|
@@ -601,7 +621,8 @@ def design_section(
|
|
| 601 |
|
| 602 |
st.write("Sum tile settings:")
|
| 603 |
|
| 604 |
-
|
|
|
|
| 605 |
with col1:
|
| 606 |
st.session_state["selected_design_settings"][
|
| 607 |
"sum_tile_palette"
|
|
@@ -620,8 +641,43 @@ def design_section(
|
|
| 620 |
get_setting_fn=get_uploaded_setting,
|
| 621 |
type_=str,
|
| 622 |
)
|
| 623 |
-
|
| 624 |
with col2:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 625 |
st.session_state["selected_design_settings"][
|
| 626 |
"sum_tile_label"
|
| 627 |
] = st.text_input(
|
|
|
|
| 207 |
st.session_state["selected_design_settings"][
|
| 208 |
"palette_use_custom"
|
| 209 |
] = add_toggle_vertical(
|
| 210 |
+
label="Use custom gradient",
|
| 211 |
+
key="custom_gradient",
|
| 212 |
+
default=get_uploaded_setting(
|
| 213 |
+
key="palette_use_custom",
|
| 214 |
+
default=False,
|
| 215 |
+
type_=bool,
|
| 216 |
+
),
|
| 217 |
)
|
| 218 |
with col3:
|
| 219 |
st.session_state["selected_design_settings"][
|
| 220 |
"palette_custom_low"
|
| 221 |
+
] = st.color_picker(
|
| 222 |
+
"Low color",
|
| 223 |
+
value=get_uploaded_setting(
|
| 224 |
+
key="palette_custom_low",
|
| 225 |
+
default="#B1F9E8",
|
| 226 |
+
type_=str,
|
| 227 |
+
),
|
| 228 |
+
)
|
| 229 |
with col4:
|
| 230 |
st.session_state["selected_design_settings"][
|
| 231 |
"palette_custom_high"
|
| 232 |
+
] = st.color_picker(
|
| 233 |
+
"High color",
|
| 234 |
+
value=get_uploaded_setting(
|
| 235 |
+
key="palette_custom_high",
|
| 236 |
+
default="#239895",
|
| 237 |
+
type_=str,
|
| 238 |
+
),
|
| 239 |
+
)
|
| 240 |
|
| 241 |
# Ask for output parameters
|
| 242 |
col1, col2, col3 = st.columns(3)
|
|
|
|
| 621 |
|
| 622 |
st.write("Sum tile settings:")
|
| 623 |
|
| 624 |
+
# Color palette
|
| 625 |
+
col1, col2, col3, col4 = st.columns([4, 4, 2, 2])
|
| 626 |
with col1:
|
| 627 |
st.session_state["selected_design_settings"][
|
| 628 |
"sum_tile_palette"
|
|
|
|
| 641 |
get_setting_fn=get_uploaded_setting,
|
| 642 |
type_=str,
|
| 643 |
)
|
|
|
|
| 644 |
with col2:
|
| 645 |
+
st.session_state["selected_design_settings"][
|
| 646 |
+
"sum_tile_palette_use_custom"
|
| 647 |
+
] = add_toggle_vertical(
|
| 648 |
+
label="Use custom gradient",
|
| 649 |
+
key="sum_tile_palette_use_custom",
|
| 650 |
+
default=get_uploaded_setting(
|
| 651 |
+
key="sum_tile_palette_use_custom", default=False, type_=bool
|
| 652 |
+
),
|
| 653 |
+
)
|
| 654 |
+
with col3:
|
| 655 |
+
st.session_state["selected_design_settings"][
|
| 656 |
+
"sum_tile_palette_custom_low"
|
| 657 |
+
] = st.color_picker(
|
| 658 |
+
"Low color",
|
| 659 |
+
key="sum_tile_palette_custom_low",
|
| 660 |
+
value=get_uploaded_setting(
|
| 661 |
+
key="sum_tile_palette_custom_low",
|
| 662 |
+
default="#e9e1fc",
|
| 663 |
+
type_=str,
|
| 664 |
+
),
|
| 665 |
+
)
|
| 666 |
+
with col4:
|
| 667 |
+
st.session_state["selected_design_settings"][
|
| 668 |
+
"sum_tile_palette_custom_high"
|
| 669 |
+
] = st.color_picker(
|
| 670 |
+
"High color",
|
| 671 |
+
key="sum_tile_palette_custom_high",
|
| 672 |
+
value=get_uploaded_setting(
|
| 673 |
+
key="sum_tile_palette_custom_high",
|
| 674 |
+
default="#BE94E6",
|
| 675 |
+
type_=str,
|
| 676 |
+
),
|
| 677 |
+
)
|
| 678 |
+
|
| 679 |
+
col1, col2 = st.columns(2)
|
| 680 |
+
with col1:
|
| 681 |
st.session_state["selected_design_settings"][
|
| 682 |
"sum_tile_label"
|
| 683 |
] = st.text_input(
|
plot.R
CHANGED
|
@@ -298,8 +298,15 @@ if (isTRUE(design_settings$palette_use_custom)) {
|
|
| 298 |
# Sum tiles
|
| 299 |
sums_settings <- sum_tile_settings()
|
| 300 |
if (isTRUE(design_settings$show_sums)) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 301 |
sums_settings <- sum_tile_settings(
|
| 302 |
-
palette =
|
| 303 |
label = design_settings$sum_tile_label,
|
| 304 |
tile_border_color = tile_border_color,
|
| 305 |
tile_border_size = design_settings$tile_border_size,
|
|
|
|
| 298 |
# Sum tiles
|
| 299 |
sums_settings <- sum_tile_settings()
|
| 300 |
if (isTRUE(design_settings$show_sums)) {
|
| 301 |
+
sum_tile_palette <- design_settings$sum_tile_palette
|
| 302 |
+
if (isTRUE(design_settings$sum_tile_palette_use_custom)) {
|
| 303 |
+
sum_tile_palette <- list(
|
| 304 |
+
"low" = design_settings$sum_tile_palette_custom_low,
|
| 305 |
+
"high" = design_settings$sum_tile_palette_custom_high
|
| 306 |
+
)
|
| 307 |
+
}
|
| 308 |
sums_settings <- sum_tile_settings(
|
| 309 |
+
palette = sum_tile_palette,
|
| 310 |
label = design_settings$sum_tile_label,
|
| 311 |
tile_border_color = tile_border_color,
|
| 312 |
tile_border_size = design_settings$tile_border_size,
|