remove use_defaults buttons and auto fill ranges with values if the user doesn't provide any

Author: connoraird

post-processing/config_handler.py

@@ -64,10 +64,10 @@ def from_template(self):
             "plot_type": None,
             "title": None,
             "x_axis": {"value": None, "units": {"custom": None},
-                       "range": {"use_default": True, "min": None, "max": None}},
+                       "range": {"min": None, "max": None}},
             "y_axis": {"value": None, "units": {"custom": None},
                        "scaling": {"custom": None},
-                       "range": {"use_default": True, "min": None, "max": None}},
+                       "range": {"min": None, "max": None}},
             "filters": {"and": [], "or": []},
             "series": [],
             "column_types": {},

post-processing/plot_handler.py

@@ -258,24 +258,25 @@ def get_axis_min_max(df, axis):
 
     column = axis["value"]
     axis_range = axis["range"]
-    axis_min = axis_range["min"] if axis_range["min"] != 'None' else None
-    axis_max = axis_range["max"] if axis_range["max"] != 'None' else None
+    axis_min = axis_range["min"] if axis_range["min"] else 0.0
+    axis_max = axis_range["max"] if axis_range["max"] else 0.0
 
     # FIXME: str types and user defined datetime ranges not currently supported
-    axis_min_element = np.nanmin(df[column])
-    axis_max_element = np.nanmax(df[column])
-
-    # use defaults if type is datetime
-    if (is_datetime(df[column])):
-        datetime_range = axis_max_element - axis_min_element
-        buffer_time = datetime_range*0.2
-        axis_min = axis_min_element - buffer_time
-        axis_max = axis_max_element + buffer_time
-
-    elif axis_min is None or axis_max is None:
-        axis_min = (axis_min_element*0.6 if min(df[column]) >= 0
-                    else math.floor(axis_min_element*1.2))
-        axis_max = (axis_max_element*0.6 if max(df[column]) <= 0
-                    else math.ceil(axis_max_element*1.2))
+    if (column):
+        axis_min_element = np.nanmin(df[column])
+        axis_max_element = np.nanmax(df[column])
+
+        # use defaults if type is datetime
+        if (is_datetime(df[column])):
+            datetime_range = axis_max_element - axis_min_element
+            buffer_time = datetime_range*0.2
+            axis_min = axis_min_element - buffer_time
+            axis_max = axis_max_element + buffer_time
+
+        elif axis_min is None or axis_max is None or axis_min == axis_max:
+            axis_min = (axis_min_element*0.6 if min(df[column]) >= 0
+                        else math.floor(axis_min_element*1.2))
+            axis_max = (axis_max_element*0.6 if max(df[column]) <= 0
+                        else math.ceil(axis_max_element*1.2))
 
     return axis_min, axis_max

post-processing/streamlit_post_processing.py

@@ -5,6 +5,7 @@
 import streamlit as st
 from config_handler import ConfigHandler, load_config, read_config
 from post_processing import PostProcessing
+from plot_handler import get_axis_min_max
 
 # drop-down lists
 operators = ["==", "!=", "<", ">", "<=", ">="]
@@ -179,20 +180,16 @@ def axis_select(label: str, axis: dict, plot_type: str):
     units_select(label, axis)
 
     # FIXME: add ability to use a custom value for only one of min or max
-    disable_user_range = plot_type != 'line'
-    use_default_ranges = st.checkbox("default axis range",
-                                     axis.get("range").get("use_default") if not disable_user_range else True,
-                                     key="{0}_axis_range_use_default".format(label),
-                                     disabled=disable_user_range,
-                                     help="{0} {1}".format(
-                                         "Uncheck to assign custom minimum and maximum values to axis.",
-                                         "Custom ranges are not implemented for datetime types."))
-    if not use_default_ranges:
-        axis_range_min, axis_range_max = st.columns(2)
-        with axis_range_min:
-            st.number_input("{0}-axis minimum".format(label), key="{0}_axis_range_min".format(label))
-        with axis_range_max:
-            st.number_input("{0}-axis maximum".format(label), key="{0}_axis_range_max".format(label))
+    range = get_axis_min_max(df, axis)
+    axis_range_min, axis_range_max = st.columns(2)
+    with axis_range_min:
+        st.number_input("{0}-axis minimum".format(label),
+                        value=range[0],
+                        key="{0}_axis_range_min".format(label))
+    with axis_range_max:
+        st.number_input("{0}-axis maximum".format(label),
+                        value=range[1],
+                        key="{0}_axis_range_max".format(label))
 
     # scaling select
     if label == "y":
@@ -311,9 +308,8 @@ def update_axes():
     x_column = state.x_axis_column
     x_units_column = state.x_axis_units_column
     x_units_custom = state.x_axis_units_custom
-    x_range_use_default = state.x_axis_range_use_default
-    x_range_min = None if x_range_use_default else state.x_axis_range_min
-    x_range_max = None if x_range_use_default else state.x_axis_range_max
+    x_range_min = state.x_axis_range_min
+    x_range_max = state.x_axis_range_max
 
     y_column = state.y_axis_column
     y_units_column = state.y_axis_units_column
@@ -322,9 +318,8 @@ def update_axes():
     y_scaling_series = state.y_axis_scaling_series
     y_scaling_x = state.y_axis_scaling_x_value
     y_scaling_custom = state.y_axis_custom_scaling_val
-    y_range_use_default = state.y_axis_range_use_default
-    y_range_min = None if y_range_use_default else state.y_axis_range_min
-    y_range_max = None if y_range_use_default else state.y_axis_range_max
+    y_range_min = state.y_axis_range_min
+    y_range_max = state.y_axis_range_max
 
     # update columns
     config.x_axis["value"] = x_column
@@ -344,10 +339,8 @@ def update_axes():
         config.y_axis["units"] = {"column": y_units_column}
         config.column_types[y_units_column] = "str"
 
-    config.x_axis["range"]["use_default"] = x_range_use_default
     config.x_axis["range"]["min"] = x_range_min
     config.x_axis["range"]["max"] = x_range_max
-    config.y_axis["range"]["use_default"] = y_range_use_default
     config.y_axis["range"]["min"] = y_range_min
     config.y_axis["range"]["max"] = y_range_max