More improvements for design section

app.py

@@ -318,6 +318,28 @@ if st.session_state["step"] >= 2:
     )
 
     if st.session_state["step"] >= 3:
+        # TODO Fix and update these flags
+        element_flags = [
+            key
+            for key, val in {
+                "--add_counts": design_settings["show_counts"],
+                "--add_normalized": design_settings["show_normalized"],
+                "--add_sums": design_settings["show_sums"],
+                "--add_row_percentages": design_settings["show_row_percentages"],
+                "--add_col_percentages": design_settings["show_col_percentages"],
+                "--add_arrows": design_settings["show_arrows"],
+                "--add_zero_percentages": design_settings["show_zero_percentages"],
+                "--add_zero_text": design_settings["show_zero_text"],
+                "--add_zero_shading": design_settings["show_zero_shading"],
+                "--add_tile_border": design_settings["show_tile_border"],
+                "--counts_on_top": design_settings["counts_on_top"],
+                "--diag_percentages_only": design_settings["diag_percentages_only"],
+                "--rotate_y_text": design_settings["rotate_y_text"],
+                "--place_x_axis_above": design_settings["place_x_axis_above"],
+            }.items()
+            if val
+        ]
+
         plotting_args = [
             "--data_path",
             f"'{data_store_path}'",

design.py

@@ -43,83 +43,93 @@ def design_section(
             else:
                 output["prob_of_class"] = None
 
-        with st.expander("Elements"):
-            default_elements = [
-                "Counts",
-                "Normalized Counts (%)",
-                "Zero Shading",
-                "Arrows",
-            ]
-            if num_classes < 6:
-                # Percentages clutter too much with many classes
-                default_elements += [
-                    "Row Percentages",
-                    "Column Percentages",
-                ]
-            elements_to_add = st.multiselect(
-                "Add the following elements",
-                options=[
-                    "Sum Tiles",
-                    "Counts",
-                    "Normalized Counts (%)",
-                    "Row Percentages",
-                    "Column Percentages",
-                    "Zero Shading",
-                    "Zero Percentages",
-                    "Zero Text",
-                    "Arrows",
-                ],
-                default=default_elements,
+        output["palette"] = st.selectbox(
+            "Color Palette",
+            options=["Blues", "Greens", "Oranges", "Greys", "Purples", "Reds"],
+        )
+
+        # Ask for output parameters
+        # TODO: Set default based on number of classes and sum tiles
+        col1, col2, col3 = st.columns(3)
+        with col1:
+            output["width"] = st.number_input(
+                "Width (px)", value=1200 + 100 * (num_classes - 2)
             )
+        with col2:
+            output["height"] = st.number_input(
+                "Height (px)", value=1200 + 100 * (num_classes - 2)
+            )
+        with col3:
+            output["dpi"] = st.number_input("DPI (not working)", value=320)
+
+        with st.expander("Elements"):
+            col1, col2, col3 = st.columns(3)
+            with col1:
+                output["show_counts"] = st.checkbox("Show counts", value=True)
+            with col2:
+                output["show_normalized"] = st.checkbox(
+                    "Show normalized (%)", value=True
+                )
+            with col3:
+                output["show_sums"] = st.checkbox("Show sum tiles", value=False)
+
+            st.markdown("""---""")
+
+            col1, col2 = st.columns(2)
+            with col1:
+                st.write("Row and column percentages:")
+                output["show_row_percentages"] = st.checkbox(
+                    "Show row percentages", value=num_classes < 6
+                )
+                output["show_col_percentages"] = st.checkbox(
+                    "Show column percentages", value=num_classes < 6
+                )
+                output["show_arrows"] = st.checkbox("Show arrows", value=True)
+            with col2:
+                output["arrow_size"] = (
+                    st.slider(
+                        "Arrow size",
+                        value=0.048 * 10,
+                        min_value=0.03 * 10,
+                        max_value=0.06 * 10,
+                        step=0.001 * 10,
+                    )
+                    / 10
+                )
+                output["arrow_nudge_from_text"] = (
+                    st.slider(
+                        "Arrow nudge from text",
+                        value=0.065 * 10,
+                        min_value=0.00,
+                        max_value=0.1 * 10,
+                        step=0.001 * 10,
+                    )
+                    / 10
+                )
 
             st.markdown("""---""")
 
             col1, col2, col3 = st.columns(3)
             with col1:
-                counts_on_top = st.checkbox(
+                output["counts_on_top"] = st.checkbox(
                     "Counts on top (not working)",
                     help="Whether to switch the positions of the counts and normalized counts (%). "
                     "That is, the counts become the big centralized numbers and the "
                     "normalized counts go below with a smaller font size.",
                 )
             with col2:
-                diag_percentages_only = st.checkbox(
+                output["diag_percentages_only"] = st.checkbox(
                     "Diagonal row/column percentages only"
                 )
 
-        with st.expander("Text"):
-            col1, col2, col3 = st.columns(3)
-            with col1:
-                output["num_digits"] = st.number_input(
-                    "Digits", value=2, help="Number of digits to round percentages to."
-                )
-            with col2:
-                rotate_y_text = st.checkbox("Rotate y text", value=True)
-            with col3:
-                place_x_axis_above = st.checkbox("Place X axis on top", value=True)
-
-        with st.expander("Fonts"):
-            font_dicts = {}
-            for font_type in ["Counts", "Normalized (%)", "Row Percentage", "Column Percentage"]:
-                st.subheader(font_type)
-                num_cols = 3
-                font_dicts[font_type] = font_inputs(key_prefix=font_type)
-                for i, (setting_name, setting_widget) in enumerate(
-                    font_dicts[font_type].items()
-                ):
-                    if i % num_cols == 0:
-                        cols = st.columns(num_cols)
-                    with cols[i % num_cols]:
-                        setting_widget()
-
-                st.markdown("""---""")
-
         with st.expander("Tiles"):
             col1, col2, col3 = st.columns(3)
             with col1:
                 pass
             with col2:
-                output["intensity_by"] = st.selectbox("Intensity based on", options=["Counts", "Normalized (%)"])
+                output["intensity_by"] = st.selectbox(
+                    "Intensity based on", options=["Counts", "Normalized (%)"]
+                )
             with col3:
                 output["darkness"] = st.slider(
                     "Darkness",
@@ -134,7 +144,9 @@ def design_section(
 
             col1, col2, col3, col4 = st.columns(4)
             with col1:
-                output["tile_border_add"] = st.checkbox("Add tile borders", value=False)
+                output["show_tile_border"] = st.checkbox(
+                    "Add tile borders", value=False
+                )
             with col2:
                 output["tile_border_color"] = st.color_picker(
                     "Border color", value="#000000"
@@ -160,42 +172,55 @@ def design_section(
                     ],
                 )
 
-        output["element_flags"] = [
-            key
-            for key, val in {
-                "--add_sums": "Sum Tiles" in elements_to_add,
-                "--add_counts": "Counts" in elements_to_add,
-                "--add_normalized": "Normalized Counts (%)" in elements_to_add,
-                "--add_row_percentages": "Row Percentages" in elements_to_add,
-                "--add_col_percentages": "Column Percentages" in elements_to_add,
-                "--add_zero_percentages": "Zero Percentages" in elements_to_add,
-                "--add_zero_text": "Zero Text" in elements_to_add,
-                "--add_zero_shading": "Zero Shading" in elements_to_add,
-                "--add_arrows": "Arrows" in elements_to_add,
-                "--counts_on_top": counts_on_top,
-                "--diag_percentages_only": diag_percentages_only,
-            }.items()
-            if val
-        ]
+        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=True)
+            with col2:
+                output["show_zero_text"] = st.checkbox(
+                    "Show text",
+                    value=False,
+                    help="Whether to show counts, normalized (%), etc.",
+                )
+            with col3:
+                output["show_zero_percentages"] = st.checkbox(
+                    "Show row/column percentages",
+                    value=False,
+                    help="Only relevant when row/column percentages are enabled.",
+                )
 
-        output["palette"] = st.selectbox(
-            "Color Palette",
-            options=["Blues", "Greens", "Oranges", "Greys", "Purples", "Reds"],
-        )
+        with st.expander("Text"):
+            col1, col2, col3 = st.columns(3)
+            with col1:
+                output["num_digits"] = st.number_input(
+                    "Digits", value=2, help="Number of digits to round percentages to."
+                )
+            with col2:
+                output["rotate_y_text"] = st.checkbox("Rotate y text", value=True)
+            with col3:
+                output["place_x_axis_above"] = st.checkbox(
+                    "Place X axis on top", value=True
+                )
 
-        # Ask for output parameters
-        # TODO: Set default based on number of classes and sum tiles
-        col1, col2, col3 = st.columns(3)
-        with col1:
-            output["width"] = st.number_input(
-                "Width (px)", value=1200 + 100 * (num_classes - 2)
-            )
-        with col2:
-            output["height"] = st.number_input(
-                "Height (px)", value=1200 + 100 * (num_classes - 2)
-            )
-        with col3:
-            output["dpi"] = st.number_input("DPI (not working)", value=320)
+        with st.expander("Fonts"):
+            font_dicts = {}
+            for font_type in [
+                "Counts",
+                "Normalized (%)",
+                "Row Percentage",
+                "Column Percentage",
+            ]:
+                st.subheader(font_type)
+                num_cols = 3
+                font_dicts[font_type] = font_inputs(key_prefix=font_type)
+                for i, (_, setting_widget) in enumerate(font_dicts[font_type].items()):
+                    if i % num_cols == 0:
+                        cols = st.columns(num_cols)
+                    with cols[i % num_cols]:
+                        setting_widget()
+
+                st.markdown("""---""")
 
         if st.form_submit_button(label="Generate plot"):
             st.session_state["step"] = 3