@jbrowse/plugin-dotplot-view 2.6.1 → 2.6.2

package/src/DotplotRenderer/ComparativeRenderRpc.ts

@@ -1,87 +0,0 @@
-import { checkAbortSignal } from '@jbrowse/core/util'
-import RpcMethodType from '@jbrowse/core/pluggableElementTypes/RpcMethodType'
-import ComparativeRenderer, {
-  RenderArgs as ComparativeRenderArgs,
-  RenderArgsSerialized as ComparativeRenderArgsSerialized,
-  RenderResults,
-  ResultsSerialized,
-} from '@jbrowse/core/pluggableElementTypes/renderers/ComparativeServerSideRendererType'
-import { RemoteAbortSignal } from '@jbrowse/core/rpc/remoteAbortSignals'
-
-interface RenderArgs extends ComparativeRenderArgs {
-  adapterConfig: {}
-  rendererType: string
-}
-
-interface RenderArgsSerialized extends ComparativeRenderArgsSerialized {
-  adapterConfig: {}
-  rendererType: string
-}
-
-/**
- * call a synteny renderer with the given args
- * param views: a set of views that each contain a set of regions
- * used instead of passing regions directly as in render()
- */
-export default class ComparativeRender extends RpcMethodType {
-  name = 'ComparativeRender'
-
-  async renameRegionsIfNeeded(args: RenderArgs, rend: ComparativeRenderer) {
-    return rend.renameRegionsIfNeeded(args)
-  }
-
-  getRenderer(rendererType: string) {
-    const pm = this.pluginManager
-    return pm.getRendererType(rendererType) as ComparativeRenderer
-  }
-
-  async serializeArguments(args: RenderArgs, rpcDriver: string) {
-    const { rendererType } = args
-    const renderer = this.getRenderer(rendererType)
-    const n = (await super.serializeArguments(args, rpcDriver)) as RenderArgs
-    const result = await this.renameRegionsIfNeeded(n, renderer)
-
-    return rpcDriver === 'MainThreadRpcDriver'
-      ? result
-      : renderer.serializeArgsInClient(result)
-  }
-
-  async execute(
-    args: RenderArgsSerialized & { signal?: RemoteAbortSignal },
-    rpcDriver: string,
-  ) {
-    let deserializedArgs = args
-    if (rpcDriver !== 'MainThreadRpcDriver') {
-      deserializedArgs = await this.deserializeArguments(args, rpcDriver)
-    }
-    const { sessionId, rendererType, signal } = deserializedArgs
-    if (!sessionId) {
-      throw new Error('must pass a unique session id')
-    }
-
-    checkAbortSignal(signal)
-
-    const renderer = this.getRenderer(rendererType)
-    return rpcDriver === 'MainThreadRpcDriver'
-      ? renderer.render(deserializedArgs)
-      : renderer.renderInWorker(deserializedArgs)
-  }
-
-  async deserializeReturn(
-    val: RenderResults | ResultsSerialized,
-    args: RenderArgs,
-    rpcDriver: string,
-  ): Promise<unknown> {
-    const ret = (await super.deserializeReturn(
-      val,
-      args,
-      rpcDriver,
-    )) as ResultsSerialized
-    if (rpcDriver === 'MainThreadRpcDriver') {
-      return ret
-    }
-
-    const renderer = this.getRenderer(args.rendererType)
-    return renderer.deserializeResultsInClient(ret, args)
-  }
-}

package/src/DotplotRenderer/DotplotRenderer.ts

