diff --git a/src/ert/gui/plottery/plot_context.py b/src/ert/gui/plottery/plot_context.py index 40a4d1de827..0ee2636164d 100644 --- a/src/ert/gui/plottery/plot_context.py +++ b/src/ert/gui/plottery/plot_context.py @@ -15,13 +15,11 @@ class PlotContext: INDEX_AXIS = "INDEX" COUNT_AXIS = "COUNT" DENSITY_AXIS = "DENSITY" - DEPTH_AXIS = "DEPTH" AXIS_TYPES = [ UNKNOWN_AXIS, COUNT_AXIS, DATE_AXIS, DENSITY_AXIS, - DEPTH_AXIS, INDEX_AXIS, VALUE_AXIS, ] diff --git a/src/ert/gui/plottery/plot_limits.py b/src/ert/gui/plottery/plot_limits.py index f60876609ca..062a5bc78a9 100644 --- a/src/ert/gui/plottery/plot_limits.py +++ b/src/ert/gui/plottery/plot_limits.py @@ -11,7 +11,6 @@ class PlotLimits: index_limits: Tuple[Optional[int], Optional[int]] = (None, None) count_limits: Tuple[Optional[int], Optional[int]] = (None, None) density_limits: Tuple[Optional[Num], Optional[Num]] = (None, None) - depth_limits: Tuple[Optional[Num], Optional[Num]] = (None, None) date_limits: Tuple[Optional[date], Optional[date]] = (None, None) @property @@ -78,22 +77,6 @@ def density_maximum(self) -> Optional[Num]: def density_maximum(self, value: Optional[Num]) -> None: self.density_limits = (self.density_limits[0], value) - @property - def depth_minimum(self) -> Optional[Num]: - return self.depth_limits[0] - - @depth_minimum.setter - def depth_minimum(self, value: Optional[Num]) -> None: - self.depth_limits = (value, self.depth_limits[1]) - - @property - def depth_maximum(self) -> Optional[Num]: - return self.depth_limits[1] - - @depth_maximum.setter - def depth_maximum(self, value: Optional[Num]) -> None: - self.depth_limits = (self.depth_limits[0], value) - @property def date_minimum(self) -> Optional[date]: return self.date_limits[0] diff --git a/src/ert/gui/plottery/plots/plot_tools.py b/src/ert/gui/plottery/plots/plot_tools.py index b285539e9da..694e4c3a56a 100644 --- a/src/ert/gui/plottery/plots/plot_tools.py +++ b/src/ert/gui/plottery/plots/plot_tools.py @@ -35,8 +35,6 @@ def _getXAxisLimits(plot_context: PlotContext) -> Optional[PlotLimits]: return limits.date_limits elif axis_name == plot_context.DENSITY_AXIS: return limits.density_limits - elif axis_name == plot_context.DEPTH_AXIS: - return limits.depth_limits elif axis_name == plot_context.INDEX_AXIS: return limits.index_limits @@ -55,8 +53,6 @@ def _getYAxisLimits(plot_context: PlotContext) -> Optional[PlotLimits]: return limits.date_limits elif axis_name == plot_context.DENSITY_AXIS: return limits.density_limits - elif axis_name == plot_context.DEPTH_AXIS: - return limits.depth_limits elif axis_name == plot_context.INDEX_AXIS: return limits.index_limits diff --git a/src/ert/gui/tools/plot/customize/limits_customization_view.py b/src/ert/gui/tools/plot/customize/limits_customization_view.py index 7f50d11611f..bf8664a71f8 100644 --- a/src/ert/gui/tools/plot/customize/limits_customization_view.py +++ b/src/ert/gui/tools/plot/customize/limits_customization_view.py @@ -38,7 +38,6 @@ class LimitsStack(StackedInput): FLOAT_AXIS = [ PlotContext.VALUE_AXIS, PlotContext.DENSITY_AXIS, - PlotContext.DEPTH_AXIS, ] INT_AXIS = [PlotContext.INDEX_AXIS, PlotContext.COUNT_AXIS] NUMBER_AXIS = FLOAT_AXIS + INT_AXIS @@ -54,10 +53,6 @@ def __init__(self) -> None: PlotContext.DENSITY_AXIS, self.createDoubleLineEdit(minimum=0, placeholder="Default value"), ) - self.addInput( - PlotContext.DEPTH_AXIS, - self.createDoubleLineEdit(minimum=0, placeholder="Default value"), - ) self.addInput( PlotContext.INDEX_AXIS, self.createIntegerLineEdit(minimum=0, placeholder="Default value"), @@ -169,11 +164,6 @@ def _updateWidgets(self) -> None: self._y_minimum_stack.setValue(PlotContext.DATE_AXIS, limits.date_minimum) self._y_maximum_stack.setValue(PlotContext.DATE_AXIS, limits.date_maximum) - self._x_minimum_stack.setValue(PlotContext.DEPTH_AXIS, limits.depth_minimum) - self._x_maximum_stack.setValue(PlotContext.DEPTH_AXIS, limits.depth_maximum) - self._y_minimum_stack.setValue(PlotContext.DEPTH_AXIS, limits.depth_minimum) - self._y_maximum_stack.setValue(PlotContext.DEPTH_AXIS, limits.depth_maximum) - self._x_minimum_stack.setValue(PlotContext.DENSITY_AXIS, limits.density_minimum) self._x_maximum_stack.setValue(PlotContext.DENSITY_AXIS, limits.density_maximum) self._y_minimum_stack.setValue(PlotContext.DENSITY_AXIS, limits.density_minimum) @@ -210,8 +200,6 @@ def _updateLimit(self, axis_name, minimum, maximum) -> None: self._limits.count_limits = minimum, maximum elif axis_name == PlotContext.DENSITY_AXIS: self._limits.density_limits = minimum, maximum - elif axis_name == PlotContext.DEPTH_AXIS: - self._limits.depth_limits = minimum, maximum elif axis_name == PlotContext.DATE_AXIS: self._limits.date_limits = minimum, maximum elif axis_name == PlotContext.INDEX_AXIS: diff --git a/tests/unit_tests/gui/plottery/test_plot_limits.py b/tests/unit_tests/gui/plottery/test_plot_limits.py index 52c78fd5754..35542e0cc24 100644 --- a/tests/unit_tests/gui/plottery/test_plot_limits.py +++ b/tests/unit_tests/gui/plottery/test_plot_limits.py @@ -22,10 +22,6 @@ def test_plot_limits_construction(): assert plot_limits.density_maximum is None assert plot_limits.density_limits == (None, None) - assert plot_limits.depth_minimum is None - assert plot_limits.depth_maximum is None - assert plot_limits.depth_limits == (None, None) - assert plot_limits.date_minimum is None assert plot_limits.date_maximum is None assert plot_limits.date_limits == (None, None) @@ -33,7 +29,7 @@ def test_plot_limits_construction(): def test_plot_limits(): plot_limits = PlotLimits() - limit_names = ["value", "index", "count", "density", "depth", "date"] + limit_names = ["value", "index", "count", "density", "date"] positive_floats = [1.0, 1.5, 3.1415, 1e10, 5.2e-7] negative_floats = [-1.0, -1.5, -3.1415, -1e10, -5.2e-7] @@ -45,7 +41,6 @@ def test_plot_limits(): setter_should_succeed_values = { "value": positive_floats + negative_floats + positive_ints + negative_ints, "index": positive_ints, - "depth": positive_floats + positive_ints, "count": positive_ints, "density": positive_floats + positive_ints, "date": dates, @@ -81,7 +76,6 @@ def test_copy_plot_limits(): plot_limits.value_limits = 1, 2 plot_limits.index_limits = 3, 4 plot_limits.count_limits = 5, 6 - plot_limits.depth_limits = 7, 8 plot_limits.density_limits = 9, 10 plot_limits.date_limits = ( datetime.date(1999, 1, 1), @@ -95,7 +89,6 @@ def test_copy_plot_limits(): assert copy_of_plot_limits.value_limits == (1, 2) assert copy_of_plot_limits.index_limits == (3, 4) assert copy_of_plot_limits.count_limits == (5, 6) - assert copy_of_plot_limits.depth_limits == (7, 8) assert copy_of_plot_limits.density_limits == (9, 10) assert copy_of_plot_limits.date_limits == ( datetime.date(1999, 1, 1), diff --git a/tests/unit_tests/gui/plottery/test_plot_style.py b/tests/unit_tests/gui/plottery/test_plot_style.py index 54b3d16c96c..4a0c33cb55c 100644 --- a/tests/unit_tests/gui/plottery/test_plot_style.py +++ b/tests/unit_tests/gui/plottery/test_plot_style.py @@ -80,7 +80,6 @@ def test_plot_config(): limits = PlotLimits() limits.count_limits = 1, 2 - limits.depth_limits = 3, 4 limits.density_limits = 5, 6 limits.date_limits = datetime.date(2005, 2, 5), datetime.date(2006, 2, 6) limits.index_limits = 7, 8