Update stats to be relevant to current region

GMOD · Nov 14, 2024 · 67cb847 · 67cb847
1 parent 00a8c8f
commit 67cb847
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 21 deletions.
diff --git a/packages/core/util/stats.ts b/packages/core/util/stats.ts
@@ -14,6 +14,7 @@ export interface UnrectifiedQuantitativeStats {
   basesCovered: number
 }
 export interface QuantitativeStats extends UnrectifiedQuantitativeStats {
+  currStatsRegions: string
   currStatsBpPerPx: number
   featureDensity: number
   scoreMean: number

diff --git a/plugins/wiggle/src/LinearWiggleDisplay/model.ts b/plugins/wiggle/src/LinearWiggleDisplay/model.ts
@@ -75,9 +75,13 @@ function stateModelFactory(
        * #getter
        * unused currently
        */
-      get quantitativeStatsRelevantToCurrentZoom() {
+      get quantitativeStatsUpToDate() {
         const view = getContainingView(self) as LinearGenomeViewModel
-        return self.stats?.currStatsBpPerPx === view.bpPerPx
+        const statsRegions = JSON.stringify(view.dynamicBlocks)
+        return (
+          self.stats?.currStatsBpPerPx === view.bpPerPx ||
+          self.stats?.currStatsRegions === statsRegions
+        )
       },
     }))
 
@@ -140,7 +144,7 @@ function stateModelFactory(
         const superProps = self.adapterProps()
         return {
           ...self.adapterProps(),
-          notReady: superProps.notReady || !self.stats,
+          notReady: superProps.notReady || !self.quantitativeStatsUpToDate,
           height,
           ticks,
         }
@@ -150,8 +154,10 @@ function stateModelFactory(
        * #getter
        */
       get needsScalebar() {
-        const { rendererTypeName: type } = self
-        return type === 'XYPlotRenderer' || type === 'LinePlotRenderer'
+        return (
+          self.rendererTypeName === 'XYPlotRenderer' ||
+          self.rendererTypeName === 'LinePlotRenderer'
+        )
       },
       /**
        * #getter

diff --git a/plugins/wiggle/src/getQuantitativeStats.ts b/plugins/wiggle/src/getQuantitativeStats.ts
@@ -20,13 +20,14 @@ export async function getQuantitativeStats(
     signal?: AbortSignal
     filters: string[]
     currStatsBpPerPx: number
+    currStatsRegions: string
   },
 ): Promise<QuantitativeStats> {
-  const { rpcManager } = getSession(self)
   const numStdDev = getConf(self, 'numStdDev') || 3
-  const { adapterConfig, autoscaleType } = self
   const sessionId = getRpcSessionId(self)
-  const { currStatsBpPerPx } = opts
+  const { rpcManager } = getSession(self)
+  const { adapterConfig, autoscaleType } = self
+  const { currStatsRegions, currStatsBpPerPx } = opts
   const params = {
     sessionId,
     adapterConfig,
@@ -55,10 +56,12 @@ export async function getQuantitativeStats(
           scoreMin: scoreMin >= 0 ? 0 : scoreMean - numStdDev * scoreStdDev,
           scoreMax: scoreMean + numStdDev * scoreStdDev,
           currStatsBpPerPx,
+          currStatsRegions,
         }
       : {
           ...results,
           currStatsBpPerPx,
+          currStatsRegions,
         }
   }
   if (autoscaleType === 'local' || autoscaleType === 'localsd') {
@@ -90,10 +93,12 @@ export async function getQuantitativeStats(
           scoreMin: scoreMin >= 0 ? 0 : scoreMean - numStdDev * scoreStdDev,
           scoreMax: scoreMean + numStdDev * scoreStdDev,
           currStatsBpPerPx,
+          currStatsRegions,
         }
       : {
           ...results,
           currStatsBpPerPx,
+          currStatsRegions,
         }
   }
   if (autoscaleType === 'zscale') {

diff --git a/plugins/wiggle/src/getQuantitativeStatsAutorun.ts b/plugins/wiggle/src/getQuantitativeStatsAutorun.ts
@@ -12,6 +12,7 @@ type LGV = LinearGenomeViewModel
 
 export function getQuantitativeStatsAutorun(self: {
   quantitativeStatsReady: boolean
+  quantitativeStatsUpToDate: boolean
   configuration: AnyConfigurationModel
   adapterConfig: AnyConfigurationModel
   autoscaleType: string
@@ -29,21 +30,24 @@ export function getQuantitativeStatsAutorun(self: {
           const view = getContainingView(self) as LGV
           const aborter = new AbortController()
           self.setStatsLoading(aborter)
-
           if (!self.quantitativeStatsReady) {
             return
           }
+          if (self.quantitativeStatsUpToDate) {
+            return
+          }
 
-          const statsRegion = JSON.stringify(view.dynamicBlocks)
+          const statsRegions = JSON.stringify(view.dynamicBlocks)
           const wiggleStats = await getQuantitativeStats(self, {
             signal: aborter.signal,
             filters: [],
             currStatsBpPerPx: view.bpPerPx,
+            currStatsRegions: statsRegions,
             ...self.adapterProps(),
           })
 
           if (isAlive(self)) {
-            self.updateQuantitativeStats(wiggleStats, statsRegion)
+            self.updateQuantitativeStats(wiggleStats, statsRegions)
           }
         } catch (e) {
           console.error(e)

diff --git a/plugins/wiggle/src/shared/SharedWiggleMixin.ts b/plugins/wiggle/src/shared/SharedWiggleMixin.ts
@@ -20,6 +20,13 @@ import { lazy } from 'react'
 // lazies
 const SetMinMaxDialog = lazy(() => import('./SetMinMaxDialog'))
 
+export interface QuantitativeStats {
+  currStatsRegions: string
+  currStatsBpPerPx: number
+  scoreMin: number
+  scoreMax: number
+}
+
 /**
  * #stateModel SharedWiggleMixin
  */
@@ -102,9 +109,7 @@ export default function SharedWiggleMixin(
       /**
        * #volatile
        */
-      stats: undefined as
-        | { currStatsBpPerPx: number; scoreMin: number; scoreMax: number }
-        | undefined,
+      stats: undefined as QuantitativeStats | undefined,
       /**
        * #volatile
        */
@@ -114,19 +119,16 @@ export default function SharedWiggleMixin(
       /**
        * #action
        */
-      updateQuantitativeStats(stats: {
-        currStatsBpPerPx: number
-        scoreMin: number
-        scoreMax: number
-      }) {
-        const { currStatsBpPerPx, scoreMin, scoreMax } = stats
+      updateQuantitativeStats(stats: QuantitativeStats) {
+        const { currStatsRegions, currStatsBpPerPx, scoreMin, scoreMax } = stats
         const EPSILON = 0.000001
         if (
           !self.stats ||
           Math.abs(self.stats.scoreMax - scoreMax) > EPSILON ||
           Math.abs(self.stats.scoreMin - scoreMin) > EPSILON
         ) {
           self.stats = {
+            currStatsRegions,
             currStatsBpPerPx,
             scoreMin,
             scoreMax,
@@ -518,7 +520,10 @@ export default function SharedWiggleMixin(
             onClick: () => {
               getSession(self).queueDialog(handleClose => [
                 SetMinMaxDialog,
-                { model: self, handleClose },
+                {
+                  model: self,
+                  handleClose,
+                },
               ])
             },
           },