@jbrowse/plugin-dotplot-view 3.7.0 → 4.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/ComparativeRenderer/index.d.ts +10 -10
- package/esm/ComparativeRenderer/index.js +4 -17
- package/esm/DiagonalizeDotplotRpc.js +9 -12
- package/esm/DotplotDisplay/components/DotplotDisplay.d.ts +1 -1
- package/esm/DotplotDisplay/index.d.ts +3 -3
- package/esm/DotplotDisplay/index.js +4 -4
- package/esm/DotplotDisplay/renderDotplotBlock.d.ts +2 -1
- package/esm/DotplotDisplay/renderDotplotBlock.js +6 -4
- package/esm/DotplotDisplay/stateModelFactory.d.ts +143 -30
- package/esm/DotplotDisplay/stateModelFactory.js +5 -14
- package/esm/DotplotReadVsRef/DotplotReadVsRef.js +5 -6
- package/esm/DotplotReadVsRef/index.js +1 -1
- package/esm/DotplotRenderer/DotplotRenderer.d.ts +30 -39
- package/esm/DotplotRenderer/DotplotRenderer.js +55 -22
- package/esm/DotplotRenderer/components/DotplotRendering.d.ts +1 -1
- package/esm/DotplotRenderer/components/DotplotRendering.js +1 -1
- package/esm/DotplotRenderer/configSchema.d.ts +3 -3
- package/esm/DotplotRenderer/configSchema.js +1 -1
- package/esm/DotplotRenderer/drawDotplot.d.ts +3 -3
- package/esm/DotplotRenderer/drawDotplot.js +5 -6
- package/esm/DotplotRenderer/index.js +4 -4
- package/esm/DotplotView/1dview.d.ts +25 -25
- package/esm/DotplotView/1dview.js +13 -3
- package/esm/DotplotView/components/Axes.d.ts +1 -1
- package/esm/DotplotView/components/Axes.js +31 -41
- package/esm/DotplotView/components/ColorBySelector.d.ts +1 -1
- package/esm/DotplotView/components/ColorBySelector.js +3 -4
- package/esm/DotplotView/components/DiagonalizationProgressDialog.d.ts +1 -1
- package/esm/DotplotView/components/DiagonalizationProgressDialog.js +1 -1
- package/esm/DotplotView/components/DotplotControls.d.ts +1 -1
- package/esm/DotplotView/components/DotplotControls.js +7 -8
- package/esm/DotplotView/components/DotplotGrid.d.ts +6 -0
- package/esm/DotplotView/components/{Grid.js → DotplotGrid.js} +19 -20
- package/esm/DotplotView/components/DotplotGridWrapper.d.ts +6 -0
- package/esm/DotplotView/components/DotplotGridWrapper.js +8 -0
- package/esm/DotplotView/components/DotplotTooltipClick.d.ts +2 -2
- package/esm/DotplotView/components/DotplotTooltipClick.js +4 -4
- package/esm/DotplotView/components/DotplotTooltipMouseover.d.ts +1 -1
- package/esm/DotplotView/components/DotplotTooltipMouseover.js +2 -2
- package/esm/DotplotView/components/DotplotTooltips.d.ts +1 -1
- package/esm/DotplotView/components/DotplotTooltips.js +2 -2
- package/esm/DotplotView/components/DotplotView.d.ts +2 -2
- package/esm/DotplotView/components/DotplotView.js +23 -21
- package/esm/DotplotView/components/DotplotWarnings.d.ts +1 -1
- package/esm/DotplotView/components/DotplotWarnings.js +3 -3
- package/esm/DotplotView/components/ExportSvgDialog.d.ts +1 -1
- package/esm/DotplotView/components/Header.d.ts +1 -1
- package/esm/DotplotView/components/Header.js +5 -5
- package/esm/DotplotView/components/ImportForm/ImportSyntenyOpenCustomTrack.d.ts +1 -1
- package/esm/DotplotView/components/ImportForm/ImportSyntenyOpenCustomTrack.js +6 -5
- package/esm/DotplotView/components/ImportForm/ImportSyntenyTrackSelector.d.ts +1 -1
- package/esm/DotplotView/components/ImportForm/ImportSyntenyTrackSelector.js +2 -3
- package/esm/DotplotView/components/ImportForm/TrackSelector.d.ts +10 -1
- package/esm/DotplotView/components/ImportForm/TrackSelector.js +8 -4
- package/esm/DotplotView/components/ImportForm/index.d.ts +1 -1
- package/esm/DotplotView/components/ImportForm/index.js +4 -9
- package/esm/DotplotView/components/ImportForm/selectors/AnchorsFileSelector.d.ts +1 -1
- package/esm/DotplotView/components/ImportForm/selectors/AnchorsFileSelector.js +2 -2
- package/esm/DotplotView/components/ImportForm/selectors/PifGzSelector.d.ts +1 -1
- package/esm/DotplotView/components/ImportForm/selectors/PifGzSelector.js +2 -2
- package/esm/DotplotView/components/ImportForm/selectors/SwapAssemblies.js +3 -3
- package/esm/DotplotView/components/ImportForm/selectors/SyntenyFileSelector.d.ts +1 -1
- package/esm/DotplotView/components/ImportForm/selectors/SyntenyFileSelector.js +3 -3
- package/esm/DotplotView/components/ImportForm/selectors/index.d.ts +3 -3
- package/esm/DotplotView/components/ImportForm/selectors/index.js +3 -3
- package/esm/DotplotView/components/MinLengthSlider.d.ts +1 -1
- package/esm/DotplotView/components/MinLengthSlider.js +7 -7
- package/esm/DotplotView/components/MouseInteractionLayer.d.ts +3 -3
- package/esm/DotplotView/components/MouseInteractionLayer.js +6 -4
- package/esm/DotplotView/components/OpacitySlider.d.ts +1 -1
- package/esm/DotplotView/components/OpacitySlider.js +5 -6
- package/esm/DotplotView/components/PanButtons.d.ts +1 -1
- package/esm/DotplotView/components/PanButtons.js +1 -1
- package/esm/DotplotView/components/SelectionContextMenu.d.ts +1 -1
- package/esm/DotplotView/components/WarningDialog.js +1 -1
- package/esm/DotplotView/components/util.d.ts +1 -1
- package/esm/DotplotView/components/util.js +17 -5
- package/esm/DotplotView/index.js +2 -2
- package/esm/DotplotView/model.d.ts +208 -90
- package/esm/DotplotView/model.js +118 -79
- package/esm/DotplotView/svgcomponents/SVGDotplotView.d.ts +1 -1
- package/esm/DotplotView/svgcomponents/SVGDotplotView.js +5 -6
- package/esm/DotplotView/types.d.ts +7 -1
- package/esm/LaunchDotplotView.js +6 -36
- package/esm/ServerSideRenderedBlockContent.js +2 -6
- package/esm/ServerSideSyntenyRendering.d.ts +1 -1
- package/esm/ServerSideSyntenyRendering.js +1 -1
- package/esm/index.d.ts +1 -0
- package/esm/index.js +8 -11
- package/esm/util.d.ts +1 -1
- package/package.json +28 -35
- package/dist/ComparativeRenderer/index.d.ts +0 -22
- package/dist/ComparativeRenderer/index.js +0 -53
- package/dist/DiagonalizeDotplotRpc.d.ts +0 -30
- package/dist/DiagonalizeDotplotRpc.js +0 -156
- package/dist/DotplotDisplay/components/DotplotDisplay.d.ts +0 -6
- package/dist/DotplotDisplay/components/DotplotDisplay.js +0 -18
- package/dist/DotplotDisplay/index.d.ts +0 -5
- package/dist/DotplotDisplay/index.js +0 -36
- package/dist/DotplotDisplay/renderDotplotBlock.d.ts +0 -11
- package/dist/DotplotDisplay/renderDotplotBlock.js +0 -52
- package/dist/DotplotDisplay/stateModelFactory.d.ts +0 -108
- package/dist/DotplotDisplay/stateModelFactory.js +0 -134
- package/dist/DotplotReadVsRef/DotplotReadVsRef.d.ts +0 -3
- package/dist/DotplotReadVsRef/DotplotReadVsRef.js +0 -100
- package/dist/DotplotReadVsRef/index.d.ts +0 -2
- package/dist/DotplotReadVsRef/index.js +0 -41
- package/dist/DotplotRenderer/ComparativeRenderRpc.d.ts +0 -22
- package/dist/DotplotRenderer/ComparativeRenderRpc.js +0 -53
- package/dist/DotplotRenderer/DotplotRenderer.d.ts +0 -65
- package/dist/DotplotRenderer/DotplotRenderer.js +0 -102
- package/dist/DotplotRenderer/clamp.d.ts +0 -7
- package/dist/DotplotRenderer/clamp.js +0 -62
- package/dist/DotplotRenderer/components/DotplotRendering.d.ts +0 -3
- package/dist/DotplotRenderer/components/DotplotRendering.js +0 -9
- package/dist/DotplotRenderer/configSchema.d.ts +0 -40
- package/dist/DotplotRenderer/configSchema.js +0 -57
- package/dist/DotplotRenderer/drawDotplot.d.ts +0 -22
- package/dist/DotplotRenderer/drawDotplot.js +0 -209
- package/dist/DotplotRenderer/index.d.ts +0 -2
- package/dist/DotplotRenderer/index.js +0 -17
- package/dist/DotplotView/1dview.d.ts +0 -199
- package/dist/DotplotView/1dview.js +0 -65
- package/dist/DotplotView/components/Axes.d.ts +0 -13
- package/dist/DotplotView/components/Axes.js +0 -107
- package/dist/DotplotView/components/ColorBySelector.d.ts +0 -5
- package/dist/DotplotView/components/ColorBySelector.js +0 -79
- package/dist/DotplotView/components/CursorIcon.d.ts +0 -3
- package/dist/DotplotView/components/CursorIcon.js +0 -15
- package/dist/DotplotView/components/DiagonalizationProgressDialog.d.ts +0 -6
- package/dist/DotplotView/components/DiagonalizationProgressDialog.js +0 -125
- package/dist/DotplotView/components/DotplotControls.d.ts +0 -5
- package/dist/DotplotView/components/DotplotControls.js +0 -187
- package/dist/DotplotView/components/DotplotTooltipClick.d.ts +0 -10
- package/dist/DotplotView/components/DotplotTooltipClick.js +0 -17
- package/dist/DotplotView/components/DotplotTooltipMouseover.d.ts +0 -9
- package/dist/DotplotView/components/DotplotTooltipMouseover.js +0 -16
- package/dist/DotplotView/components/DotplotTooltips.d.ts +0 -15
- package/dist/DotplotView/components/DotplotTooltips.js +0 -43
- package/dist/DotplotView/components/DotplotView.d.ts +0 -5
- package/dist/DotplotView/components/DotplotView.js +0 -100
- package/dist/DotplotView/components/DotplotWarnings.d.ts +0 -5
- package/dist/DotplotView/components/DotplotWarnings.js +0 -53
- package/dist/DotplotView/components/ExportSvgDialog.d.ts +0 -7
- package/dist/DotplotView/components/ExportSvgDialog.js +0 -53
- package/dist/DotplotView/components/Grid.d.ts +0 -9
- package/dist/DotplotView/components/Grid.js +0 -47
- package/dist/DotplotView/components/Header.d.ts +0 -9
- package/dist/DotplotView/components/Header.js +0 -33
- package/dist/DotplotView/components/ImportForm/ImportSyntenyOpenCustomTrack.d.ts +0 -7
- package/dist/DotplotView/components/ImportForm/ImportSyntenyOpenCustomTrack.js +0 -78
- package/dist/DotplotView/components/ImportForm/ImportSyntenyTrackSelector.d.ts +0 -7
- package/dist/DotplotView/components/ImportForm/ImportSyntenyTrackSelector.js +0 -42
- package/dist/DotplotView/components/ImportForm/TrackSelector.d.ts +0 -7
- package/dist/DotplotView/components/ImportForm/TrackSelector.js +0 -23
- package/dist/DotplotView/components/ImportForm/getAdapter.d.ts +0 -117
- package/dist/DotplotView/components/ImportForm/getAdapter.js +0 -68
- package/dist/DotplotView/components/ImportForm/index.d.ts +0 -5
- package/dist/DotplotView/components/ImportForm/index.js +0 -75
- package/dist/DotplotView/components/ImportForm/selectors/AnchorsFileSelector.d.ts +0 -3
- package/dist/DotplotView/components/ImportForm/selectors/AnchorsFileSelector.js +0 -23
- package/dist/DotplotView/components/ImportForm/selectors/PifGzSelector.d.ts +0 -3
- package/dist/DotplotView/components/ImportForm/selectors/PifGzSelector.js +0 -13
- package/dist/DotplotView/components/ImportForm/selectors/SelectorTypes.d.ts +0 -23
- package/dist/DotplotView/components/ImportForm/selectors/SelectorTypes.js +0 -10
- package/dist/DotplotView/components/ImportForm/selectors/SwapAssemblies.d.ts +0 -13
- package/dist/DotplotView/components/ImportForm/selectors/SwapAssemblies.js +0 -32
- package/dist/DotplotView/components/ImportForm/selectors/SyntenyFileSelector.d.ts +0 -3
- package/dist/DotplotView/components/ImportForm/selectors/SyntenyFileSelector.js +0 -24
- package/dist/DotplotView/components/ImportForm/selectors/index.d.ts +0 -3
- package/dist/DotplotView/components/ImportForm/selectors/index.js +0 -12
- package/dist/DotplotView/components/ImportForm/util.d.ts +0 -10
- package/dist/DotplotView/components/ImportForm/util.js +0 -24
- package/dist/DotplotView/components/MinLengthSlider.d.ts +0 -5
- package/dist/DotplotView/components/MinLengthSlider.js +0 -44
- package/dist/DotplotView/components/MouseInteractionLayer.d.ts +0 -17
- package/dist/DotplotView/components/MouseInteractionLayer.js +0 -18
- package/dist/DotplotView/components/OpacitySlider.d.ts +0 -5
- package/dist/DotplotView/components/OpacitySlider.js +0 -43
- package/dist/DotplotView/components/PanButtons.d.ts +0 -5
- package/dist/DotplotView/components/PanButtons.js +0 -47
- package/dist/DotplotView/components/SelectionContextMenu.d.ts +0 -13
- package/dist/DotplotView/components/SelectionContextMenu.js +0 -42
- package/dist/DotplotView/components/SliderTooltip.d.ts +0 -2
- package/dist/DotplotView/components/SliderTooltip.js +0 -9
- package/dist/DotplotView/components/WarningDialog.d.ts +0 -16
- package/dist/DotplotView/components/WarningDialog.js +0 -39
- package/dist/DotplotView/components/hooks/useCtrlKeyTracking.d.ts +0 -1
- package/dist/DotplotView/components/hooks/useCtrlKeyTracking.js +0 -24
- package/dist/DotplotView/components/hooks/useCursorMode.d.ts +0 -7
- package/dist/DotplotView/components/hooks/useCursorMode.js +0 -19
- package/dist/DotplotView/components/hooks/useMouseCoordinates.d.ts +0 -29
- package/dist/DotplotView/components/hooks/useMouseCoordinates.js +0 -52
- package/dist/DotplotView/components/hooks/useMouseMoveHandler.d.ts +0 -6
- package/dist/DotplotView/components/hooks/useMouseMoveHandler.js +0 -27
- package/dist/DotplotView/components/hooks/useMouseUpHandler.d.ts +0 -3
- package/dist/DotplotView/components/hooks/useMouseUpHandler.js +0 -31
- package/dist/DotplotView/components/hooks/useWheelHandler.d.ts +0 -8
- package/dist/DotplotView/components/hooks/useWheelHandler.js +0 -47
- package/dist/DotplotView/components/util.d.ts +0 -14
- package/dist/DotplotView/components/util.js +0 -80
- package/dist/DotplotView/index.d.ts +0 -2
- package/dist/DotplotView/index.js +0 -52
- package/dist/DotplotView/model.d.ts +0 -440
- package/dist/DotplotView/model.js +0 -502
- package/dist/DotplotView/svgcomponents/SVGBackground.d.ts +0 -4
- package/dist/DotplotView/svgcomponents/SVGBackground.js +0 -10
- package/dist/DotplotView/svgcomponents/SVGDotplotView.d.ts +0 -2
- package/dist/DotplotView/svgcomponents/SVGDotplotView.js +0 -30
- package/dist/DotplotView/types.d.ts +0 -12
- package/dist/DotplotView/types.js +0 -2
- package/dist/LaunchDotplotView.d.ts +0 -2
- package/dist/LaunchDotplotView.js +0 -43
- package/dist/ServerSideRenderedBlockContent.d.ts +0 -12
- package/dist/ServerSideRenderedBlockContent.js +0 -48
- package/dist/ServerSideSyntenyRendering.d.ts +0 -13
- package/dist/ServerSideSyntenyRendering.js +0 -23
- package/dist/index.d.ts +0 -7
- package/dist/index.js +0 -42
- package/dist/util.d.ts +0 -9
- package/dist/util.js +0 -7
- package/esm/DotplotRenderer/ComparativeRenderRpc.d.ts +0 -22
- package/esm/DotplotRenderer/ComparativeRenderRpc.js +0 -47
- package/esm/DotplotView/components/Grid.d.ts +0 -9
|
@@ -1,22 +1,22 @@
|
|
|
1
1
|
import RpcMethodType from '@jbrowse/core/pluggableElementTypes/RpcMethodType';
|
|
2
|
-
import type {
|
|
3
|
-
import type
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
import type { DotplotRenderArgs, RenderArgsSerialized, ResultsSerialized } from '../DotplotRenderer/DotplotRenderer.ts';
|
|
3
|
+
import type DotplotRenderer from '../DotplotRenderer/DotplotRenderer.ts';
|
|
4
|
+
import type { RenderResults } from '@jbrowse/core/pluggableElementTypes/renderers/ServerSideRendererType';
|
|
5
|
+
interface RenderArgs extends DotplotRenderArgs {
|
|
6
6
|
rendererType: string;
|
|
7
7
|
}
|
|
8
|
-
interface
|
|
8
|
+
interface RenderArgsSerializedWithRenderer extends RenderArgsSerialized {
|
|
9
9
|
adapterConfig: Record<string, unknown>;
|
|
10
10
|
rendererType: string;
|
|
11
11
|
}
|
|
12
12
|
export default class ComparativeRender extends RpcMethodType {
|
|
13
13
|
name: string;
|
|
14
|
-
renameRegionsIfNeeded(args: RenderArgs, rend:
|
|
15
|
-
getRenderer(rendererType: string):
|
|
16
|
-
serializeArguments(args: RenderArgs, rpcDriver: string): Promise<
|
|
17
|
-
execute(args:
|
|
14
|
+
renameRegionsIfNeeded(args: RenderArgs, rend: DotplotRenderer): Promise<DotplotRenderArgs>;
|
|
15
|
+
getRenderer(rendererType: string): DotplotRenderer;
|
|
16
|
+
serializeArguments(args: RenderArgs, rpcDriver: string): Promise<import("@jbrowse/core/pluggableElementTypes/renderers/ServerSideRendererType").RenderArgsSerialized>;
|
|
17
|
+
execute(args: RenderArgsSerializedWithRenderer & {
|
|
18
18
|
stopToken?: string;
|
|
19
|
-
}, rpcDriver: string): Promise<
|
|
19
|
+
}, rpcDriver: string): Promise<import("@jbrowse/core/pluggableElementTypes/renderers/ServerSideRendererType").ResultsSerialized>;
|
|
20
20
|
deserializeReturn(val: RenderResults | ResultsSerialized, args: RenderArgs, rpcDriver: string): Promise<unknown>;
|
|
21
21
|
}
|
|
22
22
|
export {};
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
import RpcMethodType from '@jbrowse/core/pluggableElementTypes/RpcMethodType';
|
|
2
2
|
import { checkStopToken } from '@jbrowse/core/util/stopToken';
|
|
3
3
|
export default class ComparativeRender extends RpcMethodType {
|
|
4
|
-
|
|
5
|
-
super(...arguments);
|
|
6
|
-
this.name = 'ComparativeRender';
|
|
7
|
-
}
|
|
4
|
+
name = 'ComparativeRender';
|
|
8
5
|
async renameRegionsIfNeeded(args, rend) {
|
|
9
6
|
return rend.renameRegionsIfNeeded(args);
|
|
10
7
|
}
|
|
@@ -17,30 +14,20 @@ export default class ComparativeRender extends RpcMethodType {
|
|
|
17
14
|
const renderer = this.getRenderer(rendererType);
|
|
18
15
|
const n = (await super.serializeArguments(args, rpcDriver));
|
|
19
16
|
const result = await this.renameRegionsIfNeeded(n, renderer);
|
|
20
|
-
return
|
|
21
|
-
? result
|
|
22
|
-
: renderer.serializeArgsInClient(result);
|
|
17
|
+
return renderer.serializeArgsInClient(result);
|
|
23
18
|
}
|
|
24
19
|
async execute(args, rpcDriver) {
|
|
25
|
-
|
|
26
|
-
if (rpcDriver !== 'MainThreadRpcDriver') {
|
|
27
|
-
deserializedArgs = await this.deserializeArguments(args, rpcDriver);
|
|
28
|
-
}
|
|
20
|
+
const deserializedArgs = await this.deserializeArguments(args, rpcDriver);
|
|
29
21
|
const { sessionId, rendererType, stopToken } = deserializedArgs;
|
|
30
22
|
if (!sessionId) {
|
|
31
23
|
throw new Error('must pass a unique session id');
|
|
32
24
|
}
|
|
33
25
|
checkStopToken(stopToken);
|
|
34
26
|
const renderer = this.getRenderer(rendererType);
|
|
35
|
-
return
|
|
36
|
-
? renderer.render(deserializedArgs)
|
|
37
|
-
: renderer.renderInWorker(deserializedArgs);
|
|
27
|
+
return renderer.renderInWorker(deserializedArgs);
|
|
38
28
|
}
|
|
39
29
|
async deserializeReturn(val, args, rpcDriver) {
|
|
40
30
|
const ret = (await super.deserializeReturn(val, args, rpcDriver));
|
|
41
|
-
if (rpcDriver === 'MainThreadRpcDriver') {
|
|
42
|
-
return ret;
|
|
43
|
-
}
|
|
44
31
|
const renderer = this.getRenderer(args.rendererType);
|
|
45
32
|
return renderer.deserializeResultsInClient(ret, args);
|
|
46
33
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import RpcMethodTypeWithFiltersAndRenameRegions from '@jbrowse/core/pluggableElementTypes/RpcMethodTypeWithFiltersAndRenameRegions';
|
|
2
2
|
import { checkStopToken } from '@jbrowse/core/util/stopToken';
|
|
3
|
-
import { Dotplot1DView } from
|
|
3
|
+
import { Dotplot1DView } from "./DotplotView/model.js";
|
|
4
4
|
async function diagonalizeRegions(alignments, currentRegions, progressCallback) {
|
|
5
5
|
const updateProgress = (progress, message) => {
|
|
6
6
|
if (progressCallback) {
|
|
@@ -88,17 +88,14 @@ async function diagonalizeRegions(alignments, currentRegions, progressCallback)
|
|
|
88
88
|
};
|
|
89
89
|
}
|
|
90
90
|
export default class DiagonalizeDotplotRpc extends RpcMethodTypeWithFiltersAndRenameRegions {
|
|
91
|
-
|
|
92
|
-
super(...arguments);
|
|
93
|
-
this.name = 'DiagonalizeDotplot';
|
|
94
|
-
}
|
|
91
|
+
name = 'DiagonalizeDotplot';
|
|
95
92
|
async execute(args, rpcDriverClassName) {
|
|
96
93
|
const deserializedArgs = await this.deserializeArguments(args, rpcDriverClassName);
|
|
97
94
|
const { view, sessionId, adapterConfig, stopToken, statusCallback } = deserializedArgs;
|
|
98
95
|
if (!sessionId) {
|
|
99
96
|
throw new Error('must pass a unique session id');
|
|
100
97
|
}
|
|
101
|
-
statusCallback
|
|
98
|
+
statusCallback?.('Initializing diagonalization...');
|
|
102
99
|
const dimensions = [800, 800];
|
|
103
100
|
const views = [view.hview, view.vview].map((snap, idx) => {
|
|
104
101
|
const v = Dotplot1DView.create(snap);
|
|
@@ -107,20 +104,20 @@ export default class DiagonalizeDotplotRpc extends RpcMethodTypeWithFiltersAndRe
|
|
|
107
104
|
});
|
|
108
105
|
const targetView = views[0];
|
|
109
106
|
checkStopToken(stopToken);
|
|
110
|
-
statusCallback
|
|
107
|
+
statusCallback?.('Getting renderer...');
|
|
111
108
|
const rendererType = this.pluginManager.getRendererType('DotplotRenderer');
|
|
112
109
|
if (!rendererType) {
|
|
113
110
|
throw new Error('DotplotRenderer not found');
|
|
114
111
|
}
|
|
115
112
|
checkStopToken(stopToken);
|
|
116
|
-
statusCallback
|
|
113
|
+
statusCallback?.('Fetching features...');
|
|
117
114
|
const feats = await rendererType.getFeatures({
|
|
118
115
|
regions: targetView.dynamicBlocks.contentBlocks,
|
|
119
116
|
adapterConfig,
|
|
120
117
|
sessionId,
|
|
121
118
|
});
|
|
122
119
|
checkStopToken(stopToken);
|
|
123
|
-
statusCallback
|
|
120
|
+
statusCallback?.('Extracting alignment data...');
|
|
124
121
|
const alignments = [];
|
|
125
122
|
for (const feat of feats.values()) {
|
|
126
123
|
const mate = feat.get('mate');
|
|
@@ -139,12 +136,12 @@ export default class DiagonalizeDotplotRpc extends RpcMethodTypeWithFiltersAndRe
|
|
|
139
136
|
if (alignments.length === 0) {
|
|
140
137
|
throw new Error('No alignments found to diagonalize');
|
|
141
138
|
}
|
|
142
|
-
statusCallback
|
|
139
|
+
statusCallback?.(`Running diagonalization on ${alignments.length} alignments...`);
|
|
143
140
|
const result = await diagonalizeRegions(alignments, view.vview.displayedRegions, (progress, message) => {
|
|
144
141
|
checkStopToken(stopToken);
|
|
145
|
-
statusCallback
|
|
142
|
+
statusCallback?.(message);
|
|
146
143
|
});
|
|
147
|
-
statusCallback
|
|
144
|
+
statusCallback?.('Diagonalization complete!');
|
|
148
145
|
return result;
|
|
149
146
|
}
|
|
150
147
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type PluginManager from '@jbrowse/core/PluginManager';
|
|
2
2
|
export default function DotplotDisplayF(pm: PluginManager): void;
|
|
3
|
-
export declare function configSchemaFactory(pm: any): import("
|
|
4
|
-
renderer: import("mobx-state-tree").IOptionalIType<any, [undefined]>;
|
|
5
|
-
}, import("
|
|
3
|
+
export declare function configSchemaFactory(pm: any): import("node_modules/@jbrowse/core/src/configuration/configurationSchema.ts").ConfigurationSchemaType<{
|
|
4
|
+
renderer: import("@jbrowse/mobx-state-tree").IOptionalIType<any, [undefined]>;
|
|
5
|
+
}, import("node_modules/@jbrowse/core/src/configuration/configurationSchema.ts").ConfigurationSchemaOptions<undefined, "displayId">>;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
+
import { lazy } from 'react';
|
|
1
2
|
import { ConfigurationSchema } from '@jbrowse/core/configuration';
|
|
2
3
|
import DisplayType from '@jbrowse/core/pluggableElementTypes/DisplayType';
|
|
3
|
-
import { types } from 'mobx-state-tree';
|
|
4
|
-
import
|
|
5
|
-
import { stateModelFactory } from './stateModelFactory';
|
|
4
|
+
import { types } from '@jbrowse/mobx-state-tree';
|
|
5
|
+
import { stateModelFactory } from "./stateModelFactory.js";
|
|
6
6
|
export default function DotplotDisplayF(pm) {
|
|
7
7
|
pm.addDisplayType(() => {
|
|
8
8
|
const configSchema = configSchemaFactory(pm);
|
|
@@ -13,7 +13,7 @@ export default function DotplotDisplayF(pm) {
|
|
|
13
13
|
stateModel: stateModelFactory(configSchema),
|
|
14
14
|
trackType: 'SyntenyTrack',
|
|
15
15
|
viewType: 'DotplotView',
|
|
16
|
-
ReactComponent,
|
|
16
|
+
ReactComponent: lazy(() => import("./components/DotplotDisplay.js")),
|
|
17
17
|
});
|
|
18
18
|
});
|
|
19
19
|
}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import type { IAnyStateTreeNode } from 'mobx-state-tree';
|
|
1
|
+
import type { IAnyStateTreeNode } from '@jbrowse/mobx-state-tree';
|
|
2
2
|
export declare function renderBlockData(self: IAnyStateTreeNode): {
|
|
3
3
|
rendererType: any;
|
|
4
4
|
rpcManager: import("@jbrowse/core/rpc/RpcManager").default;
|
|
5
5
|
renderProps: any;
|
|
6
|
+
renderingProps: Record<string, unknown> | undefined;
|
|
6
7
|
} | undefined;
|
|
7
8
|
export declare function renderBlockEffect(props?: ReturnType<typeof renderBlockData>): Promise<{
|
|
8
9
|
reactElement: any;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { readConfObject } from '@jbrowse/core/configuration';
|
|
2
|
-
import { getContainingView, getSession } from '@jbrowse/core/util';
|
|
2
|
+
import { getContainingTrack, getContainingView, getSession, } from '@jbrowse/core/util';
|
|
3
3
|
import { getRpcSessionId } from '@jbrowse/core/util/tracks';
|
|
4
|
-
import { getSnapshot } from 'mobx-state-tree';
|
|
4
|
+
import { getSnapshot } from '@jbrowse/mobx-state-tree';
|
|
5
5
|
export function renderBlockData(self) {
|
|
6
6
|
const { rpcManager } = getSession(self);
|
|
7
7
|
const { rendererType } = self;
|
|
@@ -25,11 +25,13 @@ export function renderBlockData(self) {
|
|
|
25
25
|
adapterConfig,
|
|
26
26
|
rendererType: rendererType.name,
|
|
27
27
|
sessionId: getRpcSessionId(self),
|
|
28
|
+
trackInstanceId: getContainingTrack(self).id,
|
|
28
29
|
timeout: 1000000,
|
|
29
30
|
alpha: self.alpha,
|
|
30
31
|
minAlignmentLength: self.minAlignmentLength,
|
|
31
32
|
colorBy: self.colorBy,
|
|
32
33
|
},
|
|
34
|
+
renderingProps: self.renderingProps?.(),
|
|
33
35
|
};
|
|
34
36
|
}
|
|
35
37
|
return undefined;
|
|
@@ -38,8 +40,8 @@ export async function renderBlockEffect(props) {
|
|
|
38
40
|
if (!props) {
|
|
39
41
|
return;
|
|
40
42
|
}
|
|
41
|
-
const { rendererType, rpcManager, renderProps } = props;
|
|
42
|
-
const { reactElement, ...data } = await rendererType.renderInClient(rpcManager, renderProps);
|
|
43
|
+
const { rendererType, rpcManager, renderProps, renderingProps } = props;
|
|
44
|
+
const { reactElement, ...data } = await rendererType.renderInClient(rpcManager, { ...renderProps, renderingProps });
|
|
43
45
|
return {
|
|
44
46
|
reactElement,
|
|
45
47
|
data,
|
|
@@ -1,38 +1,39 @@
|
|
|
1
|
-
import type { ExportSvgOptions } from '../DotplotView/model';
|
|
1
|
+
import type { ExportSvgOptions } from '../DotplotView/model.ts';
|
|
2
2
|
import type { AnyConfigurationSchemaType } from '@jbrowse/core/configuration';
|
|
3
|
+
import type { StopToken } from '@jbrowse/core/util/stopToken';
|
|
4
|
+
import type { Instance } from '@jbrowse/mobx-state-tree';
|
|
3
5
|
import type { ThemeOptions } from '@mui/material';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
rpcDriverName: import("mobx-state-tree").IMaybe<import("mobx-state-tree").ISimpleType<string>>;
|
|
6
|
+
export declare function stateModelFactory(configSchema: AnyConfigurationSchemaType): import("@jbrowse/mobx-state-tree").IModelType<{
|
|
7
|
+
id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
|
|
8
|
+
type: import("@jbrowse/mobx-state-tree").ISimpleType<string>;
|
|
9
|
+
rpcDriverName: import("@jbrowse/mobx-state-tree").IMaybe<import("@jbrowse/mobx-state-tree").ISimpleType<string>>;
|
|
9
10
|
} & {
|
|
10
|
-
type: import("mobx-state-tree").ISimpleType<"DotplotDisplay">;
|
|
11
|
+
type: import("@jbrowse/mobx-state-tree").ISimpleType<"DotplotDisplay">;
|
|
11
12
|
configuration: AnyConfigurationSchemaType;
|
|
12
|
-
colorBy: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ISimpleType<string>, [undefined]>;
|
|
13
|
+
colorBy: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
|
|
13
14
|
}, {
|
|
14
15
|
rendererTypeName: string;
|
|
15
16
|
error: unknown;
|
|
16
|
-
|
|
17
|
+
statusMessage: string | undefined;
|
|
17
18
|
} & {
|
|
18
19
|
readonly RenderingComponent: React.FC<{
|
|
19
20
|
model: {
|
|
20
21
|
id: string;
|
|
21
22
|
type: string;
|
|
22
23
|
rpcDriverName: string | undefined;
|
|
23
|
-
} & import("mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
24
|
+
} & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
24
25
|
rendererTypeName: string;
|
|
25
26
|
error: unknown;
|
|
26
|
-
|
|
27
|
-
} & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
|
|
28
|
-
id: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ISimpleType<string>, [undefined]>;
|
|
29
|
-
type: import("mobx-state-tree").ISimpleType<string>;
|
|
30
|
-
rpcDriverName: import("mobx-state-tree").IMaybe<import("mobx-state-tree").ISimpleType<string>>;
|
|
27
|
+
statusMessage: string | undefined;
|
|
28
|
+
} & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/mobx-state-tree").IModelType<{
|
|
29
|
+
id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
|
|
30
|
+
type: import("@jbrowse/mobx-state-tree").ISimpleType<string>;
|
|
31
|
+
rpcDriverName: import("@jbrowse/mobx-state-tree").IMaybe<import("@jbrowse/mobx-state-tree").ISimpleType<string>>;
|
|
31
32
|
}, {
|
|
32
33
|
rendererTypeName: string;
|
|
33
34
|
error: unknown;
|
|
34
|
-
|
|
35
|
-
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
|
|
35
|
+
statusMessage: string | undefined;
|
|
36
|
+
}, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>>;
|
|
36
37
|
onHorizontalScroll?: () => void;
|
|
37
38
|
blockState?: Record<string, any>;
|
|
38
39
|
}>;
|
|
@@ -41,35 +42,147 @@ export declare function stateModelFactory(configSchema: AnyConfigurationSchemaTy
|
|
|
41
42
|
id: string;
|
|
42
43
|
type: string;
|
|
43
44
|
rpcDriverName: string | undefined;
|
|
44
|
-
} & import("mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
45
|
+
} & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
45
46
|
rendererTypeName: string;
|
|
46
47
|
error: unknown;
|
|
47
|
-
|
|
48
|
-
} & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
|
|
49
|
-
id: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ISimpleType<string>, [undefined]>;
|
|
50
|
-
type: import("mobx-state-tree").ISimpleType<string>;
|
|
51
|
-
rpcDriverName: import("mobx-state-tree").IMaybe<import("mobx-state-tree").ISimpleType<string>>;
|
|
48
|
+
statusMessage: string | undefined;
|
|
49
|
+
} & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/mobx-state-tree").IModelType<{
|
|
50
|
+
id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
|
|
51
|
+
type: import("@jbrowse/mobx-state-tree").ISimpleType<string>;
|
|
52
|
+
rpcDriverName: import("@jbrowse/mobx-state-tree").IMaybe<import("@jbrowse/mobx-state-tree").ISimpleType<string>>;
|
|
52
53
|
}, {
|
|
53
54
|
rendererTypeName: string;
|
|
54
55
|
error: unknown;
|
|
55
|
-
|
|
56
|
-
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
|
|
56
|
+
statusMessage: string | undefined;
|
|
57
|
+
}, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>>;
|
|
57
58
|
}> | null;
|
|
58
59
|
readonly adapterConfig: any;
|
|
59
|
-
readonly parentTrack:
|
|
60
|
+
readonly parentTrack: import("@jbrowse/core/util").AbstractTrackModel;
|
|
61
|
+
readonly parentDisplay: any;
|
|
62
|
+
readonly effectiveRpcDriverName: any;
|
|
63
|
+
} & {
|
|
60
64
|
renderProps(): any;
|
|
65
|
+
renderingProps(): {
|
|
66
|
+
displayModel: {
|
|
67
|
+
id: string;
|
|
68
|
+
type: string;
|
|
69
|
+
rpcDriverName: string | undefined;
|
|
70
|
+
} & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
71
|
+
rendererTypeName: string;
|
|
72
|
+
error: unknown;
|
|
73
|
+
statusMessage: string | undefined;
|
|
74
|
+
} & {
|
|
75
|
+
readonly RenderingComponent: React.FC<{
|
|
76
|
+
model: {
|
|
77
|
+
id: string;
|
|
78
|
+
type: string;
|
|
79
|
+
rpcDriverName: string | undefined;
|
|
80
|
+
} & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
81
|
+
rendererTypeName: string;
|
|
82
|
+
error: unknown;
|
|
83
|
+
statusMessage: string | undefined;
|
|
84
|
+
} & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/mobx-state-tree").IModelType<{
|
|
85
|
+
id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
|
|
86
|
+
type: import("@jbrowse/mobx-state-tree").ISimpleType<string>;
|
|
87
|
+
rpcDriverName: import("@jbrowse/mobx-state-tree").IMaybe<import("@jbrowse/mobx-state-tree").ISimpleType<string>>;
|
|
88
|
+
}, {
|
|
89
|
+
rendererTypeName: string;
|
|
90
|
+
error: unknown;
|
|
91
|
+
statusMessage: string | undefined;
|
|
92
|
+
}, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>>;
|
|
93
|
+
onHorizontalScroll?: () => void;
|
|
94
|
+
blockState?: Record<string, any>;
|
|
95
|
+
}>;
|
|
96
|
+
readonly DisplayBlurb: React.FC<{
|
|
97
|
+
model: {
|
|
98
|
+
id: string;
|
|
99
|
+
type: string;
|
|
100
|
+
rpcDriverName: string | undefined;
|
|
101
|
+
} & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
102
|
+
rendererTypeName: string;
|
|
103
|
+
error: unknown;
|
|
104
|
+
statusMessage: string | undefined;
|
|
105
|
+
} & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/mobx-state-tree").IModelType<{
|
|
106
|
+
id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
|
|
107
|
+
type: import("@jbrowse/mobx-state-tree").ISimpleType<string>;
|
|
108
|
+
rpcDriverName: import("@jbrowse/mobx-state-tree").IMaybe<import("@jbrowse/mobx-state-tree").ISimpleType<string>>;
|
|
109
|
+
}, {
|
|
110
|
+
rendererTypeName: string;
|
|
111
|
+
error: unknown;
|
|
112
|
+
statusMessage: string | undefined;
|
|
113
|
+
}, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>>;
|
|
114
|
+
}> | null;
|
|
115
|
+
readonly adapterConfig: any;
|
|
116
|
+
readonly parentTrack: import("@jbrowse/core/util").AbstractTrackModel;
|
|
117
|
+
readonly parentDisplay: any;
|
|
118
|
+
readonly effectiveRpcDriverName: any;
|
|
119
|
+
} & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/mobx-state-tree").IModelType<{
|
|
120
|
+
id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
|
|
121
|
+
type: import("@jbrowse/mobx-state-tree").ISimpleType<string>;
|
|
122
|
+
rpcDriverName: import("@jbrowse/mobx-state-tree").IMaybe<import("@jbrowse/mobx-state-tree").ISimpleType<string>>;
|
|
123
|
+
}, {
|
|
124
|
+
rendererTypeName: string;
|
|
125
|
+
error: unknown;
|
|
126
|
+
statusMessage: string | undefined;
|
|
127
|
+
} & {
|
|
128
|
+
readonly RenderingComponent: React.FC<{
|
|
129
|
+
model: {
|
|
130
|
+
id: string;
|
|
131
|
+
type: string;
|
|
132
|
+
rpcDriverName: string | undefined;
|
|
133
|
+
} & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
134
|
+
rendererTypeName: string;
|
|
135
|
+
error: unknown;
|
|
136
|
+
statusMessage: string | undefined;
|
|
137
|
+
} & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/mobx-state-tree").IModelType<{
|
|
138
|
+
id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
|
|
139
|
+
type: import("@jbrowse/mobx-state-tree").ISimpleType<string>;
|
|
140
|
+
rpcDriverName: import("@jbrowse/mobx-state-tree").IMaybe<import("@jbrowse/mobx-state-tree").ISimpleType<string>>;
|
|
141
|
+
}, {
|
|
142
|
+
rendererTypeName: string;
|
|
143
|
+
error: unknown;
|
|
144
|
+
statusMessage: string | undefined;
|
|
145
|
+
}, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>>;
|
|
146
|
+
onHorizontalScroll?: () => void;
|
|
147
|
+
blockState?: Record<string, any>;
|
|
148
|
+
}>;
|
|
149
|
+
readonly DisplayBlurb: React.FC<{
|
|
150
|
+
model: {
|
|
151
|
+
id: string;
|
|
152
|
+
type: string;
|
|
153
|
+
rpcDriverName: string | undefined;
|
|
154
|
+
} & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
155
|
+
rendererTypeName: string;
|
|
156
|
+
error: unknown;
|
|
157
|
+
statusMessage: string | undefined;
|
|
158
|
+
} & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/mobx-state-tree").IModelType<{
|
|
159
|
+
id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
|
|
160
|
+
type: import("@jbrowse/mobx-state-tree").ISimpleType<string>;
|
|
161
|
+
rpcDriverName: import("@jbrowse/mobx-state-tree").IMaybe<import("@jbrowse/mobx-state-tree").ISimpleType<string>>;
|
|
162
|
+
}, {
|
|
163
|
+
rendererTypeName: string;
|
|
164
|
+
error: unknown;
|
|
165
|
+
statusMessage: string | undefined;
|
|
166
|
+
}, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>>;
|
|
167
|
+
}> | null;
|
|
168
|
+
readonly adapterConfig: any;
|
|
169
|
+
readonly parentTrack: import("@jbrowse/core/util").AbstractTrackModel;
|
|
170
|
+
readonly parentDisplay: any;
|
|
171
|
+
readonly effectiveRpcDriverName: any;
|
|
172
|
+
}, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>>;
|
|
173
|
+
};
|
|
61
174
|
readonly rendererType: import("@jbrowse/core/pluggableElementTypes").RendererType;
|
|
62
175
|
readonly DisplayMessageComponent: undefined | React.FC<any>;
|
|
63
176
|
trackMenuItems(): import("@jbrowse/core/ui").MenuItem[];
|
|
64
177
|
readonly viewMenuActions: import("@jbrowse/core/ui").MenuItem[];
|
|
65
178
|
regionCannotBeRendered(): null;
|
|
66
179
|
} & {
|
|
67
|
-
|
|
180
|
+
setStatusMessage(arg?: string): void;
|
|
68
181
|
setError(error?: unknown): void;
|
|
69
182
|
setRpcDriverName(rpcDriverName: string): void;
|
|
70
183
|
reload(): void;
|
|
71
184
|
} & {
|
|
72
|
-
stopToken:
|
|
185
|
+
stopToken: StopToken | undefined;
|
|
73
186
|
warnings: {
|
|
74
187
|
message: string;
|
|
75
188
|
effect: string;
|
|
@@ -92,7 +205,7 @@ export declare function stateModelFactory(configSchema: AnyConfigurationSchemaTy
|
|
|
92
205
|
}): Promise<import("react/jsx-runtime").JSX.Element | null>;
|
|
93
206
|
} & {
|
|
94
207
|
afterAttach(): void;
|
|
95
|
-
setLoading(stopToken?:
|
|
208
|
+
setLoading(stopToken?: StopToken): void;
|
|
96
209
|
setMessage(messageText: string): void;
|
|
97
210
|
setRendered(args?: {
|
|
98
211
|
data: any;
|
|
@@ -103,6 +216,6 @@ export declare function stateModelFactory(configSchema: AnyConfigurationSchemaTy
|
|
|
103
216
|
setAlpha(value: number): void;
|
|
104
217
|
setMinAlignmentLength(value: number): void;
|
|
105
218
|
setColorBy(value: string): void;
|
|
106
|
-
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
|
|
219
|
+
}, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>;
|
|
107
220
|
export type DotplotDisplayStateModel = ReturnType<typeof stateModelFactory>;
|
|
108
221
|
export type DotplotDisplayModel = Instance<DotplotDisplayStateModel>;
|
|
@@ -3,9 +3,9 @@ import { ConfigurationReference, getConf } from '@jbrowse/core/configuration';
|
|
|
3
3
|
import { BaseDisplay } from '@jbrowse/core/pluggableElementTypes/models';
|
|
4
4
|
import { ReactRendering, getContainingView, makeAbortableReaction, } from '@jbrowse/core/util';
|
|
5
5
|
import { getParentRenderProps } from '@jbrowse/core/util/tracks';
|
|
6
|
-
import { types } from 'mobx-state-tree';
|
|
7
|
-
import ServerSideRenderedBlockContent from
|
|
8
|
-
import { renderBlockData, renderBlockEffect } from
|
|
6
|
+
import { types } from '@jbrowse/mobx-state-tree';
|
|
7
|
+
import ServerSideRenderedBlockContent from "../ServerSideRenderedBlockContent.js";
|
|
8
|
+
import { renderBlockData, renderBlockEffect } from "./renderDotplotBlock.js";
|
|
9
9
|
export function stateModelFactory(configSchema) {
|
|
10
10
|
return types
|
|
11
11
|
.compose('DotplotDisplay', BaseDisplay, types
|
|
@@ -39,11 +39,7 @@ export function stateModelFactory(configSchema) {
|
|
|
39
39
|
return {
|
|
40
40
|
...getParentRenderProps(self),
|
|
41
41
|
rpcDriverName: self.rpcDriverName,
|
|
42
|
-
displayModel: self,
|
|
43
42
|
config: self.configuration.renderer,
|
|
44
|
-
statusCallback: (message) => {
|
|
45
|
-
self.setMessage(message);
|
|
46
|
-
},
|
|
47
43
|
};
|
|
48
44
|
},
|
|
49
45
|
}))
|
|
@@ -53,9 +49,10 @@ export function stateModelFactory(configSchema) {
|
|
|
53
49
|
if (!props) {
|
|
54
50
|
return null;
|
|
55
51
|
}
|
|
56
|
-
const { rendererType, rpcManager, renderProps } = props;
|
|
52
|
+
const { rendererType, rpcManager, renderProps, renderingProps } = props;
|
|
57
53
|
const rendering = await rendererType.renderInClient(rpcManager, {
|
|
58
54
|
...renderProps,
|
|
55
|
+
renderingProps,
|
|
59
56
|
exportSVG: opts,
|
|
60
57
|
theme: opts.theme || renderProps.theme,
|
|
61
58
|
});
|
|
@@ -83,13 +80,7 @@ export function stateModelFactory(configSchema) {
|
|
|
83
80
|
self.stopToken = stopToken;
|
|
84
81
|
},
|
|
85
82
|
setMessage(messageText) {
|
|
86
|
-
self.filled = false;
|
|
87
83
|
self.message = messageText;
|
|
88
|
-
self.reactElement = undefined;
|
|
89
|
-
self.data = undefined;
|
|
90
|
-
self.error = undefined;
|
|
91
|
-
self.renderingComponent = undefined;
|
|
92
|
-
self.stopToken = undefined;
|
|
93
84
|
},
|
|
94
85
|
setRendered(args) {
|
|
95
86
|
if (args === undefined) {
|
|
@@ -3,11 +3,10 @@ import { gatherOverlaps, getSession, sum } from '@jbrowse/core/util';
|
|
|
3
3
|
import { MismatchParser } from '@jbrowse/plugin-alignments';
|
|
4
4
|
const { featurizeSA, getClip, getLength, getLengthSansClipping } = MismatchParser;
|
|
5
5
|
export function onClick(feature, self) {
|
|
6
|
-
var _a;
|
|
7
6
|
const session = getSession(self);
|
|
8
7
|
try {
|
|
9
8
|
const cigar = feature.get('CIGAR');
|
|
10
|
-
const
|
|
9
|
+
const clipLengthAtStartOfRead = getClip(cigar, 1);
|
|
11
10
|
const flags = feature.get('flags');
|
|
12
11
|
const strand = feature.get('strand');
|
|
13
12
|
const readName = feature.get('name');
|
|
@@ -17,7 +16,7 @@ export function onClick(feature, self) {
|
|
|
17
16
|
const assemblyNames = [trackAssembly, readAssembly];
|
|
18
17
|
const trackId = `track-${Date.now()}`;
|
|
19
18
|
const trackName = `${readName}_vs_${trackAssembly}`;
|
|
20
|
-
const SA =
|
|
19
|
+
const SA = feature.get('tags')?.SA;
|
|
21
20
|
const SA2 = featurizeSA(SA, feature.id(), strand, readName, true);
|
|
22
21
|
const totalLength = getLength(flags & 2048 ? SA2[0].CIGAR : cigar);
|
|
23
22
|
const features = [
|
|
@@ -26,12 +25,12 @@ export function onClick(feature, self) {
|
|
|
26
25
|
strand: 1,
|
|
27
26
|
mate: {
|
|
28
27
|
refName: readName,
|
|
29
|
-
start:
|
|
30
|
-
end:
|
|
28
|
+
start: clipLengthAtStartOfRead,
|
|
29
|
+
end: clipLengthAtStartOfRead + getLengthSansClipping(cigar),
|
|
31
30
|
},
|
|
32
31
|
},
|
|
33
32
|
...SA2,
|
|
34
|
-
].sort((a, b) => a.
|
|
33
|
+
].sort((a, b) => a.clipLengthAtStartOfRead - b.clipLengthAtStartOfRead);
|
|
35
34
|
session.addView('DotplotView', {
|
|
36
35
|
type: 'DotplotView',
|
|
37
36
|
hview: {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import AddIcon from '@mui/icons-material/Add';
|
|
2
|
-
import { onClick } from
|
|
2
|
+
import { onClick } from "./DotplotReadVsRef.js";
|
|
3
3
|
export default function DotplotReadVsRefMenuItem(pluginManager) {
|
|
4
4
|
pluginManager.addToExtensionPoint('Core-extendPluggableElement', (pluggableElement) => {
|
|
5
5
|
if (pluggableElement.name === 'LinearPileupDisplay') {
|