Misc

GMOD · Nov 23, 2024 · 18babc1 · 18babc1
1 parent 4c59558
commit 18babc1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/plugins/wiggle/src/XYPlotRenderer/XYPlotRenderer.ts b/plugins/wiggle/src/XYPlotRenderer/XYPlotRenderer.ts
@@ -11,7 +11,7 @@ export default class XYPlotRenderer extends WiggleBaseRenderer {
     ctx: CanvasRenderingContext2D,
     props: RenderArgsDeserializedWithFeatures,
   ) {
-    const { features, config } = props
+    const { stopToken, features, config } = props
 
     // the adjusted height takes into account YSCALEBAR_LABEL_OFFSET from the
     // wiggle display, and makes the height of the actual drawn area add
@@ -30,6 +30,7 @@ export default class XYPlotRenderer extends WiggleBaseRenderer {
               readConfObject(config, 'color', { feature }),
       offset: YSCALEBAR_LABEL_OFFSET,
       features: [...features.values()],
+      stopToken,
     })
   }
 }
diff --git a/plugins/wiggle/src/drawXY.ts b/plugins/wiggle/src/drawXY.ts
@@ -11,6 +11,7 @@ import { clamp, featureSpanPx, Feature, Region } from '@jbrowse/core/util'
 
 // locals
 import { fillRectCtx, getOrigin, getScale, ScaleOpts } from './util'
+import { checkStopToken } from '@jbrowse/core/util/stopToken'
 
 function lighten(color: Colord, amount: number) {
   const hslColor = color.toHsl()
@@ -30,6 +31,7 @@ const clipHeight = 2
 export function drawXY(
   ctx: CanvasRenderingContext2D,
   props: {
+    stopToken?: string
     features: Map<string, Feature> | Feature[]
     bpPerPx: number
     regions: Region[]
@@ -83,13 +85,20 @@ export function drawXY(
   const reducedFeatures = []
   const crossingOrigin = niceMin < pivotValue && niceMax > pivotValue
 
+  let start = performance.now()
+
   // we handle whiskers separately to render max row, min row, and avg in three
   // passes. this reduces subpixel rendering issues. note: for stylistic
   // reasons, clipping indicator is only drawn for score, not min/max score
   if (summaryScoreMode === 'whiskers') {
     let lastCol: string | undefined
     let lastMix: string | undefined
+    start = performance.now()
     for (const feature of features.values()) {
+      if (performance.now() - start > 400) {
+        checkStopToken()
+        start = performance.now()
+      }
       const [leftPx, rightPx] = featureSpanPx(feature, region, bpPerPx)
       if (feature.get('summary')) {
         const w = Math.max(rightPx - leftPx + fudgeFactor, minSize)
@@ -106,7 +115,12 @@ export function drawXY(
     }
     lastMix = undefined
     lastCol = undefined
+    start = performance.now()
     for (const feature of features.values()) {
+      if (performance.now() - start > 400) {
+        checkStopToken()
+        start = performance.now()
+      }
       const [leftPx, rightPx] = featureSpanPx(feature, region, bpPerPx)
       const score = feature.get('score')
       const max = feature.get('maxScore')
@@ -133,7 +147,12 @@ export function drawXY(
     }
     lastMix = undefined
     lastCol = undefined
+    start = performance.now()
     for (const feature of features.values()) {
+      if (performance.now() - start > 400) {
+        checkStopToken()
+        start = performance.now()
+      }
       const [leftPx, rightPx] = featureSpanPx(feature, region, bpPerPx)
 
       if (feature.get('summary')) {
@@ -151,7 +170,12 @@ export function drawXY(
       }
     }
   } else {
+    start = performance.now()
     for (const feature of features.values()) {
+      if (performance.now() - start > 400) {
+        checkStopToken()
+        start = performance.now()
+      }
       const [leftPx, rightPx] = featureSpanPx(feature, region, bpPerPx)
 
       // create reduced features, avoiding multiple features per px
@@ -183,7 +207,12 @@ export function drawXY(
   ctx.save()
   if (hasClipping) {
     ctx.fillStyle = clipColor
+    start = performance.now()
     for (const feature of features.values()) {
+      if (performance.now() - start > 400) {
+        checkStopToken()
+        start = performance.now()
+      }
       const [leftPx, rightPx] = featureSpanPx(feature, region, bpPerPx)
       const w = rightPx - leftPx + fudgeFactor
       const score = feature.get('score')