Fixes resetting. Refactors and adds templates. Use tile borders in sum settings.

README.md

@@ -14,6 +14,7 @@ Streamlit application for plotting a confusion matrix.
 
 
 ## TODOs
+- Add option to preview plot in black and white (for printed papers)
 - ggsave only uses DPI for scaling? We would expect output files to have the given DPI?
 - Allow svg, pdf?
 - Add full reset button (empty cache on different files) - callback?

app.py

@@ -60,6 +60,7 @@ def input_choice_callback():
     """
     st.session_state["step"] = 0
     st.session_state["input_type"] = None
+    st.session_state["num_resets"] = 0
 
     to_delete = ["classes", "count_data", "uploaded_design_settings"]
     for key in to_delete:
@@ -74,6 +75,9 @@ def input_choice_callback():
     if conf_mat_path.exists():
         conf_mat_path.unlink()
 
+    # Allows design settings to show
+    st.session_state["design_reset_mode"] = False
+
 
 # Text
 intro_text()
@@ -84,7 +88,9 @@ if st.session_state.get("step") is None:
     st.session_state["step"] = 0
 
 input_choice = st.radio(
-    label="Input",
+    label="Input Choice",
+    label_visibility="hidden",
+    key="InputChoice",
     options=["Upload predictions", "Upload counts", "Generate", "Enter counts"],
     index=0,
     horizontal=True,
@@ -358,7 +364,7 @@ if st.session_state["step"] >= 2:
 
         # Section for specifying design settings
 
-        design_settings, design_ready, selected_classes = design_section(
+        design_ready, selected_classes = design_section(
             num_classes=num_classes,
             design_settings_store_path=design_settings_store_path,
         )
@@ -367,7 +373,7 @@ if st.session_state["step"] >= 2:
         # for user to fix issues
         if st.session_state["step"] >= 3 and design_ready:
             DownloadHeader.centered_json_download(
-                data=design_settings,
+                data=st.session_state["selected_design_settings"],
                 file_name="design_settings.json",
                 label="Download design settings",
                 help="Download the design settings to allow reusing settings in future plots.",

design.py

@@ -6,6 +6,7 @@ from PIL import Image
 from text_sections import (
     design_text,
 )
+from templates import get_templates
 
 
 def _add_select_box(
@@ -31,110 +32,99 @@ def _add_select_box(
     )
 
 
-templates = {
-    "grey_1": {
-        "Grey 2-class": {
-            "settings": "design_settings.grey_nc2_1.1.json",
-            "image": "grey_nc2_1.1.jpg",
-        },
-        "Grey 3-class": {
-            "settings": "design_settings.grey_nc3_1.1.json",
-            "image": "grey_nc3_1.1.jpg",
-        },
-        "Grey 2-class with sums": {
-            "settings": "design_settings.grey_nc2_sums_1.1.json",
-            "image": "grey_nc2_sums_1.1.jpg",
-        },
-    }
-}
-
-template_selections = {}
+templates = get_templates()
 
 
-def design_section(
-    num_classes,
-    design_settings_store_path,
-):
-    output = {}
-
+def select_settings():
     def reset_output_callback():
-        output.clear()
+        st.session_state["selected_design_settings"].clear()
         if "uploaded_design_settings" in st.session_state:
             del st.session_state["uploaded_design_settings"]
+        st.session_state["step"] = 2
+        st.session_state["design_reset_mode"] = True
+        st.session_state["num_resets"] += 1
 
-    with st.form(key="settings_upload_form"):
-        design_text()
-
-        with st.expander("Templates"):
-            for temp_collection_name, temp_collection in templates.items():
-                cols = st.columns(3)
-                for i, (temp_name, template) in enumerate(temp_collection.items()):
-                    temp_image = Image.open(f"templates/{template['image']}")
-                    # temp_settings =
-                    with cols[i % 3]:
-                        st.image(
-                            temp_image,
-                            # caption="Confusion Matrix",
-                            clamp=False,
-                            channels="RGB",
-                            output_format="auto",
-                        )
-                template_selections[temp_collection_name] = st.radio(
-                    "Select template",
-                    index=0,
-                    options=["--"] + list(temp_collection.keys()),
-                    horizontal=True,
-                )
-
-                st.markdown("---")
-
-        with st.expander("Upload settings"):
-            uploaded_settings_path = st.file_uploader(
-                "Upload design settings", type=["json"]
+    with st.expander("Templates"):
+        col1, col2, _ = st.columns([1, 1, 3])
+        with col1:
+            # Find template with num classes closest to
+            # the number of classes in the data
+            templates_available_num_classes = sorted(
+                set([d["num_classes"] for d in templates.values()])
             )
+            closest_num_classes_distance = 99999
+            closest_num_classes_idx = -1
+            for idx, n in enumerate(templates_available_num_classes):
+                distance = abs(n - len(st.session_state["classes"]))
+                if distance < closest_num_classes_distance:
+                    closest_num_classes_distance = distance
+                    closest_num_classes_idx = idx
+
+            n_classes = st.selectbox(
+                "Number of classes",
+                index=closest_num_classes_idx + 1,
+                options=[-1] + templates_available_num_classes,
+            )
+        with col2:
+            st.write(" ")
+            st.write(" ")
+            has_sums = st.checkbox("Sum tiles", value=False)
+
+        filtered_templates = {
+            temp_name: temp
+            for temp_name, temp in templates.items()
+            if (n_classes == -1 or temp["num_classes"] == n_classes)
+            and temp["sums"] == has_sums
+        }
+
+        num_cols = 3
+        for i, (temp_name, template) in enumerate(filtered_templates.items()):
+            if i % num_cols == 0:
+                cols = st.columns(num_cols)
+            temp_image = Image.open(f"template_resources/{template['image']}")
+            with cols[i % 3]:
+                st.image(
+                    temp_image,
+                    clamp=False,
+                    channels="RGB",
+                    output_format="auto",
+                )
+                _, col2, _ = st.columns([5, 6, 5])
+                with col2:
+                    if st.button("Select", key=temp_name.replace(" ", "_")):
+                        with open(
+                            "template_resources/" + template["settings"],
+                            "r",
+                        ) as jfile:
+                            st.session_state["uploaded_design_settings"] = json.load(
+                                jfile
+                            )
 
-        if st.form_submit_button(
-            label="Apply settings", on_click=reset_output_callback
-        ):
-            selections = [
-                (temp_coll_name, selection)
-                for temp_coll_name, selection in template_selections.items()
-                if selection != "--"
-            ]
-            if len(selections) > 1:
-                st.warning("More than one template was selected. The first is applied.")
-            template_selected = "--"
-            if selections:
-                selection_temp_coll_name, selection = selections[0]
-                template_selected = selection
-
+    with st.expander("Upload settings"):
+        uploaded_settings_path = st.file_uploader(
+            "Upload design settings", type=["json"]
+        )
+        if st.button(label="Apply settings", on_click=reset_output_callback):
             if uploaded_settings_path is not None:
-                if template_selected != "--":
-                    st.warning(
-                        "When both selecting a template and uploading settings, "
-                        "the uploaded settings are used."
-                    )
                 st.session_state["uploaded_design_settings"] = json.load(
                     uploaded_settings_path
                 )
-            elif template_selected != "--":
-                with open(
-                    "templates/"
-                    + templates[selection_temp_coll_name][template_selected][
-                        "settings"
-                    ],
-                    "r",
-                ) as jfile:
-                    st.session_state["uploaded_design_settings"] = json.load(jfile)
-            else:
-                st.warning(
-                    "No settings were uploaded and no templates were selected. Both are *optional*."
-                )
 
-    col1, col2, col1 = st.columns([5, 2.5, 5])
+    _, col2, _ = st.columns([5, 2.5, 5])
     with col2:
         st.button("Reset design", on_click=reset_output_callback)
 
+
+def design_section(
+    num_classes,
+    design_settings_store_path,
+):
+    st.session_state["selected_design_settings"] = {}
+
+    st.markdown("---")
+    design_text()
+    select_settings()
+
     def get_uploaded_setting(key, default, type_=None, options=None):
         if (
             "uploaded_design_settings" in st.session_state
@@ -156,475 +146,589 @@ def design_section(
             return out
         return default
 
-    with st.form(key="settings_form"):
-        col1, col2, col3 = st.columns([4, 2, 2])
-        with col1:
-            selected_classes = st.multiselect(
-                "Select classes (min=2, order is respected)",
-                options=st.session_state["classes"],
-                default=st.session_state["classes"],
-                help="Select the classes to create the confusion matrix for. "
-                "Any observation with either a target or prediction "
-                "of another class is excluded.",
-            )
-            # Reverse by default
-            selected_classes.reverse()
-        with col2:
-            st.write(" ")
-            st.write(" ")
-            reverse_class_order = st.checkbox(
-                "Reverse order", value=False, help="Reverse the order of the classes."
-            )
-
-        # Color palette
-        col1, col2, col3, col4 = st.columns([4, 4, 2, 2])
-        with col1:
-            output["palette"] = _add_select_box(
-                key="palette",
-                label="Color Palette",
-                default="Blues",
-                options=["Blues", "Greens", "Oranges", "Greys", "Purples", "Reds"],
-                get_setting_fn=get_uploaded_setting,
-                type_=str,
-                help="Color of the tiles. Select a preset color palette or create a custom gradient. ",
-            )
-        with col2:
-            st.write("")
-            st.write(" ")
-            output["palette_use_custom"] = st.checkbox(
-                "Custom gradient",
-                value=False,
-                help="Use a custom gradient for coloring the tiles.",
-            )
-        with col3:
-            output["palette_custom_low"] = st.color_picker("Low color", value="#B1F9E8")
-        with col4:
-            output["palette_custom_high"] = st.color_picker(
-                "High color", value="#239895"
-            )
+    if st.session_state["design_reset_mode"]:
+        if "form_placeholder" in st.session_state:
+            st.session_state["form_placeholder"].empty()
+        st.session_state["design_reset_mode"] = False
 
-        # Ask for output parameters
-        col1, col2, col3 = st.columns(3)
-        with col1:
-            output["width"] = st.number_input(
-                "Width (px)",
-                value=get_uploaded_setting(
-                    key="width", default=1200 + 100 * (num_classes - 2), type_=int
-                ),
-                step=50,
-            )
-        with col2:
-            output["height"] = st.number_input(
-                "Height (px)",
-                value=get_uploaded_setting(
-                    key="width", default=1200 + 100 * (num_classes - 2), type_=int
-                ),
-                step=50,
-            )
-        with col3:
-            output["dpi"] = st.number_input(
-                "DPI (scaling)",
-                value=get_uploaded_setting(key="dpi", default=320, type_=int),
-                step=10,
-                help="While the output file *currently* won't have this DPI, "
-                "the DPI setting affects scaling of elements. ",
-            )
-
-        st.write(" ")  # Slightly bigger gap between the two sections
-        col1, col2, col3 = st.columns(3)
-        with col1:
-            output["show_counts"] = st.checkbox(
-                "Show Counts",
-                value=get_uploaded_setting(key="show_counts", default=True, type_=bool),
-            )
-        with col2:
-            output["show_normalized"] = st.checkbox(
-                "Show Normalized (%)",
-                value=get_uploaded_setting(
-                    key="show_normalized", default=True, type_=bool
-                ),
-            )
-        with col3:
-            output["show_sums"] = st.checkbox(
-                "Show Sum Tiles",
-                value=get_uploaded_setting(key="show_sums", default=False, type_=bool),
-                help="Show extra row and column with the "
-                "totals for that row/column.",
-            )
-
-        st.markdown("""---""")
-        st.markdown("**Advanced**:")
-
-        with st.expander("Labels"):
-            col1, col2 = st.columns(2)
+    st.session_state["form_placeholder"] = st.empty()
+    with st.session_state["form_placeholder"].container():
+        with st.form(key=f"settings_form_{st.session_state['num_resets']}"):
+            col1, col2, col3 = st.columns([4, 2, 2])
             with col1:
-                output["x_label"] = st.text_input(
-                    "x-axis",
-                    value=get_uploaded_setting(
-                        key="x_label", default="True Class", type_=str
-                    ),
+                selected_classes = st.multiselect(
+                    "Select classes (min=2, order is respected)",
+                    options=st.session_state["classes"],
+                    default=st.session_state["classes"],
+                    help="Select the classes to create the confusion matrix for. "
+                    "Any observation with either a target or prediction "
+                    "of another class is excluded.",
                 )
+                # Reverse by default
+                selected_classes.reverse()
             with col2:
-                output["y_label"] = st.text_input(
-                    "y-axis",
-                    value=get_uploaded_setting(
-                        key="y_label", default="Predicted Class", type_=str
-                    ),
+                st.write(" ")
+                st.write(" ")
+                reverse_class_order = st.checkbox(
+                    "Reverse order",
+                    value=False,
+                    help="Reverse the order of the classes.",
                 )
 
-            st.markdown("---")
-            col1, col2 = st.columns(2)
+            # Color palette
+            col1, col2, col3, col4 = st.columns([4, 4, 2, 2])
             with col1:
-                output["title_label"] = st.text_input(
-                    "Title",
-                    value=get_uploaded_setting(
-                        key="title_label", default="", type_=str
-                    ),
+                st.session_state["selected_design_settings"][
+                    "palette"
+                ] = _add_select_box(
+                    key="palette",
+                    label="Color Palette",
+                    default="Blues",
+                    options=[
+                        "Blues",
+                        "Greens",
+                        "Oranges",
+                        "Greys",
+                        "Purples",
+                        "Reds",
+                    ],
+                    get_setting_fn=get_uploaded_setting,
+                    type_=str,
+                    help="Color of the tiles. Select a preset color palette or create a custom gradient. ",
                 )
             with col2:
-                output["caption_label"] = st.text_input(
-                    "Caption",
-                    value=get_uploaded_setting(
-                        key="caption_label", default="", type_=str
-                    ),
+                st.write("")
+                st.write(" ")
+                st.session_state["selected_design_settings"][
+                    "palette_use_custom"
+                ] = st.checkbox(
+                    "Custom gradient",
+                    value=False,
+                    help="Use a custom gradient for coloring the tiles.",
                 )
-            st.info(
-                "Note: When adding a title or caption, "
-                "you may need to adjust the height and "
-                "width of the plot as well."
-            )
-
-        with st.expander("Elements"):
-            col1, col2 = st.columns(2)
+            with col3:
+                st.session_state["selected_design_settings"][
+                    "palette_custom_low"
+                ] = st.color_picker("Low color", value="#B1F9E8")
+            with col4:
+                st.session_state["selected_design_settings"][
+                    "palette_custom_high"
+                ] = st.color_picker("High color", value="#239895")
+
+            # Ask for output parameters
+            col1, col2, col3 = st.columns(3)
             with col1:
-                output["rotate_y_text"] = st.checkbox(
-                    "Rotate y-axis text",
+                st.session_state["selected_design_settings"]["width"] = st.number_input(
+                    "Width (px)",
                     value=get_uploaded_setting(
-                        key="rotate_y_text", default=True, type_=bool
+                        key="width", default=1200 + 100 * (num_classes - 2), type_=int
                     ),
+                    step=50,
                 )
-                output["place_x_axis_above"] = st.checkbox(
-                    "Place x-axis on top",
-                    value=get_uploaded_setting(
-                        key="place_x_axis_above", default=True, type_=bool
-                    ),
-                )
-                output["counts_on_top"] = st.checkbox(
-                    "Counts on top",
+            with col2:
+                st.session_state["selected_design_settings"][
+                    "height"
+                ] = st.number_input(
+                    "Height (px)",
                     value=get_uploaded_setting(
-                        key="counts_on_top", default=False, type_=bool
+                        key="width",
+                        default=1200 + 100 * (num_classes - 2),
+                        type_=int,
                     ),
-                    help="Whether to switch the positions of the counts and normalized counts (%). "
-                    "The counts become the big centralized numbers and the "
-                    "normalized counts go below with a smaller font size.",
+                    step=50,
                 )
-            with col2:
-                output["num_digits"] = st.number_input(
-                    "Digits",
-                    value=get_uploaded_setting(key="num_digits", default=2, type_=int),
-                    help="Number of digits to round percentages to.",
+            with col3:
+                st.session_state["selected_design_settings"]["dpi"] = st.number_input(
+                    "DPI (scaling)",
+                    value=get_uploaded_setting(key="dpi", default=320, type_=int),
+                    step=10,
+                    help="While the output file *currently* won't have this DPI, "
+                    "the DPI setting affects scaling of elements. ",
                 )
 
-            st.markdown("""---""")
-
-            col1, col2 = st.columns(2)
+            st.write(" ")  # Slightly bigger gap between the two sections
+            col1, col2, col3 = st.columns(3)
             with col1:
-                st.write("Row and column percentages:")
-                output["show_row_percentages"] = st.checkbox(
-                    "Show row percentages",
+                st.session_state["selected_design_settings"][
+                    "show_counts"
+                ] = st.checkbox(
+                    "Show Counts",
                     value=get_uploaded_setting(
-                        key="show_row_percentages", default=num_classes < 6, type_=bool
+                        key="show_counts", default=True, type_=bool
                     ),
                 )
-                output["show_col_percentages"] = st.checkbox(
-                    "Show column percentages",
-                    value=get_uploaded_setting(
-                        key="show_col_percentages", default=num_classes < 6, type_=bool
-                    ),
-                )
-                output["show_arrows"] = st.checkbox(
-                    "Show arrows",
+            with col2:
+                st.session_state["selected_design_settings"][
+                    "show_normalized"
+                ] = st.checkbox(
+                    "Show Normalized (%)",
                     value=get_uploaded_setting(
-                        key="show_arrows", default=True, type_=bool
+                        key="show_normalized", default=True, type_=bool
                     ),
                 )
-                output["diag_percentages_only"] = st.checkbox(
-                    "Diagonal row/column percentages only",
+            with col3:
+                st.session_state["selected_design_settings"]["show_sums"] = st.checkbox(
+                    "Show Sum Tiles",
                     value=get_uploaded_setting(
-                        key="diag_percentages_only", default=False, type_=bool
+                        key="show_sums", default=False, type_=bool
                     ),
+                    help="Show extra row and column with the "
+                    "totals for that row/column.",
                 )
-            with col2:
-                output["arrow_size"] = (
-                    st.slider(
-                        "Arrow size",
+
+            st.markdown("""---""")
+            st.markdown("**Advanced**:")
+
+            with st.expander("Labels"):
+                col1, col2 = st.columns(2)
+                with col1:
+                    st.session_state["selected_design_settings"][
+                        "x_label"
+                    ] = st.text_input(
+                        "x-axis",
                         value=get_uploaded_setting(
-                            key="arrow_size", default=0.048, type_=float
-                        ) * 10,
-                        min_value=0.03 * 10,
-                        max_value=0.06 * 10,
-                        step=0.001 * 10,
+                            key="x_label", default="True Class", type_=str
+                        ),
                     )
-                    / 10
-                )
-                output["arrow_nudge_from_text"] = (
-                    st.slider(
-                        "Arrow nudge from text",
+                with col2:
+                    st.session_state["selected_design_settings"][
+                        "y_label"
+                    ] = st.text_input(
+                        "y-axis",
                         value=get_uploaded_setting(
-                            key="arrow_nudge_from_text", default=0.065, type_=float
-                        ) * 10,
-                        min_value=0.00,
-                        max_value=0.1 * 10,
-                        step=0.001 * 10,
+                            key="y_label", default="Predicted Class", type_=str
+                        ),
                     )
-                    / 10
-                )
 
-        with st.expander("Tiles"):
-            col1, col2 = st.columns(2)
-            with col1:
-                output["intensity_by"] = _add_select_box(
-                    key="intensity_by",
-                    label="Intensity based on",
-                    default="Counts",
-                    options=[
-                        "Counts",
-                        "Normalized (%)",
-                        "Log Counts",
-                        "Log2 Counts",
-                        "Log10 Counts",
-                        "Arcsinh Counts",
-                    ],
-                    get_setting_fn=get_uploaded_setting,
-                    type_=str,
-                )
-            with col2:
-                output["darkness"] = st.slider(
-                    "Darkness",
-                    min_value=0.0,
-                    max_value=1.0,
-                    value=get_uploaded_setting(
-                        key="darkness", default=0.8, type_=float
-                    ),
-                    step=0.01,
-                    help="How dark the darkest colors should be, between 0 and 1, where 1 is darkest.",
+                st.markdown("---")
+                col1, col2 = st.columns(2)
+                with col1:
+                    st.session_state["selected_design_settings"][
+                        "title_label"
+                    ] = st.text_input(
+                        "Title",
+                        value=get_uploaded_setting(
+                            key="title_label", default="", type_=str
+                        ),
+                    )
+                with col2:
+                    st.session_state["selected_design_settings"][
+                        "caption_label"
+                    ] = st.text_input(
+                        "Caption",
+                        value=get_uploaded_setting(
+                            key="caption_label", default="", type_=str
+                        ),
+                    )
+                st.info(
+                    "Note: When adding a title or caption, "
+                    "you may need to adjust the height and "
+                    "width of the plot as well."
                 )
 
-            st.markdown("""---""")
+            with st.expander("Elements"):
+                col1, col2 = st.columns(2)
+                with col1:
+                    st.session_state["selected_design_settings"][
+                        "rotate_y_text"
+                    ] = st.checkbox(
+                        "Rotate y-axis text",
+                        value=get_uploaded_setting(
+                            key="rotate_y_text", default=True, type_=bool
+                        ),
+                    )
+                    st.session_state["selected_design_settings"][
+                        "place_x_axis_above"
+                    ] = st.checkbox(
+                        "Place x-axis on top",
+                        value=get_uploaded_setting(
+                            key="place_x_axis_above", default=True, type_=bool
+                        ),
+                    )
+                    st.session_state["selected_design_settings"][
+                        "counts_on_top"
+                    ] = st.checkbox(
+                        "Counts on top",
+                        value=get_uploaded_setting(
+                            key="counts_on_top", default=False, type_=bool
+                        ),
+                        help="Whether to switch the positions of the counts and normalized counts (%). "
+                        "The counts become the big centralized numbers and the "
+                        "normalized counts go below with a smaller font size.",
+                    )
+                with col2:
+                    st.session_state["selected_design_settings"][
+                        "num_digits"
+                    ] = st.number_input(
+                        "Digits",
+                        value=get_uploaded_setting(
+                            key="num_digits", default=2, type_=int
+                        ),
+                        help="Number of digits to round percentages to.",
+                    )
 
-            output["show_tile_border"] = st.checkbox(
-                "Add tile borders",
-                value=get_uploaded_setting(
-                    key="show_tile_border", default=False, type_=bool
-                ),
-            )
+                st.markdown("""---""")
 
-            col1, col2, col3 = st.columns(3)
-            with col1:
-                output["tile_border_color"] = st.color_picker(
-                    "Border color",
-                    value=get_uploaded_setting(
-                        key="tile_border_color", default="#000000", type_=str
-                    ),
-                )
-            with col2:
-                output["tile_border_size"] = st.slider(
-                    "Border size",
-                    min_value=0.0,
-                    max_value=3.0,
-                    value=get_uploaded_setting(
-                        key="tile_border_size", default=0.1, type_=float
-                    ),
-                    step=0.01,
-                )
-            with col3:
-                output["tile_border_linetype"] = _add_select_box(
-                    key="tile_border_linetype",
-                    label="Border linetype",
-                    default="solid",
-                    options=[
-                        "solid",
-                        "dashed",
-                        "dotted",
-                        "dotdash",
-                        "longdash",
-                        "twodash",
-                    ],
-                    get_setting_fn=get_uploaded_setting,
-                    type_=str,
-                )
-
-            st.markdown("""---""")
+                col1, col2 = st.columns(2)
+                with col1:
+                    st.write("Row and column percentages:")
+                    st.session_state["selected_design_settings"][
+                        "show_row_percentages"
+                    ] = st.checkbox(
+                        "Show row percentages",
+                        value=get_uploaded_setting(
+                            key="show_row_percentages",
+                            default=num_classes < 6,
+                            type_=bool,
+                        ),
+                    )
+                    st.session_state["selected_design_settings"][
+                        "show_col_percentages"
+                    ] = st.checkbox(
+                        "Show column percentages",
+                        value=get_uploaded_setting(
+                            key="show_col_percentages",
+                            default=num_classes < 6,
+                            type_=bool,
+                        ),
+                    )
+                    st.session_state["selected_design_settings"][
+                        "show_arrows"
+                    ] = st.checkbox(
+                        "Show arrows",
+                        value=get_uploaded_setting(
+                            key="show_arrows", default=True, type_=bool
+                        ),
+                    )
+                    st.session_state["selected_design_settings"][
+                        "diag_percentages_only"
+                    ] = st.checkbox(
+                        "Diagonal row/column percentages only",
+                        value=get_uploaded_setting(
+                            key="diag_percentages_only",
+                            default=False,
+                            type_=bool,
+                        ),
+                    )
+                with col2:
+                    st.session_state["selected_design_settings"]["arrow_size"] = (
+                        st.slider(
+                            "Arrow size",
+                            value=get_uploaded_setting(
+                                key="arrow_size", default=0.048, type_=float
+                            )
+                            * 10,
+                            min_value=0.03 * 10,
+                            max_value=0.06 * 10,
+                            step=0.001 * 10,
+                        )
+                        / 10
+                    )
+                    st.session_state["selected_design_settings"][
+                        "arrow_nudge_from_text"
+                    ] = (
+                        st.slider(
+                            "Arrow nudge from text",
+                            value=get_uploaded_setting(
+                                key="arrow_nudge_from_text",
+                                default=0.065,
+                                type_=float,
+                            )
+                            * 10,
+                            min_value=0.00,
+                            max_value=0.1 * 10,
+                            step=0.001 * 10,
+                        )
+                        / 10
+                    )
 
-            st.write("Sum tile settings:")
+            with st.expander("Tiles"):
+                col1, col2 = st.columns(2)
+                with col1:
+                    st.session_state["selected_design_settings"][
+                        "intensity_by"
+                    ] = _add_select_box(
+                        key="intensity_by",
+                        label="Intensity based on",
+                        default="Counts",
+                        options=[
+                            "Counts",
+                            "Normalized (%)",
+                            "Log Counts",
+                            "Log2 Counts",
+                            "Log10 Counts",
+                            "Arcsinh Counts",
+                        ],
+                        get_setting_fn=get_uploaded_setting,
+                        type_=str,
+                    )
+                with col2:
+                    st.session_state["selected_design_settings"][
+                        "darkness"
+                    ] = st.slider(
+                        "Darkness",
+                        min_value=0.0,
+                        max_value=1.0,
+                        value=get_uploaded_setting(
+                            key="darkness", default=0.8, type_=float
+                        ),
+                        step=0.01,
+                        help="How dark the darkest colors should be, between 0 and 1, where 1 is darkest.",
+                    )
 
-            col1, col2 = st.columns(2)
-            with col1:
-                output["sum_tile_palette"] = _add_select_box(
-                    key="sum_tile_palette",
-                    label="Color Palette",
-                    default="Greens",
-                    options=["Greens", "Oranges", "Greys", "Purples", "Reds", "Blues"],
-                    get_setting_fn=get_uploaded_setting,
-                    type_=str,
-                )
+                st.markdown("""---""")
 
-            with col2:
-                output["sum_tile_label"] = st.text_input(
-                    "Label",
+                st.session_state["selected_design_settings"][
+                    "show_tile_border"
+                ] = st.checkbox(
+                    "Add tile borders",
                     value=get_uploaded_setting(
-                        key="sum_tile_label", default="Σ", type_=str
+                        key="show_tile_border", default=False, type_=bool
                     ),
-                    key="sum_tiles_label",
                 )
 
-            #   tile_fill = NULL,
-            #   font_color = NULL,
-            #   tile_border_color = NULL,
-            #   tile_border_size = NULL,
-            #   tile_border_linetype = NULL,
-            #   tc_tile_fill = NULL,
-            #   tc_font_color = NULL,
-            #   tc_tile_border_color = NULL,
-            #   tc_tile_border_size = NULL,
-            #   tc_tile_border_linetype = NULL
-
-        with st.expander("Zero Counts"):
-            st.write("Special settings for tiles where the count is 0:")
-            col1, col2, col3 = st.columns(3)
-            with col1:
-                output["show_zero_shading"] = st.checkbox(
-                    "Add shading",
-                    value=get_uploaded_setting(
-                        key="show_zero_shading", default=True, type_=bool
-                    ),
-                )
-            with col2:
-                output["show_zero_text"] = st.checkbox(
-                    "Show text",
-                    value=get_uploaded_setting(
-                        key="show_zero_text", default=False, type_=bool
-                    ),
-                    help="Whether to show counts, normalized (%), etc.",
-                )
-            with col3:
-                output["show_zero_percentages"] = st.checkbox(
-                    "Show row/column percentages",
-                    value=get_uploaded_setting(
-                        key="show_zero_percentages", default=False, type_=bool
-                    ),
-                    help="Only relevant when row/column percentages are enabled.",
-                )
+                col1, col2, col3 = st.columns(3)
+                with col1:
+                    st.session_state["selected_design_settings"][
+                        "tile_border_color"
+                    ] = st.color_picker(
+                        "Border color",
+                        value=get_uploaded_setting(
+                            key="tile_border_color",
+                            default="#000000",
+                            type_=str,
+                        ),
+                    )
+                with col2:
+                    st.session_state["selected_design_settings"][
+                        "tile_border_size"
+                    ] = st.slider(
+                        "Border size",
+                        min_value=0.0,
+                        max_value=3.0,
+                        value=get_uploaded_setting(
+                            key="tile_border_size", default=0.1, type_=float
+                        ),
+                        step=0.01,
+                    )
+                with col3:
+                    st.session_state["selected_design_settings"][
+                        "tile_border_linetype"
+                    ] = _add_select_box(
+                        key="tile_border_linetype",
+                        label="Border linetype",
+                        default="solid",
+                        options=[
+                            "solid",
+                            "dashed",
+                            "dotted",
+                            "dotdash",
+                            "longdash",
+                            "twodash",
+                        ],
+                        get_setting_fn=get_uploaded_setting,
+                        type_=str,
+                    )
 
-        if True:
-            with st.expander("Fonts"):
-                # Specify available settings and defaults per font
-                font_types = {
-                    "Top Font": {
-                        "key_prefix": "font_top",
-                        "description": "The big text in the middle (normalized (%) by default).",
-                        "settings": {
-                            "size": 4.3,  # 2.8
-                            "color": "#000000",
-                            "alpha": 1.0,
-                            "bold": False,
-                            "italic": False,
+                st.markdown("""---""")
+
+                st.write("Sum tile settings:")
+
+                col1, col2 = st.columns(2)
+                with col1:
+                    st.session_state["selected_design_settings"][
+                        "sum_tile_palette"
+                    ] = _add_select_box(
+                        key="sum_tile_palette",
+                        label="Color Palette",
+                        default="Greens",
+                        options=[
+                            "Greens",
+                            "Oranges",
+                            "Greys",
+                            "Purples",
+                            "Reds",
+                            "Blues",
+                        ],
+                        get_setting_fn=get_uploaded_setting,
+                        type_=str,
+                    )
+
+                with col2:
+                    st.session_state["selected_design_settings"][
+                        "sum_tile_label"
+                    ] = st.text_input(
+                        "Label",
+                        value=get_uploaded_setting(
+                            key="sum_tile_label", default="Σ", type_=str
+                        ),
+                        key="sum_tiles_label",
+                    )
+
+                #   tile_fill = NULL,
+                #   font_color = NULL,
+                #   tile_border_color = NULL,
+                #   tile_border_size = NULL,
+                #   tile_border_linetype = NULL,
+                #   tc_tile_fill = NULL,
+                #   tc_font_color = NULL,
+                #   tc_tile_border_color = NULL,
+                #   tc_tile_border_size = NULL,
+                #   tc_tile_border_linetype = NULL
+
+            with st.expander("Zero Counts"):
+                st.write("Special settings for tiles where the count is 0:")
+                col1, col2, col3 = st.columns(3)
+                with col1:
+                    st.session_state["selected_design_settings"][
+                        "show_zero_shading"
+                    ] = st.checkbox(
+                        "Add shading",
+                        value=get_uploaded_setting(
+                            key="show_zero_shading", default=True, type_=bool
+                        ),
+                    )
+                with col2:
+                    st.session_state["selected_design_settings"][
+                        "show_zero_text"
+                    ] = st.checkbox(
+                        "Show text",
+                        value=get_uploaded_setting(
+                            key="show_zero_text", default=False, type_=bool
+                        ),
+                        help="Whether to show counts, normalized (%), etc.",
+                    )
+                with col3:
+                    st.session_state["selected_design_settings"][
+                        "show_zero_percentages"
+                    ] = st.checkbox(
+                        "Show row/column percentages",
+                        value=get_uploaded_setting(
+                            key="show_zero_percentages",
+                            default=False,
+                            type_=bool,
+                        ),
+                        help="Only relevant when row/column percentages are enabled.",
+                    )
+
+            if True:
+                with st.expander("Fonts"):
+                    # Specify available settings and defaults per font
+                    font_types = {
+                        "Top Font": {
+                            "key_prefix": "font_top",
+                            "description": "The big text in the middle (normalized (%) by default).",
+                            "settings": {
+                                "size": 4.3,  # 2.8
+                                "color": "#000000",
+                                "alpha": 1.0,
+                                "bold": False,
+                                "italic": False,
+                            },
                         },
-                    },
-                    "Bottom Font": {
-                        "key_prefix": "font_bottom",
-                        "description": "The text just below the top font (counts by default).",
-                        "settings": {
-                            "size": 2.8,
-                            "color": "#000000",
-                            "alpha": 1.0,
-                            "bold": False,
-                            "italic": False,
+                        "Bottom Font": {
+                            "key_prefix": "font_bottom",
+                            "description": "The text just below the top font (counts by default).",
+                            "settings": {
+                                "size": 2.8,
+                                "color": "#000000",
+                                "alpha": 1.0,
+                                "bold": False,
+                                "italic": False,
+                            },
                         },
-                    },
-                    "Percentages Font": {
-                        "key_prefix": "font_percentage",
-                        "description": "The row and column percentages.",
-                        "settings": {
-                            "size": 2.35,
-                            "color": "#000000",
-                            "alpha": 0.85,
-                            "bold": False,
-                            "italic": True,
-                            "suffix": "%",
-                            "prefix": "",
+                        "Percentages Font": {
+                            "key_prefix": "font_percentage",
+                            "description": "The row and column percentages.",
+                            "settings": {
+                                "size": 2.35,
+                                "color": "#000000",
+                                "alpha": 0.85,
+                                "bold": False,
+                                "italic": True,
+                                "suffix": "%",
+                                "prefix": "",
+                            },
                         },
-                    },
-                    "Normalized (%)": {
-                        "key_prefix": "font_normalized",
-                        "description": "Special settings for the normalized (%) text.",
-                        "settings": {"suffix": "%", "prefix": ""},
-                    },
-                    "Counts": {
-                        "key_prefix": "font_counts",
-                        "description": "Special settings for the counts text.",
-                        "settings": {"suffix": "", "prefix": ""},
-                    },
-                }
-
-                for font_type_title, font_type_spec in font_types.items():
-                    st.markdown(f"**{font_type_title}**")
-                    st.markdown(font_type_spec["description"])
-                    num_cols = 3
-                    font_settings = create_font_settings(
-                        key_prefix=font_type_spec["key_prefix"],
-                        get_setting_fn=get_uploaded_setting,
-                        settings_to_get=list(font_type_spec["settings"].keys()),
-                    )
+                        "Normalized (%)": {
+                            "key_prefix": "font_normalized",
+                            "description": "Special settings for the normalized (%) text.",
+                            "settings": {"suffix": "%", "prefix": ""},
+                        },
+                        "Counts": {
+                            "key_prefix": "font_counts",
+                            "description": "Special settings for the counts text.",
+                            "settings": {"suffix": "", "prefix": ""},
+                        },
+                    }
+
+                    for font_type_title, font_type_spec in font_types.items():
+                        st.markdown(f"**{font_type_title}**")
+                        st.markdown(font_type_spec["description"])
+                        num_cols = 3
+                        font_settings = create_font_settings(
+                            key_prefix=font_type_spec["key_prefix"],
+                            get_setting_fn=get_uploaded_setting,
+                            settings_to_get=list(font_type_spec["settings"].keys()),
+                        )
 
-                    for i, (setting_name, setting_widget) in enumerate(
-                        font_settings.items()
-                    ):
-                        if i % num_cols == 0:
-                            cols = st.columns(num_cols)
-                        with cols[i % num_cols]:
-                            default = font_type_spec["settings"][
-                                setting_name[len(font_type_spec["key_prefix"]) + 1 :]
-                            ]
-                            output[setting_name] = setting_widget(
-                                k=setting_name, d=default
-                            )
+                        for i, (setting_name, setting_widget) in enumerate(
+                            font_settings.items()
+                        ):
+                            if i % num_cols == 0:
+                                cols = st.columns(num_cols)
+                            with cols[i % num_cols]:
+                                default = font_type_spec["settings"][
+                                    setting_name[
+                                        len(font_type_spec["key_prefix"]) + 1 :
+                                    ]
+                                ]
+                                st.session_state["selected_design_settings"][
+                                    setting_name
+                                ] = setting_widget(k=setting_name, d=default)
+
+                        if font_type_title != list(font_types.keys())[-1]:
+                            st.markdown("""---""")
 
-                    if font_type_title != list(font_types.keys())[-1]:
-                        st.markdown("""---""")
-
-        st.markdown("""---""")
-
-        if st.form_submit_button(label="Generate plot"):
-            st.session_state["step"] = 3
-            if (
-                not output["show_sums"]
-                or output["sum_tile_palette"] != output["palette"]
-            ):
-                # Save settings as json
-                with open(design_settings_store_path, "w") as f:
-                    json.dump(output, f)
-            if not output["place_x_axis_above"]:
-                selected_classes.reverse()
-            if reverse_class_order:
-                selected_classes.reverse()
+            st.markdown("""---""")
 
-        design_ready = False
-        if st.session_state["step"] >= 3:
-            design_ready = True
-            if output["show_sums"] and output["sum_tile_palette"] == output["palette"]:
-                st.error(
-                    "The color palettes (background colors) "
-                    "for the tiles and sum tiles are identical. "
-                    "Please select a different color palette for "
-                    "the sum tiles under **Tiles** >> *Sum tile settings*."
-                )
-                design_ready = False
-            if len(selected_classes) < 2:
-                st.error("At least 2 classes must be selected.")
-                design_ready = False
+            if st.form_submit_button(label="Generate plot"):
+                st.session_state["step"] = 3
+                if (
+                    not st.session_state["selected_design_settings"]["show_sums"]
+                    or st.session_state["selected_design_settings"]["sum_tile_palette"]
+                    != st.session_state["selected_design_settings"]["palette"]
+                ):
+                    # Save settings as json
+                    with open(design_settings_store_path, "w") as f:
+                        json.dump(st.session_state["selected_design_settings"], f)
+                if not st.session_state["selected_design_settings"][
+                    "place_x_axis_above"
+                ]:
+                    selected_classes.reverse()
+                if reverse_class_order:
+                    selected_classes.reverse()
+
+    design_ready = False
+    if st.session_state["step"] >= 3:
+        design_ready = True
+        if (
+            st.session_state["selected_design_settings"]["show_sums"]
+            and st.session_state["selected_design_settings"]["sum_tile_palette"]
+            == st.session_state["selected_design_settings"]["palette"]
+        ):
+            st.error(
+                "The color palettes (background colors) "
+                "for the tiles and sum tiles are identical. "
+                "Please select a different color palette for "
+                "the sum tiles under **Tiles** >> *Sum tile settings*."
+            )
+            design_ready = False
+        if len(selected_classes) < 2:
+            st.error("At least 2 classes must be selected.")
+            design_ready = False
 
-    return output, design_ready, selected_classes
+    return design_ready, selected_classes
 
 
 # defaults: dict,

plot.R

@@ -201,15 +201,6 @@ confusion_matrix <- dplyr::filter(
 
 # Plotting settings
 
-# Sum tiles
-sums_settings <- sum_tile_settings()
-if (isTRUE(design_settings$show_sums)) {
-    sums_settings <- sum_tile_settings(
-        palette = design_settings$sum_tile_palette,
-        label = design_settings$sum_tile_label
-    )
-}
-
 build_fontface <- function(bold, italic) {
     dplyr::case_when(
         isTRUE(bold) && isTRUE(italic) ~ "bold.italic",
@@ -296,6 +287,18 @@ if (isTRUE(design_settings$palette_use_custom)) {
     )
 }
 
+# Sum tiles
+sums_settings <- sum_tile_settings()
+if (isTRUE(design_settings$show_sums)) {
+    sums_settings <- sum_tile_settings(
+        palette = design_settings$sum_tile_palette,
+        label = design_settings$sum_tile_label,
+        tile_border_color = tile_border_color,
+        tile_border_size = design_settings$tile_border_size,
+        tile_border_linetype = design_settings$tile_border_linetype
+    )
+}
+
 confusion_matrix_plot <- tryCatch(
     {
         cvms::plot_confusion_matrix(

template_resources/design_settings.blues_nc2_1.1.json

@@ -0,0 +1 @@
+{"palette": "Blues", "palette_use_custom": false, "palette_custom_low": "#B1F9E8", "palette_custom_high": "#239895", "width": 1100, "height": 1100, "dpi": 320, "show_counts": true, "show_normalized": true, "show_sums": false, "x_label": "True Class", "y_label": "Predicted Class", "title_label": "", "caption_label": "", "rotate_y_text": true, "place_x_axis_above": true, "counts_on_top": false, "num_digits": 2, "show_row_percentages": true, "show_col_percentages": true, "show_arrows": true, "diag_percentages_only": false, "arrow_size": 0.048, "arrow_nudge_from_text": 0.065, "intensity_by": "Counts", "darkness": 0.8, "show_tile_border": false, "tile_border_color": "#000000", "tile_border_size": 0.1, "tile_border_linetype": "solid", "sum_tile_palette": "Greens", "sum_tile_label": "Total", "show_zero_shading": true, "show_zero_text": true, "show_zero_percentages": false, "font_top_color": "#000000", "font_top_bold": false, "font_top_italic": false, "font_top_size": 4.3, "font_top_alpha": 1.0, "font_bottom_color": "#000000", "font_bottom_bold": false, "font_bottom_italic": false, "font_bottom_size": 2.8, "font_bottom_alpha": 1.0, "font_percentage_color": "#000000", "font_percentage_bold": false, "font_percentage_italic": true, "font_percentage_size": 2.35, "font_percentage_alpha": 0.85, "font_percentage_prefix": "", "font_percentage_suffix": "%", "font_normalized_prefix": "", "font_normalized_suffix": "%", "font_counts_prefix": "", "font_counts_suffix": ""}

template_resources/design_settings.blues_nc2_sums_1.1.json

@@ -0,0 +1 @@
+{"palette": "Blues", "palette_use_custom": false, "palette_custom_low": "#B1F9E8", "palette_custom_high": "#239895", "width": 1300, "height": 1300, "dpi": 320, "show_counts": true, "show_normalized": true, "show_sums": true, "x_label": "True Class", "y_label": "Predicted Class", "title_label": "", "caption_label": "", "rotate_y_text": true, "place_x_axis_above": true, "counts_on_top": false, "num_digits": 2, "show_row_percentages": true, "show_col_percentages": true, "show_arrows": true, "diag_percentages_only": false, "arrow_size": 0.048, "arrow_nudge_from_text": 0.065, "intensity_by": "Counts", "darkness": 0.8, "show_tile_border": false, "tile_border_color": "#000000", "tile_border_size": 0.1, "tile_border_linetype": "solid", "sum_tile_palette": "Greens", "sum_tile_label": "Total", "show_zero_shading": true, "show_zero_text": true, "show_zero_percentages": false, "font_top_color": "#000000", "font_top_bold": false, "font_top_italic": false, "font_top_size": 4.3, "font_top_alpha": 1.0, "font_bottom_color": "#000000", "font_bottom_bold": false, "font_bottom_italic": false, "font_bottom_size": 2.8, "font_bottom_alpha": 1.0, "font_percentage_color": "#000000", "font_percentage_bold": false, "font_percentage_italic": true, "font_percentage_size": 2.35, "font_percentage_alpha": 0.85, "font_percentage_prefix": "", "font_percentage_suffix": "%", "font_normalized_prefix": "", "font_normalized_suffix": "%", "font_counts_prefix": "", "font_counts_suffix": ""}

template_resources/design_settings.blues_nc3_1.1.json

@@ -0,0 +1 @@
+{"palette": "Blues", "palette_use_custom": false, "palette_custom_low": "#B1F9E8", "palette_custom_high": "#239895", "width": 1300, "height": 1300, "dpi": 320, "show_counts": true, "show_normalized": true, "show_sums": false, "x_label": "True Class", "y_label": "Predicted Class", "title_label": "", "caption_label": "", "rotate_y_text": true, "place_x_axis_above": true, "counts_on_top": false, "num_digits": 2, "show_row_percentages": true, "show_col_percentages": true, "show_arrows": true, "diag_percentages_only": false, "arrow_size": 0.048, "arrow_nudge_from_text": 0.065, "intensity_by": "Counts", "darkness": 0.8, "show_tile_border": false, "tile_border_color": "#000000", "tile_border_size": 0.1, "tile_border_linetype": "solid", "sum_tile_palette": "Greens", "sum_tile_label": "Total", "show_zero_shading": true, "show_zero_text": true, "show_zero_percentages": false, "font_top_color": "#000000", "font_top_bold": false, "font_top_italic": false, "font_top_size": 4.3, "font_top_alpha": 1.0, "font_bottom_color": "#000000", "font_bottom_bold": false, "font_bottom_italic": false, "font_bottom_size": 2.8, "font_bottom_alpha": 1.0, "font_percentage_color": "#000000", "font_percentage_bold": false, "font_percentage_italic": true, "font_percentage_size": 2.35, "font_percentage_alpha": 0.85, "font_percentage_prefix": "", "font_percentage_suffix": "%", "font_normalized_prefix": "", "font_normalized_suffix": "%", "font_counts_prefix": "", "font_counts_suffix": ""}

template_resources/design_settings.blues_nc3_sums_1.1.json

@@ -0,0 +1 @@
+{"palette": "Blues", "palette_use_custom": false, "palette_custom_low": "#B1F9E8", "palette_custom_high": "#239895", "width": 1425, "height": 1425, "dpi": 320, "show_counts": true, "show_normalized": true, "show_sums": true, "x_label": "True Class", "y_label": "Predicted Class", "title_label": "", "caption_label": "", "rotate_y_text": true, "place_x_axis_above": true, "counts_on_top": false, "num_digits": 2, "show_row_percentages": true, "show_col_percentages": true, "show_arrows": true, "diag_percentages_only": false, "arrow_size": 0.048, "arrow_nudge_from_text": 0.065, "intensity_by": "Counts", "darkness": 0.8, "show_tile_border": false, "tile_border_color": "#000000", "tile_border_size": 0.1, "tile_border_linetype": "solid", "sum_tile_palette": "Greens", "sum_tile_label": "Total", "show_zero_shading": true, "show_zero_text": true, "show_zero_percentages": false, "font_top_color": "#000000", "font_top_bold": false, "font_top_italic": false, "font_top_size": 4.3, "font_top_alpha": 1.0, "font_bottom_color": "#000000", "font_bottom_bold": false, "font_bottom_italic": false, "font_bottom_size": 2.8, "font_bottom_alpha": 1.0, "font_percentage_color": "#000000", "font_percentage_bold": false, "font_percentage_italic": true, "font_percentage_size": 2.35, "font_percentage_alpha": 0.85, "font_percentage_prefix": "", "font_percentage_suffix": "%", "font_normalized_prefix": "", "font_normalized_suffix": "%", "font_counts_prefix": "", "font_counts_suffix": ""}

templates/design_settings.grey_nc2_1.1.json → template_resources/design_settings.greys_nc2_1.1.json

@@ -1 +1 @@
-{"palette": "Greys", "width": 1150, "height": 1150, "dpi": 320, "show_counts": true, "show_normalized": true, "show_sums": false, "x_label": "True Class", "y_label": "Predicted Class", "title_label": "", "caption_label": "", "rotate_y_text": true, "place_x_axis_above": true, "counts_on_top": false, "num_digits": 2, "show_row_percentages": true, "show_col_percentages": true, "show_arrows": true, "diag_percentages_only": false, "arrow_size": 0.048, "arrow_nudge_from_text": 0.065, "intensity_by": "Counts", "darkness": 0.8, "show_tile_border": true, "tile_border_color": "#000000", "tile_border_size": 0.05, "tile_border_linetype": "longdash", "sum_tile_palette": "Purples", "sum_tile_label": "Total", "show_zero_shading": true, "show_zero_text": true, "show_zero_percentages": false, "font_top_color": "#000000", "font_top_bold": false, "font_top_italic": false, "font_top_size": 4.3, "font_top_alpha": 1.0, "font_bottom_color": "#000000", "font_bottom_bold": false, "font_bottom_italic": false, "font_bottom_size": 2.8, "font_bottom_alpha": 1.0, "font_percentage_color": "#000000", "font_percentage_bold": false, "font_percentage_italic": true, "font_percentage_size": 2.35, "font_percentage_alpha": 0.85, "font_percentage_prefix": "", "font_percentage_suffix": "%", "font_normalized_prefix": "", "font_normalized_suffix": "%", "font_counts_prefix": "", "font_counts_suffix": ""}
+{"palette": "Greys", "width": 1150, "height": 1150, "dpi": 320, "show_counts": true, "show_normalized": true, "show_sums": false, "x_label": "True Class", "y_label": "Predicted Class", "title_label": "", "caption_label": "", "rotate_y_text": true, "place_x_axis_above": true, "counts_on_top": false, "num_digits": 2, "show_row_percentages": true, "show_col_percentages": true, "show_arrows": true, "diag_percentages_only": false, "arrow_size": 0.048, "arrow_nudge_from_text": 0.065, "intensity_by": "Counts", "darkness": 0.75, "show_tile_border": true, "tile_border_color": "#000000", "tile_border_size": 0.05, "tile_border_linetype": "longdash", "sum_tile_palette": "Purples", "sum_tile_label": "Total", "show_zero_shading": true, "show_zero_text": true, "show_zero_percentages": false, "font_top_color": "#000000", "font_top_bold": false, "font_top_italic": false, "font_top_size": 4.3, "font_top_alpha": 1.0, "font_bottom_color": "#000000", "font_bottom_bold": false, "font_bottom_italic": false, "font_bottom_size": 2.8, "font_bottom_alpha": 1.0, "font_percentage_color": "#000000", "font_percentage_bold": false, "font_percentage_italic": true, "font_percentage_size": 2.35, "font_percentage_alpha": 0.85, "font_percentage_prefix": "", "font_percentage_suffix": "%", "font_normalized_prefix": "", "font_normalized_suffix": "%", "font_counts_prefix": "", "font_counts_suffix": ""}

templates/design_settings.grey_nc3_1.1.json → template_resources/design_settings.greys_nc2_sums_1.1.json

@@ -1 +1 @@
-{"palette": "Greys", "width": 1300, "height": 1300, "dpi": 320, "show_counts": true, "show_normalized": true, "show_sums": false, "x_label": "True Class", "y_label": "Predicted Class", "title_label": "", "caption_label": "", "rotate_y_text": true, "place_x_axis_above": true, "counts_on_top": false, "num_digits": 2, "show_row_percentages": true, "show_col_percentages": true, "show_arrows": true, "diag_percentages_only": false, "arrow_size": 0.048, "arrow_nudge_from_text": 0.065, "intensity_by": "Counts", "darkness": 0.8, "show_tile_border": true, "tile_border_color": "#000000", "tile_border_size": 0.05, "tile_border_linetype": "longdash", "sum_tile_palette": "Purples", "sum_tile_label": "Total", "show_zero_shading": true, "show_zero_text": true, "show_zero_percentages": false, "font_top_color": "#000000", "font_top_bold": false, "font_top_italic": false, "font_top_size": 4.3, "font_top_alpha": 1.0, "font_bottom_color": "#000000", "font_bottom_bold": false, "font_bottom_italic": false, "font_bottom_size": 2.8, "font_bottom_alpha": 1.0, "font_percentage_color": "#000000", "font_percentage_bold": false, "font_percentage_italic": true, "font_percentage_size": 2.35, "font_percentage_alpha": 0.85, "font_percentage_prefix": "", "font_percentage_suffix": "%", "font_normalized_prefix": "", "font_normalized_suffix": "%", "font_counts_prefix": "", "font_counts_suffix": ""}
+{"palette": "Greys", "width": 1300, "height": 1300, "dpi": 320, "show_counts": true, "show_normalized": true, "show_sums": true, "x_label": "True Class", "y_label": "Predicted Class", "title_label": "", "caption_label": "", "rotate_y_text": true, "place_x_axis_above": true, "counts_on_top": false, "num_digits": 2, "show_row_percentages": true, "show_col_percentages": true, "show_arrows": true, "diag_percentages_only": false, "arrow_size": 0.048, "arrow_nudge_from_text": 0.065, "intensity_by": "Counts", "darkness": 0.75, "show_tile_border": true, "tile_border_color": "#000000", "tile_border_size": 0.05, "tile_border_linetype": "longdash", "sum_tile_palette": "Purples", "sum_tile_label": "Total", "show_zero_shading": true, "show_zero_text": true, "show_zero_percentages": false, "font_top_color": "#000000", "font_top_bold": false, "font_top_italic": false, "font_top_size": 4.3, "font_top_alpha": 1.0, "font_bottom_color": "#000000", "font_bottom_bold": false, "font_bottom_italic": false, "font_bottom_size": 2.8, "font_bottom_alpha": 1.0, "font_percentage_color": "#000000", "font_percentage_bold": false, "font_percentage_italic": true, "font_percentage_size": 2.35, "font_percentage_alpha": 0.85, "font_percentage_prefix": "", "font_percentage_suffix": "%", "font_normalized_prefix": "", "font_normalized_suffix": "%", "font_counts_prefix": "", "font_counts_suffix": ""}

template_resources/design_settings.greys_nc3_1.1.json

@@ -0,0 +1 @@
+{"palette": "Greys", "width": 1300, "height": 1300, "dpi": 320, "show_counts": true, "show_normalized": true, "show_sums": false, "x_label": "True Class", "y_label": "Predicted Class", "title_label": "", "caption_label": "", "rotate_y_text": true, "place_x_axis_above": true, "counts_on_top": false, "num_digits": 2, "show_row_percentages": true, "show_col_percentages": true, "show_arrows": true, "diag_percentages_only": false, "arrow_size": 0.048, "arrow_nudge_from_text": 0.065, "intensity_by": "Counts", "darkness": 0.75, "show_tile_border": true, "tile_border_color": "#000000", "tile_border_size": 0.05, "tile_border_linetype": "longdash", "sum_tile_palette": "Purples", "sum_tile_label": "Total", "show_zero_shading": true, "show_zero_text": true, "show_zero_percentages": false, "font_top_color": "#000000", "font_top_bold": false, "font_top_italic": false, "font_top_size": 4.3, "font_top_alpha": 1.0, "font_bottom_color": "#000000", "font_bottom_bold": false, "font_bottom_italic": false, "font_bottom_size": 2.8, "font_bottom_alpha": 1.0, "font_percentage_color": "#000000", "font_percentage_bold": false, "font_percentage_italic": true, "font_percentage_size": 2.35, "font_percentage_alpha": 0.85, "font_percentage_prefix": "", "font_percentage_suffix": "%", "font_normalized_prefix": "", "font_normalized_suffix": "%", "font_counts_prefix": "", "font_counts_suffix": ""}

template_resources/design_settings.greys_nc3_sums_1.1.json

@@ -0,0 +1 @@
+{"palette": "Greys", "palette_use_custom": false, "palette_custom_low": "#B1F9E8", "palette_custom_high": "#239895", "width": 1425, "height": 1425, "dpi": 320, "show_counts": true, "show_normalized": true, "show_sums": true, "x_label": "True Class", "y_label": "Predicted Class", "title_label": "", "caption_label": "", "rotate_y_text": true, "place_x_axis_above": true, "counts_on_top": false, "num_digits": 2, "show_row_percentages": true, "show_col_percentages": true, "show_arrows": true, "diag_percentages_only": false, "arrow_size": 0.048, "arrow_nudge_from_text": 0.065, "intensity_by": "Counts", "darkness": 0.75, "show_tile_border": true, "tile_border_color": "#000000", "tile_border_size": 0.05, "tile_border_linetype": "longdash", "sum_tile_palette": "Purples", "sum_tile_label": "Total", "show_zero_shading": true, "show_zero_text": true, "show_zero_percentages": false, "font_top_color": "#000000", "font_top_bold": false, "font_top_italic": false, "font_top_size": 4.3, "font_top_alpha": 1.0, "font_bottom_color": "#000000", "font_bottom_bold": false, "font_bottom_italic": false, "font_bottom_size": 2.8, "font_bottom_alpha": 1.0, "font_percentage_color": "#000000", "font_percentage_bold": false, "font_percentage_italic": true, "font_percentage_size": 2.35, "font_percentage_alpha": 0.85, "font_percentage_prefix": "", "font_percentage_suffix": "%", "font_normalized_prefix": "", "font_normalized_suffix": "%", "font_counts_prefix": "", "font_counts_suffix": ""}

templates.py

@@ -0,0 +1,97 @@
+def get_templates():
+    temps = Templates()
+
+    # Blues
+    temps.add(
+        name="Blues 2-Class",
+        num_classes=2,
+        sums=False,
+        settings_path="design_settings.blues_nc2_1.1.json",
+        image_path="blues_nc2_1.1.png",
+        collection="Blues 1",
+    )
+    temps.add(
+        name="Blues 3-Class",
+        num_classes=3,
+        sums=False,
+        settings_path="design_settings.blues_nc3_1.1.json",
+        image_path="blues_nc3_1.1.png",
+        collection="Blues 1",
+    )
+    temps.add(
+        name="Blues 2-Class w/ Sums",
+        num_classes=2,
+        sums=True,
+        settings_path="design_settings.blues_nc2_sums_1.1.json",
+        image_path="blues_nc2_sums_1.1.png",
+        collection="Blues 1",
+    )
+    temps.add(
+        name="Blues 3-Class w/ Sums",
+        num_classes=3,
+        sums=True,
+        settings_path="design_settings.blues_nc3_sums_1.1.json",
+        image_path="blues_nc3_sums_1.1.png",
+        collection="Blues 1",
+    )
+
+    # Greys
+    temps.add(
+        name="Greys 2-Class",
+        num_classes=2,
+        sums=False,
+        settings_path="design_settings.greys_nc2_1.1.json",
+        image_path="greys_nc2_1.1.png",
+        collection="Greys 1",
+    )
+    temps.add(
+        name="Greys 3-Class",
+        num_classes=3,
+        sums=False,
+        settings_path="design_settings.greys_nc3_1.1.json",
+        image_path="greys_nc3_1.1.png",
+        collection="Greys 1",
+    )
+    temps.add(
+        name="Greys 2-Class w/ Sums",
+        num_classes=2,
+        sums=True,
+        settings_path="design_settings.greys_nc2_sums_1.1.json",
+        image_path="greys_nc2_sums_1.1.png",
+        collection="Greys 1",
+    )
+    temps.add(
+        name="Greys 3-Class w/ Sums",
+        num_classes=3,
+        sums=True,
+        settings_path="design_settings.greys_nc3_sums_1.1.json",
+        image_path="greys_nc3_sums_1.1.png",
+        collection="Greys 1",
+    )
+
+    return temps.get_templates()
+
+
+class Templates:
+    def __init__(self) -> None:
+        self.templates = {}
+
+    def get_templates(self) -> dict:
+        return self.templates
+
+    def add(
+        self,
+        name: str,
+        num_classes: int,
+        sums: bool,
+        settings_path: str,
+        image_path: str,
+        collection: str,
+    ) -> None:
+        self.templates[name] = {
+            "collection": collection,
+            "num_classes": num_classes,
+            "sums": sums,
+            "settings": settings_path,
+            "image": image_path,
+        }

templates/design_settings.grey_nc2_sums_1.1.json

@@ -1 +0,0 @@
-{"palette": "Greys", "width": 1300, "height": 1300, "dpi": 320, "show_counts": true, "show_normalized": true, "show_sums": true, "x_label": "True Class", "y_label": "Predicted Class", "title_label": "", "caption_label": "", "rotate_y_text": true, "place_x_axis_above": true, "counts_on_top": false, "num_digits": 2, "show_row_percentages": true, "show_col_percentages": true, "show_arrows": true, "diag_percentages_only": false, "arrow_size": 0.048, "arrow_nudge_from_text": 0.065, "intensity_by": "Counts", "darkness": 0.8, "show_tile_border": true, "tile_border_color": "#000000", "tile_border_size": 0.05, "tile_border_linetype": "longdash", "sum_tile_palette": "Purples", "sum_tile_label": "Total", "show_zero_shading": true, "show_zero_text": true, "show_zero_percentages": false, "font_top_color": "#000000", "font_top_bold": false, "font_top_italic": false, "font_top_size": 4.3, "font_top_alpha": 1.0, "font_bottom_color": "#000000", "font_bottom_bold": false, "font_bottom_italic": false, "font_bottom_size": 2.8, "font_bottom_alpha": 1.0, "font_percentage_color": "#000000", "font_percentage_bold": false, "font_percentage_italic": true, "font_percentage_size": 2.35, "font_percentage_alpha": 0.85, "font_percentage_prefix": "", "font_percentage_suffix": "%", "font_normalized_prefix": "", "font_normalized_suffix": "%", "font_counts_prefix": "", "font_counts_suffix": ""}

text_sections.py

@@ -193,7 +193,8 @@ def design_text():
     st.subheader("Design your plot")
     st.write("This is where you customize the design of your confusion matrix plot.")
     st.markdown(
-        "We suggest you go directly to `Generate plot` to see the starting point. Then go back and tweak to your liking!"
+        "We suggest you go directly to `Generate plot` to see the starting point. Then go back and tweak to your liking! "
+        "You can also select one of the templates or upload previously saved design settings."
     )
     st.markdown(
         "The *width* and *height* settings are usually necessary to adjust as they "
@@ -201,7 +202,6 @@ def design_text():
         "time for a start."
     )
     st.write(
-        "If you have previously saved your preferred design settings, "
-        "you can start by uploading the json file. "
-        "Otherwise, get designing!"
+        "Get designing!"
     )
+    st.write("")