Merge pull request tskit-dev#177 from benjeffery/fix-blank-muts

Fix initially blank mutations
savitakartik · Oct 4, 2024 · 61d35d2 · 61d35d2
2 parents 732b741 + c9c7bd2
commit 61d35d2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/tsbrowse/pages/edges.py b/tsbrowse/pages/edges.py
@@ -37,7 +37,7 @@ def make_edges_panel(log_y, node_type, tsm):
     streams = [range_stream]
     filtered = lines.apply(filter_points, streams=streams)
     hover = filtered.apply(hover_points)
-    shaded = hd.datashade(filtered, streams=streams, cmap=config.PLOT_COLOURS[1:])
+    shaded = hd.datashade(lines, streams=streams, cmap=config.PLOT_COLOURS[1:])
     hover_tool = bkm.HoverTool(
         tooltips=[
             ("child", "@child"),

diff --git a/tsbrowse/pages/mutations.py b/tsbrowse/pages/mutations.py
@@ -9,7 +9,6 @@
 from .. import config
 from ..plot_helpers import center_plot_title
 from ..plot_helpers import customise_ticks
-from ..plot_helpers import filter_points
 from ..plot_helpers import hover_points
 from ..plot_helpers import make_hist_on_axis
 from ..plot_helpers import selected_hist
@@ -35,16 +34,14 @@ def make_muts_panel(log_y, tsm):
 
     range_stream = hv.streams.RangeXY(source=points)
 
-    filtered = points.apply(filter_points, streams=[range_stream])
-
     tooltips = [
         ("ID", "@id"),
         ("parents", "@num_parents"),
         ("descendants", "@num_descendants"),
         ("inheritors", "@num_inheritors"),
     ]
     hover = HoverTool(tooltips=tooltips)
-    filtered.opts(
+    points.opts(
         color="num_inheritors",
         alpha="num_inheritors",
         cmap="BuGn",
@@ -53,9 +50,9 @@ def make_muts_panel(log_y, tsm):
         tools=[hover, "tap"],
     )
 
-    hover = filtered.apply(hover_points)
+    hover = points.apply(hover_points)
     shaded = hd.datashade(
-        filtered,
+        points,
         width=400,
         height=400,
         streams=[range_stream],

diff --git a/tsbrowse/pages/nodes.py b/tsbrowse/pages/nodes.py
@@ -49,7 +49,7 @@ def make_node_plot(data, node_types):
             filtered = points.apply(filter_points, streams=streams)
             hover = filtered.apply(hover_points, threshold=config.THRESHOLD)
             shaded = hd.datashade(
-                filtered,
+                points,
                 width=400,
                 height=400,
                 streams=streams,