@@ -1,328 +0,0 @@
-import {
-  readConfObject,
-  AnyConfigurationModel,
-} from '@jbrowse/core/configuration'
-import {
-  renameRegionsIfNeeded,
-  renderToAbstractCanvas,
-  Region,
-  Feature,
-} from '@jbrowse/core/util'
-import { bpToPx } from '@jbrowse/core/util/Base1DUtils'
-import { getSnapshot } from 'mobx-state-tree'
-import ComparativeRenderer, {
-  RenderArgsDeserialized,
-  RenderArgs,
-} from '@jbrowse/core/pluggableElementTypes/renderers/ComparativeServerSideRendererType'
-import { MismatchParser } from '@jbrowse/plugin-alignments'
-
-// locals
-import { Dotplot1DView, Dotplot1DViewModel } from '../DotplotView/model'
-import { createJBrowseTheme } from '@jbrowse/core/ui'
-
-const { parseCigar } = MismatchParser
-
-export interface DotplotRenderArgsDeserialized extends RenderArgsDeserialized {
-  height: number
-  width: number
-  highResolutionScaling: number
-  view: {
-    hview: Dotplot1DViewModel
-    vview: Dotplot1DViewModel
-  }
-}
-
-interface DotplotRenderArgs extends RenderArgs {
-  adapterConfig: AnyConfigurationModel
-  sessionId: string
-  view: {
-    hview: { displayedRegions: Region[] }
-    vview: { displayedRegions: Region[] }
-  }
-}
-
-const r = 'fell outside of range due to CIGAR string'
-const lt = '(less than min coordinate of feature)'
-const gt = '(greater than max coordinate of feature)'
-const fudgeFactor = 1 // allow 1px fuzzyness before warn
-
-function drawCir(ctx: CanvasRenderingContext2D, x: number, y: number, r = 1) {
-  ctx.beginPath()
-  ctx.arc(x, y, r / 2, 0, 2 * Math.PI)
-  ctx.fill()
-}
-
-export default class DotplotRenderer extends ComparativeRenderer {
-  supportsSVG = true
-
-  async renameRegionsIfNeeded(args: DotplotRenderArgs) {
-    const pm = this.pluginManager
-    const assemblyManager = pm.rootModel?.session?.assemblyManager
-
-    const { view, sessionId, adapterConfig } = args
-
-    async function process(regions?: Region[]) {
-      if (!assemblyManager) {
-        throw new Error('No assembly manager provided')
-      }
-      const result = await renameRegionsIfNeeded(assemblyManager, {
-        sessionId,
-        adapterConfig,
-        regions,
-      })
-      return result.regions
-    }
-
-    view.hview.displayedRegions = await process(view.hview.displayedRegions)
-    view.vview.displayedRegions = await process(view.vview.displayedRegions)
-
-    return args
-  }
-
-  async drawDotplot(
-    ctx: CanvasRenderingContext2D,
-    props: DotplotRenderArgsDeserialized & { views: Dotplot1DViewModel[] },
-  ) {
-    const { config, views, height, drawCigar, theme } = props
-    const color = readConfObject(config, 'color')
-    const posColor = readConfObject(config, 'posColor')
-    const negColor = readConfObject(config, 'negColor')
-    const colorBy = readConfObject(config, 'colorBy')
-    const lineWidth = readConfObject(config, 'lineWidth')
-    const thresholds = readConfObject(config, 'thresholds')
-    const palette = readConfObject(config, 'thresholdsPalette')
-    const isCallback = config.color.isCallback
-    const [hview, vview] = views
-    const db1 = hview.dynamicBlocks.contentBlocks[0]?.offsetPx
-    const db2 = vview.dynamicBlocks.contentBlocks[0]?.offsetPx
-    const warnings = [] as { message: string; effect: string }[]
-    ctx.lineWidth = lineWidth
-
-    // we operate on snapshots of these attributes of the hview/vview because
-    // it is significantly faster than accessing the mobx objects
-    const { bpPerPx: hBpPerPx } = hview
-    const { bpPerPx: vBpPerPx } = vview
-
-    function clampWithWarnX(
-      num: number,
-      min: number,
-      max: number,
-      feature: Feature,
-    ) {
-      const strand = feature.get('strand') || 1
-      if (strand === -1) {
-        ;[max, min] = [min, max]
-      }
-      if (num < min - fudgeFactor) {
-        let start = feature.get('start')
-        let end = feature.get('end')
-        const refName = feature.get('refName')
-        if (strand === -1) {
-          ;[end, start] = [start, end]
-        }
-
-        warnings.push({
-          message: `feature at (X ${refName}:${start}-${end}) ${r} ${lt}`,
-          effect: 'clipped the feature',
-        })
-        return min
-      }
-      if (num > max + fudgeFactor) {
-        const strand = feature.get('strand') || 1
-        const start = strand === 1 ? feature.get('start') : feature.get('end')
-        const end = strand === 1 ? feature.get('end') : feature.get('start')
-        const refName = feature.get('refName')
-
-        warnings.push({
-          message: `feature at (X ${refName}:${start}-${end}) ${r} ${gt}`,
-          effect: 'clipped the feature',
-        })
-        return max
-      }
-      return num
-    }
-
-    function clampWithWarnY(
-      num: number,
-      min: number,
-      max: number,
-      feature: Feature,
-    ) {
-      if (num < min - fudgeFactor) {
-        const mate = feature.get('mate')
-        const { refName, start, end } = mate
-        warnings.push({
-          message: `feature at (Y ${refName}:${start}-${end}) ${r} ${lt}`,
-          effect: 'clipped the feature',
-        })
-        return min
-      }
-      if (num > max + fudgeFactor) {
-        const mate = feature.get('mate')
-        const { refName, start, end } = mate
-
-        warnings.push({
-          message: `feature at (Y ${refName}:${start}-${end}) ${r} ${gt}`,
-          effect: 'clipped the feature',
-        })
-        return max
-      }
-      return num
-    }
-
-    const hsnap = {
-      ...getSnapshot(hview),
-      staticBlocks: hview.staticBlocks,
-      width: hview.width,
-    }
-    const vsnap = {
-      ...getSnapshot(vview),
-      staticBlocks: vview.staticBlocks,
-      width: vview.width,
-    }
-    const t = createJBrowseTheme(theme)
-    hview.features?.forEach(feature => {
-      const strand = feature.get('strand') || 1
-      const start = strand === 1 ? feature.get('start') : feature.get('end')
-      const end = strand === 1 ? feature.get('end') : feature.get('start')
-      const refName = feature.get('refName')
-      const mate = feature.get('mate')
-      const mateRef = mate.refName
-
-      let r
-      if (colorBy === 'identity') {
-        const identity = feature.get('identity')
-        for (let i = 0; i < thresholds.length; i++) {
-          if (identity > +thresholds[i]) {
-            r = palette[i]
-            break
-          }
-        }
-      } else if (colorBy === 'meanQueryIdentity') {
-        r = `hsl(${feature.get('meanScore') * 200},100%,40%)`
-      } else if (colorBy === 'mappingQuality') {
-        r = `hsl(${feature.get('mappingQual')},100%,40%)`
-      } else if (colorBy === 'strand') {
-        r = strand === -1 ? negColor : posColor
-      } else if (colorBy === 'default') {
-        r = isCallback
-          ? readConfObject(config, 'color', { feature })
-          : color === '#f0f'
-          ? t.palette.text.primary
-          : color
-      }
-      ctx.fillStyle = r
-      ctx.strokeStyle = r
-
-      const b10 = bpToPx({ self: hsnap, refName, coord: start })
-      const b20 = bpToPx({ self: hsnap, refName, coord: end })
-      const e10 = bpToPx({ self: vsnap, refName: mateRef, coord: mate.start })
-      const e20 = bpToPx({ self: vsnap, refName: mateRef, coord: mate.end })
-      if (
-        b10 !== undefined &&
-        b20 !== undefined &&
-        e10 !== undefined &&
-        e20 !== undefined
-      ) {
-        const b1 = b10.offsetPx - db1
-        const b2 = b20.offsetPx - db1
-        const e1 = e10.offsetPx - db2
-        const e2 = e20.offsetPx - db2
-        if (Math.abs(b1 - b2) <= 4 && Math.abs(e1 - e2) <= 4) {
-          drawCir(ctx, b1, height - e1, lineWidth)
-        } else {
-          let currX = b1
-          let currY = e1
-          const cigar = feature.get('CIGAR')
-          if (drawCigar && cigar) {
-            const cigarOps = parseCigar(cigar)
-
-            ctx.beginPath()
-            ctx.moveTo(currX, height - currY)
-
-            for (let i = 0; i < cigarOps.length; i += 2) {
-              const val = +cigarOps[i]
-              const op = cigarOps[i + 1]
-              if (op === 'M' || op === '=' || op === 'X') {
-                currX += (val / hBpPerPx) * strand
-                currY += val / vBpPerPx
-              } else if (op === 'D' || op === 'N') {
-                currX += (val / hBpPerPx) * strand
-              } else if (op === 'I') {
-                currY += val / vBpPerPx
-              }
-              currX = clampWithWarnX(currX, b1, b2, feature)
-              currY = clampWithWarnY(currY, e1, e2, feature)
-              ctx.lineTo(currX, height - currY)
-            }
-
-            ctx.stroke()
-          } else {
-            ctx.beginPath()
-            ctx.moveTo(b1, height - e1)
-            ctx.lineTo(b2, height - e2)
-            ctx.stroke()
-          }
-        }
-      } else {
-        if (warnings.length <= 5) {
-          if (b10 === undefined || b20 === undefined) {
-            warnings.push({
-              message: `feature at (X ${refName}:${start}-${end}) not plotted, fell outside of range`,
-              effect: 'feature not rendered',
-            })
-          } else {
-            warnings.push({
-              message: `feature at (Y ${mateRef}:${mate.start}-${mate.end}) not plotted, fell outside of range`,
-              effect: 'feature not rendered',
-            })
-          }
-        }
-      }
-    })
-
-    return { warnings }
-  }
-
-  async render(renderProps: DotplotRenderArgsDeserialized) {
-    const {
-      width,
-      height,
-      view: { hview, vview },
-    } = renderProps
-    const dimensions = [width, height]
-    const views = [hview, vview].map((snap, idx) => {
-      const view = Dotplot1DView.create(snap)
-      view.setVolatileWidth(dimensions[idx])
-      return view
-    })
-    const target = views[0]
-    const feats = await this.getFeatures({
-      ...renderProps,
-      regions: target.dynamicBlocks.contentBlocks,
-    })
-    target.setFeatures(feats)
-
-    const ret = await renderToAbstractCanvas(width, height, renderProps, ctx =>
-      this.drawDotplot(ctx, { ...renderProps, views }),
-    )
-
-    const results = await super.render({
-      ...renderProps,
-      ...ret,
-      height,
-      width,
-    })
-
-    return {
-      ...results,
-      ...ret,
-      height,
-      width,
-      offsetX: views[0].dynamicBlocks.blocks[0]?.offsetPx || 0,
-      offsetY: views[1].dynamicBlocks.blocks[0]?.offsetPx || 0,
-      bpPerPxX: views[0].bpPerPx,
-      bpPerPxY: views[1].bpPerPx,
-    }
-  }
-}

