Fix regression: Excluded events plotted on top of filtered events (close

 #86)

CHANGELOG

@@ -1,3 +1,6 @@
+0.6.3
+- Bugfixes:
+  - Fix regression: Excluded events plotted on top of filtered events (#86)
 0.6.2
 - Add batch filter processing
 - Move statistics computation to dclab (0.1.7dev12):

shapeout/gui/plot_scatter.py

@@ -143,9 +143,6 @@ def scatter_plot(measurement,
         plot_kwargs["type"] = "cmap_scatter"
         plot_kwargs["color_mapper"] = ca.jet
 
-    if pd.get_data("index") is not None:
-        scatter_plot.plot(**plot_kwargs)
-
     # Excluded events
     if (plotfilters["Scatter Plot Excluded Events"] and
         mm._filter.sum() != mm.time.shape[0]):
@@ -157,6 +154,10 @@ def scatter_plot(measurement,
         if pd.get_data("excl_index") is not None:
             scatter_plot.plot(**plot_kwargs_excl)
 
+    # Plot colored points on top of excluded events
+    if pd.get_data("index") is not None:
+        scatter_plot.plot(**plot_kwargs)
+
     # Set x-y limits
     xlim = scatter_plot.index_mapper.range
     ylim = scatter_plot.value_mapper.range