jbrowse-plugin-mafviewer 1.2.2 → 1.2.4
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/README.md +6 -1
- package/dist/BgzipTaffyAdapter/BgzipTaffyAdapter.d.ts +12 -3
- package/dist/BgzipTaffyAdapter/BgzipTaffyAdapter.js +123 -94
- package/dist/BgzipTaffyAdapter/BgzipTaffyAdapter.js.map +1 -1
- package/dist/BigMafAdapter/BigMafAdapter.d.ts +1 -1
- package/dist/BigMafAdapter/BigMafAdapter.js +50 -49
- package/dist/BigMafAdapter/BigMafAdapter.js.map +1 -1
- package/dist/LinearMafDisplay/components/ColorLegend.d.ts +2 -4
- package/dist/LinearMafDisplay/components/ColorLegend.js +2 -3
- package/dist/LinearMafDisplay/components/ColorLegend.js.map +1 -1
- package/dist/LinearMafDisplay/components/{ReactComponent.d.ts → LinearMafDisplayComponent.d.ts} +1 -1
- package/dist/LinearMafDisplay/components/{ReactComponent.js → LinearMafDisplayComponent.js} +2 -2
- package/dist/LinearMafDisplay/components/LinearMafDisplayComponent.js.map +1 -0
- package/dist/LinearMafDisplay/components/SetRowHeightDialog.js +38 -0
- package/dist/LinearMafDisplay/components/SetRowHeightDialog.js.map +1 -0
- package/dist/LinearMafDisplay/components/SvgWrapper.d.ts +1 -1
- package/dist/LinearMafDisplay/components/SvgWrapper.js.map +1 -1
- package/dist/LinearMafDisplay/components/Tree.d.ts +2 -1
- package/dist/LinearMafDisplay/components/Tree.js +2 -0
- package/dist/LinearMafDisplay/components/Tree.js.map +1 -1
- package/dist/LinearMafDisplay/components/YScaleBars.d.ts +1 -1
- package/dist/LinearMafDisplay/components/YScaleBars.js +1 -10
- package/dist/LinearMafDisplay/components/YScaleBars.js.map +1 -1
- package/dist/LinearMafDisplay/index.js +1 -1
- package/dist/LinearMafDisplay/index.js.map +1 -1
- package/dist/LinearMafDisplay/stateModel.d.ts +20 -19
- package/dist/LinearMafDisplay/stateModel.js +42 -7
- package/dist/LinearMafDisplay/stateModel.js.map +1 -1
- package/dist/LinearMafDisplay/types.d.ts +5 -3
- package/dist/LinearMafDisplay/types.js +1 -15
- package/dist/LinearMafDisplay/types.js.map +1 -1
- package/dist/LinearMafDisplay/util.d.ts +4 -0
- package/dist/LinearMafDisplay/util.js +16 -0
- package/dist/LinearMafDisplay/util.js.map +1 -0
- package/dist/LinearMafRenderer/LinearMafRenderer.d.ts +4 -4
- package/dist/LinearMafRenderer/LinearMafRenderer.js +9 -11
- package/dist/LinearMafRenderer/LinearMafRenderer.js.map +1 -1
- package/dist/LinearMafRenderer/makeImageData.js +35 -17
- package/dist/LinearMafRenderer/makeImageData.js.map +1 -1
- package/dist/MafAddTrackWorkflow/AddTrackWorkflow.js +1 -1
- package/dist/MafAddTrackWorkflow/AddTrackWorkflow.js.map +1 -1
- package/dist/MafAddTrackWorkflow/index.js +0 -1
- package/dist/MafAddTrackWorkflow/index.js.map +1 -1
- package/dist/MafTabixAdapter/MafTabixAdapter.d.ts +1 -1
- package/dist/MafTabixAdapter/MafTabixAdapter.js +6 -7
- package/dist/MafTabixAdapter/MafTabixAdapter.js.map +1 -1
- package/dist/MafTabixAdapter/configSchema.js +29 -1
- package/dist/MafTabixAdapter/configSchema.js.map +1 -1
- package/dist/jbrowse-plugin-mafviewer.umd.production.min.js +7 -19
- package/dist/jbrowse-plugin-mafviewer.umd.production.min.js.map +4 -4
- package/dist/util.d.ts +2 -2
- package/dist/util.js +5 -1
- package/dist/util.js.map +1 -1
- package/package.json +11 -10
- package/src/BgzipTaffyAdapter/BgzipTaffyAdapter.ts +135 -99
- package/src/BigMafAdapter/BigMafAdapter.ts +52 -49
- package/src/LinearMafDisplay/components/ColorLegend.tsx +11 -7
- package/src/LinearMafDisplay/components/{ReactComponent.tsx → LinearMafDisplayComponent.tsx} +2 -2
- package/src/LinearMafDisplay/components/SetRowHeightDialog.tsx +83 -0
- package/src/LinearMafDisplay/components/SvgWrapper.tsx +1 -2
- package/src/LinearMafDisplay/components/Tree.tsx +5 -1
- package/src/LinearMafDisplay/components/YScaleBars.tsx +3 -21
- package/src/LinearMafDisplay/index.ts +1 -1
- package/src/LinearMafDisplay/stateModel.ts +49 -18
- package/src/LinearMafDisplay/types.ts +4 -24
- package/src/LinearMafDisplay/util.ts +27 -0
- package/src/LinearMafRenderer/LinearMafRenderer.ts +10 -15
- package/src/LinearMafRenderer/makeImageData.ts +48 -18
- package/src/MafAddTrackWorkflow/AddTrackWorkflow.tsx +9 -11
- package/src/MafAddTrackWorkflow/index.ts +0 -1
- package/src/MafTabixAdapter/MafTabixAdapter.ts +9 -7
- package/src/MafTabixAdapter/configSchema.ts +29 -1
- package/src/util.ts +6 -2
- package/dist/LinearMafDisplay/components/ReactComponent.js.map +0 -1
- package/dist/LinearMafDisplay/components/SetRowHeight.js +0 -36
- package/dist/LinearMafDisplay/components/SetRowHeight.js.map +0 -1
- package/src/LinearMafDisplay/components/SetRowHeight.tsx +0 -83
- /package/dist/LinearMafDisplay/components/{SetRowHeight.d.ts → SetRowHeightDialog.d.ts} +0 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SetRowHeightDialog.js","sourceRoot":"","sources":["../../../src/LinearMafDisplay/components/SetRowHeightDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEvC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EACL,MAAM,EACN,aAAa,EACb,aAAa,EACb,SAAS,EACT,UAAU,GACX,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;IAC7B,IAAI,EAAE;QACJ,KAAK,EAAE,GAAG;KACX;CACF,CAAC,CAAA;AAEF,MAAM,kBAAkB,GAAG,QAAQ,CAAC,UAAU,KAQ7C;IACC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,KAAK,CAAA;IACpC,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAA;IAC/B,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC,CAAA;IAChE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC,CAAA;IAE5E,OAAO,CACL,oBAAC,MAAM,IAAC,IAAI,QAAC,OAAO,EAAE,WAAW,EAAE,KAAK,EAAC,gBAAgB;QACvD,8BACE,QAAQ,EAAE,KAAK,CAAC,EAAE;gBAChB,KAAK,CAAC,cAAc,EAAE,CAAA;gBACtB,KAAK,CAAC,gBAAgB,CAAC,CAAC,aAAa,CAAC,CAAA;gBACtC,KAAK,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,CAAA;gBAC9B,WAAW,EAAE,CAAA;YACf,CAAC;YAED,oBAAC,aAAa,IAAC,SAAS,EAAE,OAAO,CAAC,IAAI;gBACpC,oBAAC,UAAU,0FAGE;gBACb,oBAAC,SAAS,IACR,KAAK,EAAE,SAAS,EAChB,UAAU,EAAC,kBAAkB,EAC7B,SAAS,QACT,QAAQ,EAAE,KAAK,CAAC,EAAE;wBAChB,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBAClC,CAAC,GACD;gBACF,oBAAC,SAAS,IACR,KAAK,EAAE,aAAa,EACpB,UAAU,EAAC,sBAAsB,EACjC,QAAQ,EAAE,KAAK,CAAC,EAAE;wBAChB,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBACtC,CAAC,GACD;gBACF,oBAAC,aAAa;oBACZ,oBAAC,MAAM,IAAC,OAAO,EAAC,WAAW,EAAC,KAAK,EAAC,SAAS,EAAC,IAAI,EAAC,QAAQ,aAEhD;oBACT,oBAAC,MAAM,IACL,OAAO,EAAC,WAAW,EACnB,KAAK,EAAC,WAAW,EACjB,OAAO,EAAE,GAAG,EAAE;4BACZ,WAAW,EAAE,CAAA;wBACf,CAAC,aAGM,CACK,CACF,CACX,CACA,CACV,CAAA;AACH,CAAC,CAAC,CAAA;AACF,eAAe,kBAAkB,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { LinearMafDisplayModel } from '../stateModel';
|
|
2
|
+
import type { LinearMafDisplayModel } from '../stateModel';
|
|
3
3
|
declare const SvgWrapper: ({ children, model, exportSVG, }: {
|
|
4
4
|
model: LinearMafDisplayModel;
|
|
5
5
|
children: React.ReactNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SvgWrapper.js","sourceRoot":"","sources":["../../../src/LinearMafDisplay/components/SvgWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"SvgWrapper.js","sourceRoot":"","sources":["../../../src/LinearMafDisplay/components/SvgWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIrC,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,EACpC,QAAQ,EACR,KAAK,EACL,SAAS,GAKV;IACC,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,0CAAG,QAAQ,CAAI,CAAA;IACxB,CAAC;SAAM,CAAC;QACN,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAA;QAC7B,OAAO,CACL,6BACE,KAAK,EAAE;gBACL,QAAQ,EAAE,UAAU;gBACpB,GAAG,EAAE,CAAC;gBACN,IAAI,EAAE,CAAC;gBACP,aAAa,EAAE,MAAM;gBACrB,MAAM,EAAE,WAAW;gBACnB,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,KAAK;aACtC,IAEA,QAAQ,CACL,CACP,CAAA;IACH,CAAC;AACH,CAAC,CAAC,CAAA;AAEF,eAAe,UAAU,CAAA"}
|
|
@@ -11,7 +11,9 @@ const Tree = observer(function ({ model }) {
|
|
|
11
11
|
const { source, target } = link;
|
|
12
12
|
const sy = source.x;
|
|
13
13
|
const ty = target.x;
|
|
14
|
+
// @ts-expect-error
|
|
14
15
|
const tx = showBranchLen ? target.len : target.y;
|
|
16
|
+
// @ts-expect-error
|
|
15
17
|
const sx = showBranchLen ? source.len : source.y;
|
|
16
18
|
// 1d line intersection to check if line crosses block at all, this is
|
|
17
19
|
// an optimization that allows us to skip drawing most tree links
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tree.js","sourceRoot":"","sources":["../../../src/LinearMafDisplay/components/Tree.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"Tree.js","sourceRoot":"","sources":["../../../src/LinearMafDisplay/components/Tree.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIrC,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAoC;IACzE,MAAM;IACJ,2EAA2E;IAC3E,mBAAmB;IACnB,8DAA8D;IAC9D,SAAS,EAAE,UAAU,EAErB,SAAS,EACT,aAAa,GACd,GAAG,KAAK,CAAA;IAET,OAAO,CACL,0CACG,SAAS;QACR,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAChC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;YAC/B,MAAM,EAAE,GAAG,MAAM,CAAC,CAAE,CAAA;YACpB,MAAM,EAAE,GAAG,MAAM,CAAC,CAAE,CAAA;YACpB,mBAAmB;YACnB,MAAM,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;YAChD,mBAAmB;YACnB,MAAM,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;YAEhD,sEAAsE;YACtE,iEAAiE;YACjE,oBAAoB;YACpB,OAAO,CACL,oBAAC,KAAK,CAAC,QAAQ,IAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC7C,8BAAM,MAAM,EAAC,OAAO,EAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAI;gBACvD,8BAAM,MAAM,EAAC,OAAO,EAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAI,CACxC,CAClB,CAAA;QACH,CAAC,CAAC;QACJ,CAAC,CAAC,IAAI,CACP,CACJ,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,eAAe,IAAI,CAAA"}
|
|
@@ -1,20 +1,11 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { measureText } from '@jbrowse/core/util';
|
|
3
2
|
import { observer } from 'mobx-react';
|
|
4
3
|
import ColorLegend from './ColorLegend';
|
|
5
4
|
import SvgWrapper from './SvgWrapper';
|
|
6
|
-
import { max } from './util';
|
|
7
5
|
export const YScaleBars = observer(function (props) {
|
|
8
6
|
const { model } = props;
|
|
9
|
-
const { rowHeight, samples } = model;
|
|
10
|
-
const svgFontSize = Math.min(Math.max(rowHeight, 8), 14);
|
|
11
|
-
const canDisplayLabel = rowHeight >= 8;
|
|
12
|
-
const minWidth = 20;
|
|
13
|
-
const labelWidth = max(samples
|
|
14
|
-
?.map(s => measureText(s.label, svgFontSize))
|
|
15
|
-
.map(width => (canDisplayLabel ? width : minWidth)) || [], 0);
|
|
16
7
|
return (React.createElement(SvgWrapper, { ...props },
|
|
17
|
-
React.createElement(ColorLegend, { model: model
|
|
8
|
+
React.createElement(ColorLegend, { model: model })));
|
|
18
9
|
});
|
|
19
10
|
export default YScaleBars;
|
|
20
11
|
//# sourceMappingURL=YScaleBars.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"YScaleBars.js","sourceRoot":"","sources":["../../../src/LinearMafDisplay/components/YScaleBars.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"YScaleBars.js","sourceRoot":"","sources":["../../../src/LinearMafDisplay/components/YScaleBars.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,WAAW,MAAM,eAAe,CAAA;AACvC,OAAO,UAAU,MAAM,cAAc,CAAA;AAIrC,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,KAI5C;IACC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAA;IACvB,OAAO,CACL,oBAAC,UAAU,OAAK,KAAK;QACnB,oBAAC,WAAW,IAAC,KAAK,EAAE,KAAK,GAAI,CAClB,CACd,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,eAAe,UAAU,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DisplayType } from '@jbrowse/core/pluggableElementTypes';
|
|
2
|
-
import ReactComponent from './components/
|
|
2
|
+
import ReactComponent from './components/LinearMafDisplayComponent';
|
|
3
3
|
import configSchemaF from './configSchema';
|
|
4
4
|
import stateModelFactory from './stateModel';
|
|
5
5
|
export default function LinearMafDisplayF(pluginManager) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/LinearMafDisplay/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAA;AAEjE,OAAO,cAAc,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/LinearMafDisplay/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAA;AAEjE,OAAO,cAAc,MAAM,wCAAwC,CAAA;AACnE,OAAO,aAAa,MAAM,gBAAgB,CAAA;AAC1C,OAAO,iBAAiB,MAAM,cAAc,CAAA;AAE5C,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,aAA4B;IACpE,aAAa,CAAC,cAAc,CAAC,GAAG,EAAE;QAChC,MAAM,YAAY,GAAG,aAAa,CAAC,aAAa,CAAC,CAAA;QACjD,MAAM,UAAU,GAAG,iBAAiB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAA;QACjE,OAAO,IAAI,WAAW,CAAC;YACrB,IAAI,EAAE,kBAAkB;YACxB,YAAY;YACZ,UAAU;YACV,cAAc;YACd,QAAQ,EAAE,kBAAkB;YAC5B,SAAS,EAAE,UAAU;YACrB,WAAW,EAAE,aAAa;SAC3B,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -1,14 +1,9 @@
|
|
|
1
|
-
import type { NodeWithIdsAndLength } from './types';
|
|
1
|
+
import type { NodeWithIdsAndLength, Sample } from './types';
|
|
2
2
|
import type PluginManager from '@jbrowse/core/PluginManager';
|
|
3
3
|
import type { AnyConfigurationModel, AnyConfigurationSchemaType } from '@jbrowse/core/configuration';
|
|
4
4
|
import type { ExportSvgDisplayOptions } from '@jbrowse/plugin-linear-genome-view';
|
|
5
5
|
import type { HierarchyNode } from 'd3-hierarchy';
|
|
6
6
|
import type { Instance } from 'mobx-state-tree';
|
|
7
|
-
interface Sample {
|
|
8
|
-
id: string;
|
|
9
|
-
label: string;
|
|
10
|
-
color?: string;
|
|
11
|
-
}
|
|
12
7
|
/**
|
|
13
8
|
* #stateModel LinearMafDisplay
|
|
14
9
|
* extends LinearBasicDisplay
|
|
@@ -112,15 +107,9 @@ export default function stateModelFactory(configSchema: AnyConfigurationSchemaTy
|
|
|
112
107
|
rendererTypeName: string;
|
|
113
108
|
error: unknown;
|
|
114
109
|
message: string | undefined;
|
|
115
|
-
} & import(
|
|
116
|
-
/**
|
|
117
|
-
* #getter
|
|
118
|
-
*/
|
|
119
|
-
"mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
|
|
110
|
+
} & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
|
|
120
111
|
id: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ISimpleType<string>, [undefined]>;
|
|
121
|
-
type: import("mobx-state-tree"
|
|
122
|
-
* #getter
|
|
123
|
-
*/).ISimpleType<string>;
|
|
112
|
+
type: import("mobx-state-tree").ISimpleType<string>;
|
|
124
113
|
rpcDriverName: import("mobx-state-tree").IMaybe<import("mobx-state-tree").ISimpleType<string>>;
|
|
125
114
|
}, {
|
|
126
115
|
rendererTypeName: string;
|
|
@@ -216,7 +205,7 @@ export default function stateModelFactory(configSchema: AnyConfigurationSchemaTy
|
|
|
216
205
|
} & {
|
|
217
206
|
addBlock(key: string, block: import("@jbrowse/core/util/blockTypes").BaseBlock): void;
|
|
218
207
|
deleteBlock(key: string): void;
|
|
219
|
-
selectFeature(feature: import("@jbrowse/core/util").Feature): void
|
|
208
|
+
selectFeature(feature: import("@jbrowse/core/util").Feature): Promise<void>;
|
|
220
209
|
navToFeature(feature: import("@jbrowse/core/util").Feature): void;
|
|
221
210
|
clearFeatureSelection(): void;
|
|
222
211
|
setFeatureIdUnderMouse(feature?: string): void;
|
|
@@ -290,10 +279,10 @@ export default function stateModelFactory(configSchema: AnyConfigurationSchemaTy
|
|
|
290
279
|
/**
|
|
291
280
|
* #getter
|
|
292
281
|
*/
|
|
293
|
-
readonly samples: {
|
|
282
|
+
readonly samples: Sample[] | {
|
|
283
|
+
label: string | undefined;
|
|
284
|
+
color: string | undefined;
|
|
294
285
|
id: string;
|
|
295
|
-
label: string;
|
|
296
|
-
color?: string;
|
|
297
286
|
}[] | undefined;
|
|
298
287
|
/**
|
|
299
288
|
* #getter
|
|
@@ -335,6 +324,19 @@ export default function stateModelFactory(configSchema: AnyConfigurationSchemaTy
|
|
|
335
324
|
onClick: () => void;
|
|
336
325
|
subMenu?: undefined;
|
|
337
326
|
})[];
|
|
327
|
+
} & {
|
|
328
|
+
/**
|
|
329
|
+
* #getter
|
|
330
|
+
*/
|
|
331
|
+
readonly svgFontSize: number;
|
|
332
|
+
/**
|
|
333
|
+
* #getter
|
|
334
|
+
*/
|
|
335
|
+
readonly canDisplayLabel: boolean;
|
|
336
|
+
/**
|
|
337
|
+
* #getter
|
|
338
|
+
*/
|
|
339
|
+
readonly labelWidth: number;
|
|
338
340
|
} & {
|
|
339
341
|
afterCreate(): void;
|
|
340
342
|
} & {
|
|
@@ -431,4 +433,3 @@ export default function stateModelFactory(configSchema: AnyConfigurationSchemaTy
|
|
|
431
433
|
} & import("mobx-state-tree")._NotCustomized>;
|
|
432
434
|
export type LinearMafDisplayStateModel = ReturnType<typeof stateModelFactory>;
|
|
433
435
|
export type LinearMafDisplayModel = Instance<LinearMafDisplayStateModel>;
|
|
434
|
-
export {};
|
|
@@ -1,14 +1,15 @@
|
|
|
1
|
+
import { lazy } from 'react';
|
|
1
2
|
import { ConfigurationReference, getConf } from '@jbrowse/core/configuration';
|
|
2
|
-
import { getEnv, getSession } from '@jbrowse/core/util';
|
|
3
|
+
import { getEnv, getSession, max, measureText } from '@jbrowse/core/util';
|
|
3
4
|
import { getRpcSessionId } from '@jbrowse/core/util/tracks';
|
|
4
5
|
import { ascending } from 'd3-array';
|
|
5
6
|
import { cluster, hierarchy } from 'd3-hierarchy';
|
|
6
7
|
import deepEqual from 'fast-deep-equal';
|
|
7
8
|
import { autorun } from 'mobx';
|
|
8
9
|
import { addDisposer, isAlive, types } from 'mobx-state-tree';
|
|
9
|
-
import
|
|
10
|
-
import { maxLength, setBrLength } from './types';
|
|
10
|
+
import { maxLength, setBrLength } from './util';
|
|
11
11
|
import { normalize } from '../util';
|
|
12
|
+
const SetRowHeightDialog = lazy(() => import('./components/SetRowHeightDialog'));
|
|
12
13
|
/**
|
|
13
14
|
* #stateModel LinearMafDisplay
|
|
14
15
|
* extends LinearBasicDisplay
|
|
@@ -158,7 +159,19 @@ export default function stateModelFactory(configSchema, pluginManager) {
|
|
|
158
159
|
* #getter
|
|
159
160
|
*/
|
|
160
161
|
get samples() {
|
|
161
|
-
|
|
162
|
+
if (this.rowNames) {
|
|
163
|
+
const volatileSamplesMap = self.volatileSamples
|
|
164
|
+
? Object.fromEntries(self.volatileSamples.map(e => [e.id, e]))
|
|
165
|
+
: undefined;
|
|
166
|
+
return normalize(this.rowNames).map(r => ({
|
|
167
|
+
...r,
|
|
168
|
+
label: volatileSamplesMap?.[r.id]?.label || r.label,
|
|
169
|
+
color: volatileSamplesMap?.[r.id]?.color || r.color,
|
|
170
|
+
}));
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
return self.volatileSamples;
|
|
174
|
+
}
|
|
162
175
|
},
|
|
163
176
|
/**
|
|
164
177
|
* #getter
|
|
@@ -267,13 +280,36 @@ export default function stateModelFactory(configSchema, pluginManager) {
|
|
|
267
280
|
},
|
|
268
281
|
};
|
|
269
282
|
})
|
|
283
|
+
.views(self => ({
|
|
284
|
+
/**
|
|
285
|
+
* #getter
|
|
286
|
+
*/
|
|
287
|
+
get svgFontSize() {
|
|
288
|
+
return Math.min(Math.max(self.rowHeight, 8), 14);
|
|
289
|
+
},
|
|
290
|
+
/**
|
|
291
|
+
* #getter
|
|
292
|
+
*/
|
|
293
|
+
get canDisplayLabel() {
|
|
294
|
+
return self.rowHeight >= 7;
|
|
295
|
+
},
|
|
296
|
+
/**
|
|
297
|
+
* #getter
|
|
298
|
+
*/
|
|
299
|
+
get labelWidth() {
|
|
300
|
+
const minWidth = 20;
|
|
301
|
+
return max(self.samples
|
|
302
|
+
?.map(s => measureText(s.label, this.svgFontSize))
|
|
303
|
+
.map(width => (this.canDisplayLabel ? width : minWidth)) || [], 0);
|
|
304
|
+
},
|
|
305
|
+
}))
|
|
270
306
|
.actions(self => ({
|
|
271
307
|
afterCreate() {
|
|
272
308
|
addDisposer(self, autorun(async () => {
|
|
273
309
|
try {
|
|
274
310
|
const { rpcManager } = getSession(self);
|
|
275
311
|
const sessionId = getRpcSessionId(self);
|
|
276
|
-
|
|
312
|
+
self.setSamples((await rpcManager.call(sessionId, 'MafGetSamples', {
|
|
277
313
|
sessionId,
|
|
278
314
|
adapterConfig: self.adapterConfig,
|
|
279
315
|
statusCallback: (message) => {
|
|
@@ -281,8 +317,7 @@ export default function stateModelFactory(configSchema, pluginManager) {
|
|
|
281
317
|
self.setMessage(message);
|
|
282
318
|
}
|
|
283
319
|
},
|
|
284
|
-
}));
|
|
285
|
-
self.setSamples(results);
|
|
320
|
+
})));
|
|
286
321
|
}
|
|
287
322
|
catch (e) {
|
|
288
323
|
console.error(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stateModel.js","sourceRoot":"","sources":["../../src/LinearMafDisplay/stateModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AAC7E,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"stateModel.js","sourceRoot":"","sources":["../../src/LinearMafDisplay/stateModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import type { HierarchyNode } from 'd3-hierarchy';
|
|
2
1
|
export interface NodeWithIds {
|
|
3
2
|
id: string;
|
|
4
3
|
name: string;
|
|
@@ -13,5 +12,8 @@ export interface NodeWithIdsAndLength {
|
|
|
13
12
|
noTree?: boolean;
|
|
14
13
|
length: number;
|
|
15
14
|
}
|
|
16
|
-
export
|
|
17
|
-
|
|
15
|
+
export interface Sample {
|
|
16
|
+
id: string;
|
|
17
|
+
label: string;
|
|
18
|
+
color?: string;
|
|
19
|
+
}
|
|
@@ -1,16 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
// basically same as maxLength from https://observablehq.com/@d3/tree-of-life
|
|
3
|
-
export function maxLength(d) {
|
|
4
|
-
return ((d.data.length || 0) + (d.children ? max(d.children, maxLength) || 0 : 0));
|
|
5
|
-
}
|
|
6
|
-
// basically same as setRadius from https://observablehq.com/@d3/tree-of-life
|
|
7
|
-
export function setBrLength(d, y0, k) {
|
|
8
|
-
// @ts-expect-error
|
|
9
|
-
d.len = (y0 += Math.max(d.data.length || 0, 0)) * k;
|
|
10
|
-
if (d.children) {
|
|
11
|
-
d.children.forEach(d => {
|
|
12
|
-
setBrLength(d, y0, k);
|
|
13
|
-
});
|
|
14
|
-
}
|
|
15
|
-
}
|
|
1
|
+
export {};
|
|
16
2
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/LinearMafDisplay/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/LinearMafDisplay/types.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { max } from 'd3-array';
|
|
2
|
+
// basically same as maxLength from https://observablehq.com/@d3/tree-of-life
|
|
3
|
+
export function maxLength(d) {
|
|
4
|
+
return ((d.data.length || 0) + (d.children ? max(d.children, maxLength) || 0 : 0));
|
|
5
|
+
}
|
|
6
|
+
// basically same as setRadius from https://observablehq.com/@d3/tree-of-life
|
|
7
|
+
export function setBrLength(d, y0, k) {
|
|
8
|
+
// @ts-expect-error
|
|
9
|
+
d.len = (y0 += Math.max(d.data.length || 0, 0)) * k;
|
|
10
|
+
if (d.children) {
|
|
11
|
+
d.children.forEach(d => {
|
|
12
|
+
setBrLength(d, y0, k);
|
|
13
|
+
});
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=util.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/LinearMafDisplay/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAK9B,6EAA6E;AAC7E,MAAM,UAAU,SAAS,CAAC,CAA6B;IACrD,OAAO,CACL,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC1E,CAAA;AACH,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,WAAW,CACzB,CAA6B,EAC7B,EAAU,EACV,CAAS;IAET,mBAAmB;IACnB,CAAC,CAAC,GAAG,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IAEnD,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QACf,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACrB,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;QACvB,CAAC,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -26,7 +26,7 @@ export default class LinearMafRenderer extends FeatureRendererType {
|
|
|
26
26
|
width: number;
|
|
27
27
|
height: number;
|
|
28
28
|
containsNoTransferables: boolean;
|
|
29
|
-
canvasRecordedData:
|
|
29
|
+
canvasRecordedData: Record<string, unknown>;
|
|
30
30
|
reactElement?: React.ReactElement;
|
|
31
31
|
html?: string;
|
|
32
32
|
} | {
|
|
@@ -34,15 +34,15 @@ export default class LinearMafRenderer extends FeatureRendererType {
|
|
|
34
34
|
width: number;
|
|
35
35
|
height: number;
|
|
36
36
|
containsNoTransferables: boolean;
|
|
37
|
-
|
|
37
|
+
imageData: any;
|
|
38
|
+
reactElement?: React.ReactElement;
|
|
38
39
|
html?: string;
|
|
39
40
|
} | {
|
|
40
41
|
features: Map<any, any>;
|
|
41
42
|
width: number;
|
|
42
43
|
height: number;
|
|
43
44
|
containsNoTransferables: boolean;
|
|
44
|
-
|
|
45
|
-
reactElement?: React.ReactElement;
|
|
45
|
+
reactElement: React.ReactElement;
|
|
46
46
|
html?: string;
|
|
47
47
|
}>;
|
|
48
48
|
}
|
|
@@ -15,21 +15,19 @@ export default class LinearMafRenderer extends FeatureRendererType {
|
|
|
15
15
|
async render(renderProps) {
|
|
16
16
|
const { statusCallback = () => { }, regions, bpPerPx, samples, rowHeight, } = renderProps;
|
|
17
17
|
const region = regions[0];
|
|
18
|
-
const height = samples.length *
|
|
18
|
+
const height = samples.length * rowHeight + 100;
|
|
19
19
|
const width = (region.end - region.start) / bpPerPx;
|
|
20
20
|
const features = await this.getFeatures(renderProps);
|
|
21
|
-
const res = await renderToAbstractCanvas(width, height, renderProps,
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
},
|
|
29
|
-
});
|
|
21
|
+
const res = await updateStatus('Rendering alignment', statusCallback, () => renderToAbstractCanvas(width, height, renderProps, ctx => {
|
|
22
|
+
makeImageData({
|
|
23
|
+
ctx,
|
|
24
|
+
renderArgs: {
|
|
25
|
+
...renderProps,
|
|
26
|
+
features,
|
|
27
|
+
},
|
|
30
28
|
});
|
|
31
29
|
return undefined;
|
|
32
|
-
});
|
|
30
|
+
}));
|
|
33
31
|
const results = await super.render({
|
|
34
32
|
...renderProps,
|
|
35
33
|
...res,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LinearMafRenderer.js","sourceRoot":"","sources":["../../src/LinearMafRenderer/LinearMafRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAA;AAEzE,OAAO,EAEL,sBAAsB,EACtB,YAAY,GACb,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAe/C,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,mBAAmB;IAChE,iBAAiB,CAAC,MAAc;QAC9B,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,CAAA;QAC7B,MAAM,WAAW,GAAG,CAAC,CAAA;QAErB,OAAO;YACL,sEAAsE;YACtE,GAAI,MAAsC;YAC1C,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC;YACnD,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,WAAW,CAAC;SAClC,CAAA;IACH,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,WAAuB;QAClC,MAAM,EACJ,cAAc,GAAG,GAAG,EAAE,GAAE,CAAC,EACzB,OAAO,EACP,OAAO,EACP,OAAO,EACP,SAAS,GACV,GAAG,WAAW,CAAA;QACf,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAE,CAAA;QAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"LinearMafRenderer.js","sourceRoot":"","sources":["../../src/LinearMafRenderer/LinearMafRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAA;AAEzE,OAAO,EAEL,sBAAsB,EACtB,YAAY,GACb,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAe/C,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,mBAAmB;IAChE,iBAAiB,CAAC,MAAc;QAC9B,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,CAAA;QAC7B,MAAM,WAAW,GAAG,CAAC,CAAA;QAErB,OAAO;YACL,sEAAsE;YACtE,GAAI,MAAsC;YAC1C,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC;YACnD,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,WAAW,CAAC;SAClC,CAAA;IACH,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,WAAuB;QAClC,MAAM,EACJ,cAAc,GAAG,GAAG,EAAE,GAAE,CAAC,EACzB,OAAO,EACP,OAAO,EACP,OAAO,EACP,SAAS,GACV,GAAG,WAAW,CAAA;QACf,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAE,CAAA;QAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,GAAG,GAAG,CAAA;QAC/C,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAA;QACnD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA;QACpD,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,qBAAqB,EAAE,cAAc,EAAE,GAAG,EAAE,CACzE,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE;YACvD,aAAa,CAAC;gBACZ,GAAG;gBACH,UAAU,EAAE;oBACV,GAAG,WAAW;oBACd,QAAQ;iBACT;aACF,CAAC,CAAA;YACF,OAAO,SAAS,CAAA;QAClB,CAAC,CAAC,CACH,CAAA;QACD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC;YACjC,GAAG,WAAW;YACd,GAAG,GAAG;YACN,KAAK;YACL,MAAM;SACP,CAAC,CAAA;QACF,OAAO;YACL,GAAG,OAAO;YACV,GAAG,GAAG;YACN,QAAQ,EAAE,IAAI,GAAG,EAAE;YACnB,KAAK;YACL,MAAM;YACN,uBAAuB,EAAE,IAAI;SAC9B,CAAA;IACH,CAAC;CACF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createJBrowseTheme } from '@jbrowse/core/ui';
|
|
2
|
-
import { featureSpanPx } from '@jbrowse/core/util';
|
|
2
|
+
import { featureSpanPx, measureText } from '@jbrowse/core/util';
|
|
3
3
|
import { fillRect, getCharWidthHeight, getColorBaseMap, getContrastBaseMap, } from './util';
|
|
4
4
|
export function makeImageData({ ctx, renderArgs, }) {
|
|
5
5
|
const { regions, bpPerPx, rowHeight, showAllLetters, theme: configTheme, mismatchRendering, samples, rowProportion, features, } = renderArgs;
|
|
@@ -31,10 +31,11 @@ export function makeImageData({ ctx, renderArgs, }) {
|
|
|
31
31
|
continue;
|
|
32
32
|
}
|
|
33
33
|
const t = rowHeight * row;
|
|
34
|
+
const t2 = offset + t;
|
|
34
35
|
// gaps
|
|
35
36
|
ctx.beginPath();
|
|
36
37
|
ctx.fillStyle = 'black';
|
|
37
|
-
for (let i = 0, o = 0
|
|
38
|
+
for (let i = 0, o = 0, l = alignment.length; i < l; i++) {
|
|
38
39
|
if (seq[i] !== '-') {
|
|
39
40
|
if (alignment[i] === '-') {
|
|
40
41
|
const l = leftPx + scale * o;
|
|
@@ -48,31 +49,31 @@ export function makeImageData({ ctx, renderArgs, }) {
|
|
|
48
49
|
if (!showAllLetters) {
|
|
49
50
|
// matches
|
|
50
51
|
ctx.fillStyle = 'lightgrey';
|
|
51
|
-
for (let i = 0, o = 0
|
|
52
|
+
for (let i = 0, o = 0, l = alignment.length; i < l; i++) {
|
|
52
53
|
if (seq[i] !== '-') {
|
|
53
54
|
const c = alignment[i];
|
|
54
55
|
const l = leftPx + scale * o;
|
|
55
|
-
if (seq[i] === c && c !== '-') {
|
|
56
|
-
fillRect(ctx, l,
|
|
56
|
+
if (seq[i] === c && c !== '-' && c !== ' ') {
|
|
57
|
+
fillRect(ctx, l, t2, scale + f, h, canvasWidth);
|
|
57
58
|
}
|
|
58
59
|
o++;
|
|
59
60
|
}
|
|
60
61
|
}
|
|
61
62
|
}
|
|
62
63
|
// mismatches
|
|
63
|
-
for (let i = 0, o = 0
|
|
64
|
+
for (let i = 0, o = 0, l = alignment.length; i < l; i++) {
|
|
64
65
|
const c = alignment[i];
|
|
65
66
|
if (seq[i] !== '-') {
|
|
66
67
|
if (c !== '-') {
|
|
67
68
|
const l = leftPx + scale * o;
|
|
68
69
|
if (seq[i] !== c && c !== ' ') {
|
|
69
|
-
fillRect(ctx, l,
|
|
70
|
+
fillRect(ctx, l, t2, scale + f, h, canvasWidth, mismatchRendering
|
|
70
71
|
? // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
71
72
|
(colorForBase[c] ?? 'black')
|
|
72
73
|
: 'orange');
|
|
73
74
|
}
|
|
74
75
|
else if (showAllLetters) {
|
|
75
|
-
fillRect(ctx, l,
|
|
76
|
+
fillRect(ctx, l, t2, scale + f, h, canvasWidth, mismatchRendering
|
|
76
77
|
? // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
77
78
|
(colorForBase[c] ?? 'black')
|
|
78
79
|
: 'lightblue');
|
|
@@ -84,7 +85,7 @@ export function makeImageData({ ctx, renderArgs, }) {
|
|
|
84
85
|
// font
|
|
85
86
|
const charSizeW = 10;
|
|
86
87
|
if (scale >= charSizeW) {
|
|
87
|
-
for (let i = 0, o = 0
|
|
88
|
+
for (let i = 0, o = 0, l = alignment.length; i < l; i++) {
|
|
88
89
|
if (seq[i] !== '-') {
|
|
89
90
|
const l = leftPx + scale * o;
|
|
90
91
|
const offset = (scale - charSizeW) / 2 + 1;
|
|
@@ -117,9 +118,8 @@ export function makeImageData({ ctx, renderArgs, }) {
|
|
|
117
118
|
continue;
|
|
118
119
|
}
|
|
119
120
|
const t = rowHeight * row;
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
for (let i = 0, o = 0; i < alignment.length; i++) {
|
|
121
|
+
const t2 = offset + t;
|
|
122
|
+
for (let i = 0, o = 0, l = alignment.length; i < l; i++) {
|
|
123
123
|
let ins = '';
|
|
124
124
|
while (seq[i] === '-') {
|
|
125
125
|
if (alignment[i] !== '-' && alignment[i] !== ' ') {
|
|
@@ -129,15 +129,33 @@ export function makeImageData({ ctx, renderArgs, }) {
|
|
|
129
129
|
}
|
|
130
130
|
if (ins.length > 0) {
|
|
131
131
|
const l = leftPx + scale * o - 1;
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
132
|
+
if (ins.length > 10) {
|
|
133
|
+
const txt = `${ins.length}`;
|
|
134
|
+
if (bpPerPx > 10) {
|
|
135
|
+
fillRect(ctx, l - 1, t2, 2, h, canvasWidth, 'purple');
|
|
136
|
+
}
|
|
137
|
+
else if (h > charHeight) {
|
|
138
|
+
const rwidth = measureText(txt, 10);
|
|
139
|
+
const padding = 2;
|
|
140
|
+
fillRect(ctx, l - rwidth / 2 - padding, t2, rwidth + 2 * padding, h, canvasWidth, 'purple');
|
|
141
|
+
ctx.fillStyle = 'white';
|
|
142
|
+
ctx.fillText(txt, l - rwidth / 2, t + h);
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
const padding = 2;
|
|
146
|
+
fillRect(ctx, l - padding, t2, 2 * padding, h, canvasWidth, 'purple');
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
fillRect(ctx, l, t2, 1, h, canvasWidth, 'purple');
|
|
151
|
+
if (bpPerPx < 0.2 && rowHeight > 5) {
|
|
152
|
+
fillRect(ctx, l - 2, t2, 5, 1, canvasWidth);
|
|
153
|
+
fillRect(ctx, l - 2, t2 + h - 1, 5, 1, canvasWidth);
|
|
154
|
+
}
|
|
136
155
|
}
|
|
137
156
|
}
|
|
138
157
|
o++;
|
|
139
158
|
}
|
|
140
|
-
ctx.fill();
|
|
141
159
|
}
|
|
142
160
|
}
|
|
143
161
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeImageData.js","sourceRoot":"","sources":["../../src/LinearMafRenderer/makeImageData.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAW,aAAa,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"makeImageData.js","sourceRoot":"","sources":["../../src/LinearMafRenderer/makeImageData.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ export default function MultiMAFWidget({ model }) {
|
|
|
36
36
|
React.createElement(FormLabel, null, "File type"),
|
|
37
37
|
React.createElement(RadioGroup, { value: fileTypeChoice, onChange: event => {
|
|
38
38
|
setFileTypeChoice(event.target.value);
|
|
39
|
-
} }, ['BigMafAdapter', 'MafTabixAdapter'
|
|
39
|
+
} }, ['BigMafAdapter', 'MafTabixAdapter'].map(r => (React.createElement(FormControlLabel, { key: r, value: r, control: React.createElement(Radio, null), checked: fileTypeChoice === r, label: r }))))),
|
|
40
40
|
fileTypeChoice === 'BigMafAdapter' ? (React.createElement(FileSelector, { location: loc, name: "Path to bigMaf", rootModel: rootModel, setLocation: arg => {
|
|
41
41
|
setLoc(arg);
|
|
42
42
|
} })) : fileTypeChoice === 'MafTabixAdapter' ? (React.createElement(React.Fragment, null,
|