package/src/DotplotRenderer/components/DotplotRendering.tsx

@@ -1,12 +0,0 @@
-import React from 'react'
-import { PrerenderedCanvas } from '@jbrowse/core/ui'
-import { observer } from 'mobx-react'
-
-// locals
-import { DotplotRenderArgsDeserialized } from '../DotplotRenderer'
-
-function DotplotRendering(props: DotplotRenderArgsDeserialized) {
-  return <PrerenderedCanvas {...props} />
-}
-
-export default observer(DotplotRendering)

package/src/DotplotRenderer/configSchema.ts

@@ -1,92 +0,0 @@
-import { ConfigurationSchema } from '@jbrowse/core/configuration'
-import { types } from 'mobx-state-tree'
-
-/**
- * #config DotplotRenderer
- * #category renderer
- */
-function x() {} // eslint-disable-line @typescript-eslint/no-unused-vars
-
-export default ConfigurationSchema(
-  'DotplotRenderer',
-  {
-    /**
-     * #slot
-     */
-    color: {
-      type: 'color',
-      description:
-        'the color of each feature in a synteny, used with colorBy:default',
-      defaultValue: '#f0f',
-      contextVariable: ['feature'],
-    },
-
-    /**
-     * #slot
-     */
-    posColor: {
-      type: 'color',
-      description: 'the color for forward alignments, used with colorBy:strand',
-      defaultValue: 'blue',
-    },
-    /**
-     * #slot
-     */
-    negColor: {
-      type: 'color',
-      description: 'the color for reverse alignments, used with colorBy:strand',
-      defaultValue: 'red',
-    },
-
-    /**
-     * #slot
-     */
-    lineWidth: {
-      type: 'number',
-      description: 'width of the lines to be drawn',
-      defaultValue: 2.5, // 2.5 is similar to D-GENIES
-    },
-
-    /**
-     * #slot
-     */
-    colorBy: {
-      type: 'stringEnum',
-      model: types.enumeration('colorBy', [
-        'identity',
-        'meanQueryIdentity',
-        'mappingQuality',
-        'strand',
-        'default',
-      ]),
-      description: `Color by options:<br/>
-<ul>
-  <li>"identity" - the identity of the particular hit, similar to D-GENIES, use the other config slots 'thresholds' and 'thresholdsPalette' to define colors for this setting</li>
-  <li>"meanQueryIdentity" - calculates the weighted mean identity (weighted by alignment length) of all the hits that the query maps to (e.g. if the query is split aligned to many target, uses their weighted mean. can help show patterns of more related and distant synteny after WGD)</li>
-  <li>"mappingQuality" - uses mapping quality from PAF, some adapters don't have this setting</li>
-  <li>"strand" - colors negative alignments with negColor and positive alignments with posColor</li>
-  <li>"default" - uses the 'color' config slot</li>
-</ul>`,
-      defaultValue: 'default',
-    },
-
-    /**
-     * #slot
-     */
-    thresholdsPalette: {
-      type: 'stringArray',
-      defaultValue: ['#094b09', '#2ebd40', '#d5670b', '#ffd84b'],
-      description: 'threshold colors, used with colorBy:identity',
-    },
-
-    /**
-     * #slot
-     */
-    thresholds: {
-      type: 'stringArray',
-      defaultValue: ['0.75', '0.5', '0.25', '0'],
-      description: 'threshold breakpoints, used with colorBy:identity',
-    },
-  },
-  { explicitlyTyped: true },
-)

