From c0fd11de7990b700dc024de462fe0ef2d01607b4 Mon Sep 17 00:00:00 2001
From: Poruri Sai Rahul <rporuri@enthought.com>
Date: Tue, 13 Apr 2021 14:17:08 +0530
Subject: [PATCH] CLN : Remove unnecessary uses of use_draw_order

and redefinition of the trait on a PlotComponent subclass
and a commented out piece of code

	modified:   chaco/barplot.py
	modified:   chaco/color_bar.py
	modified:   examples/demo/zoomed_plot/grid_plot_factory.py
	modified:   examples/demo/zoomed_plot/zoom_plot.py
---
 chaco/barplot.py                               |  2 --
 chaco/color_bar.py                             |  2 --
 examples/demo/zoomed_plot/grid_plot_factory.py | 14 ++------------
 examples/demo/zoomed_plot/zoom_plot.py         |  7 +------
 4 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/chaco/barplot.py b/chaco/barplot.py
index 2abd78ef3..de73c9624 100644
--- a/chaco/barplot.py
+++ b/chaco/barplot.py
@@ -107,8 +107,6 @@ class BarPlot(AbstractPlotRenderer):
     #: Overall alpha value of the image. Ranges from 0.0 for transparent to 1.0
     alpha = Range(0.0, 1.0, 1.0, requires_redraw=True)
 
-    # use_draw_order = False
-
     # Convenience properties that correspond to either index_mapper or
     # value_mapper, depending on the orientation of the plot.
 
diff --git a/chaco/color_bar.py b/chaco/color_bar.py
index 99be4f61f..bcdd7416e 100644
--- a/chaco/color_bar.py
+++ b/chaco/color_bar.py
@@ -69,8 +69,6 @@ class ColorBar(AbstractPlotRenderer):
     direction = Enum("normal", "flipped")
     #: Overrides the default background color trait in PlotComponent.
     bgcolor = "transparent"
-    #: Draw layers in "draw order"
-    use_draw_order = True
     #: Default width is 40 pixels (overrides enable.CoordinateBox)
     width = 40
 
diff --git a/examples/demo/zoomed_plot/grid_plot_factory.py b/examples/demo/zoomed_plot/grid_plot_factory.py
index 7d69f7791..17ba11467 100644
--- a/examples/demo/zoomed_plot/grid_plot_factory.py
+++ b/examples/demo/zoomed_plot/grid_plot_factory.py
@@ -62,7 +62,6 @@ def create_gridded_line_plot(
         orientation="vertical",
         line_color="gray",
         line_style="dot",
-        use_draw_order=True,
     )
 
     horizontal_grid = PlotGrid(
@@ -71,18 +70,14 @@ def create_gridded_line_plot(
         orientation="horizontal",
         line_color="gray",
         line_style="dot",
-        use_draw_order=True,
     )
 
-    vertical_axis = PlotAxis(
-        orientation="left", mapper=plot.value_mapper, use_draw_order=True
-    )
+    vertical_axis = PlotAxis(orientation="left", mapper=plot.value_mapper)
 
     horizontal_axis = PlotAxis(
         orientation="bottom",
         title="Time (s)",
         mapper=plot.index_mapper,
-        use_draw_order=True,
     )
 
     plot.underlays.append(vertical_grid)
@@ -150,7 +145,6 @@ def create_gridded_scatter_plot(
         orientation="vertical",
         line_color="gray",
         line_style="dot",
-        use_draw_order=True,
     )
 
     horizontal_grid = PlotGrid(
@@ -159,18 +153,14 @@ def create_gridded_scatter_plot(
         orientation="horizontal",
         line_color="gray",
         line_style="dot",
-        use_draw_order=True,
     )
 
-    vertical_axis = PlotAxis(
-        orientation="left", mapper=plot.value_mapper, use_draw_order=True
-    )
+    vertical_axis = PlotAxis(orientation="left", mapper=plot.value_mapper)
 
     horizontal_axis = PlotAxis(
         orientation="bottom",
         title="Time (s)",
         mapper=plot.index_mapper,
-        use_draw_order=True,
     )
 
     plot.underlays.append(vertical_grid)
diff --git a/examples/demo/zoomed_plot/zoom_plot.py b/examples/demo/zoomed_plot/zoom_plot.py
index a0249eeee..f06d14cc2 100644
--- a/examples/demo/zoomed_plot/zoom_plot.py
+++ b/examples/demo/zoomed_plot/zoom_plot.py
@@ -117,7 +117,6 @@ def configure_plot(plot, xlabel="Time (s)"):
             orientation="vertical",
             line_color="gray",
             line_style="dot",
-            use_draw_order=True,
         )
 
         horizontal_grid = PlotGrid(
@@ -126,18 +125,14 @@ def configure_plot(plot, xlabel="Time (s)"):
             orientation="horizontal",
             line_color="gray",
             line_style="dot",
-            use_draw_order=True,
         )
 
-        vertical_axis = PlotAxis(
-            orientation="left", mapper=plot.value_mapper, use_draw_order=True
-        )
+        vertical_axis = PlotAxis(orientation="left", mapper=plot.value_mapper)
 
         horizontal_axis = PlotAxis(
             orientation="bottom",
             title=xlabel,
             mapper=plot.index_mapper,
-            use_draw_order=True,
         )
 
         plot.underlays.append(vertical_grid)