package/src/DotplotRenderer/index.ts

@@ -1,16 +0,0 @@
-import PluginManager from '@jbrowse/core/PluginManager'
-import ReactComponent from './components/DotplotRendering'
-import DotplotRenderer from './DotplotRenderer'
-import configSchema from './configSchema'
-
-export default (pluginManager: PluginManager) => {
-  pluginManager.addRendererType(
-    () =>
-      new DotplotRenderer({
-        name: 'DotplotRenderer',
-        configSchema: configSchema,
-        ReactComponent,
-        pluginManager,
-      }),
-  )
-}

package/src/DotplotView/1dview.ts

@@ -1,98 +0,0 @@
-import { getParent, Instance } from 'mobx-state-tree'
-import { observable } from 'mobx'
-import Base1DView from '@jbrowse/core/util/Base1DViewModel'
-import calculateDynamicBlocks from '@jbrowse/core/util/calculateDynamicBlocks'
-
-/**
- * #stateModel Dotplot1DView
- * ref https://mobx-state-tree.js.org/concepts/volatiles on volatile state used here
- */
-function x() {} // eslint-disable-line @typescript-eslint/no-unused-vars
-
-const Dotplot1DView = Base1DView.extend(self => {
-  const scaleFactor = observable.box(1)
-  return {
-    views: {
-      /**
-       * #getter
-       * this uses padding=false and elision=false
-       */
-      get dynamicBlocks() {
-        return calculateDynamicBlocks(self, false, false)
-      },
-      /**
-       * #getter
-       */
-
-      get scaleFactor() {
-        return scaleFactor.get()
-      },
-
-      /**
-       * #getter
-       */
-      get maxBpPerPx() {
-        return self.totalBp / (self.width - 50)
-      },
-
-      /**
-       * #getter
-       */
-      get minBpPerPx() {
-        return 1 / 50
-      },
-
-      /**
-       * #getter
-       */
-      get maxOffset() {
-        return self.displayedRegionsTotalPx - self.width * 0.2
-      },
-
-      /**
-       * #getter
-       */
-      get minOffset() {
-        return -self.width * 0.8
-      },
-    },
-    actions: {
-      /**
-       * #action
-       */
-      setScaleFactor(n: number) {
-        scaleFactor.set(n)
-      },
-
-      /**
-       * #action
-       */
-      center() {
-        const centerBp = self.totalBp / 2
-        const centerPx = centerBp / self.bpPerPx
-        self.scrollTo(centerPx - self.width / 2)
-      },
-    },
-  }
-})
-
-const DotplotHView = Dotplot1DView.extend(self => ({
-  views: {
-    get width() {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      return getParent<any>(self).viewWidth
-    },
-  },
-}))
-
-const DotplotVView = Dotplot1DView.extend(self => ({
-  views: {
-    get width() {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      return getParent<any>(self).viewHeight
-    },
-  },
-}))
-
-export { DotplotVView, DotplotHView, Dotplot1DView }
-export type Dotplot1DViewModel = Instance<typeof Dotplot1DView>