jbrowse-plugin-mafviewer 1.0.8 → 1.1.1
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 +54 -20
- package/dist/{TaffyAdapter/TaffyAdapter.d.ts → BgzipTaffyAdapter/BgzipTaffyAdapter.d.ts} +11 -7
- package/dist/BgzipTaffyAdapter/BgzipTaffyAdapter.js +197 -0
- package/dist/BgzipTaffyAdapter/BgzipTaffyAdapter.js.map +1 -0
- package/dist/{TaffyAdapter → BgzipTaffyAdapter}/configSchema.d.ts +14 -1
- package/dist/{TaffyAdapter → BgzipTaffyAdapter}/configSchema.js +21 -6
- package/dist/BgzipTaffyAdapter/configSchema.js.map +1 -0
- package/dist/BgzipTaffyAdapter/index.d.ts +2 -0
- package/dist/BgzipTaffyAdapter/index.js +11 -0
- package/dist/BgzipTaffyAdapter/index.js.map +1 -0
- package/dist/BgzipTaffyAdapter/rowInstructions.d.ts +35 -0
- package/dist/BgzipTaffyAdapter/rowInstructions.js +55 -0
- package/dist/BgzipTaffyAdapter/rowInstructions.js.map +1 -0
- package/dist/BgzipTaffyAdapter/types.d.ts +13 -0
- package/dist/BgzipTaffyAdapter/types.js +2 -0
- package/dist/BgzipTaffyAdapter/types.js.map +1 -0
- package/dist/BgzipTaffyAdapter/virtualOffset.d.ts +8 -0
- package/dist/BgzipTaffyAdapter/virtualOffset.js +23 -0
- package/dist/BgzipTaffyAdapter/virtualOffset.js.map +1 -0
- package/dist/BigMafAdapter/BigMafAdapter.js +1 -1
- package/dist/BigMafAdapter/BigMafAdapter.js.map +1 -1
- package/dist/BigMafAdapter/configSchema.d.ts +11 -0
- package/dist/BigMafAdapter/configSchema.js +11 -0
- package/dist/BigMafAdapter/configSchema.js.map +1 -1
- package/dist/BigMafAdapter/index.js +1 -1
- package/dist/BigMafAdapter/index.js.map +1 -1
- package/dist/LinearMafDisplay/components/ColorLegend.js +10 -6
- package/dist/LinearMafDisplay/components/ColorLegend.js.map +1 -1
- package/dist/LinearMafDisplay/components/ReactComponent.js +39 -4
- package/dist/LinearMafDisplay/components/ReactComponent.js.map +1 -1
- package/dist/LinearMafDisplay/components/SetRowHeight.js +7 -7
- package/dist/LinearMafDisplay/components/SetRowHeight.js.map +1 -1
- package/dist/LinearMafDisplay/components/SvgWrapper.d.ts +8 -0
- package/dist/LinearMafDisplay/components/SvgWrapper.js +21 -0
- package/dist/LinearMafDisplay/components/SvgWrapper.js.map +1 -0
- package/dist/LinearMafDisplay/components/Tree.d.ts +5 -0
- package/dist/LinearMafDisplay/components/Tree.js +22 -0
- package/dist/LinearMafDisplay/components/Tree.js.map +1 -0
- package/dist/LinearMafDisplay/components/YScaleBars.d.ts +0 -1
- package/dist/LinearMafDisplay/components/YScaleBars.js +6 -27
- package/dist/LinearMafDisplay/components/YScaleBars.js.map +1 -1
- package/dist/LinearMafDisplay/components/util.d.ts +1 -0
- package/dist/LinearMafDisplay/components/util.js +8 -0
- package/dist/LinearMafDisplay/components/util.js.map +1 -0
- package/dist/LinearMafDisplay/index.js +1 -1
- package/dist/LinearMafDisplay/index.js.map +1 -1
- package/dist/LinearMafDisplay/renderSvg.js +1 -0
- package/dist/LinearMafDisplay/renderSvg.js.map +1 -1
- package/dist/LinearMafDisplay/stateModel.d.ts +76 -14
- package/dist/LinearMafDisplay/stateModel.js +118 -18
- package/dist/LinearMafDisplay/stateModel.js.map +1 -1
- package/dist/LinearMafDisplay/types.d.ts +17 -0
- package/dist/LinearMafDisplay/types.js +16 -0
- package/dist/LinearMafDisplay/types.js.map +1 -0
- package/dist/LinearMafRenderer/LinearMafRenderer.d.ts +3 -3
- package/dist/LinearMafRenderer/LinearMafRenderer.js +11 -9
- package/dist/LinearMafRenderer/LinearMafRenderer.js.map +1 -1
- package/dist/LinearMafRenderer/components/ReactComponent.js +1 -1
- package/dist/LinearMafRenderer/components/ReactComponent.js.map +1 -1
- package/dist/LinearMafRenderer/index.js +1 -1
- package/dist/LinearMafRenderer/index.js.map +1 -1
- package/dist/MafAddTrackWorkflow/AddTrackWorkflow.js +42 -25
- package/dist/MafAddTrackWorkflow/AddTrackWorkflow.js.map +1 -1
- package/dist/MafRPC/index.d.ts +16 -0
- package/dist/MafRPC/index.js +19 -0
- package/dist/MafRPC/index.js.map +1 -0
- package/dist/MafTabixAdapter/MafTabixAdapter.d.ts +8 -0
- package/dist/MafTabixAdapter/MafTabixAdapter.js +18 -19
- package/dist/MafTabixAdapter/MafTabixAdapter.js.map +1 -1
- package/dist/MafTabixAdapter/configSchema.d.ts +17 -0
- package/dist/MafTabixAdapter/configSchema.js +17 -1
- package/dist/MafTabixAdapter/configSchema.js.map +1 -1
- package/dist/MafTabixAdapter/index.js +1 -1
- package/dist/MafTabixAdapter/index.js.map +1 -1
- package/dist/MafTrack/index.js.map +1 -1
- package/dist/index.js +6 -4
- package/dist/index.js.map +1 -1
- package/dist/jbrowse-plugin-mafviewer.umd.production.min.js +65 -4
- package/dist/jbrowse-plugin-mafviewer.umd.production.min.js.map +4 -4
- package/dist/parseNewick.d.ts +60 -0
- package/dist/parseNewick.js +95 -0
- package/dist/parseNewick.js.map +1 -0
- package/dist/util.d.ts +9 -0
- package/dist/util.js +9 -0
- package/dist/util.js.map +1 -0
- package/package.json +18 -5
- package/src/BgzipTaffyAdapter/BgzipTaffyAdapter.ts +227 -0
- package/src/{TaffyAdapter → BgzipTaffyAdapter}/configSchema.ts +21 -6
- package/src/{TaffyAdapter → BgzipTaffyAdapter}/index.ts +5 -4
- package/src/BgzipTaffyAdapter/rowInstructions.ts +91 -0
- package/src/BgzipTaffyAdapter/types.ts +16 -0
- package/src/BgzipTaffyAdapter/virtualOffset.ts +29 -0
- package/src/BigMafAdapter/BigMafAdapter.ts +11 -11
- package/src/BigMafAdapter/configSchema.ts +11 -0
- package/src/BigMafAdapter/index.ts +2 -1
- package/src/LinearMafDisplay/components/ColorLegend.tsx +36 -25
- package/src/LinearMafDisplay/components/ReactComponent.tsx +68 -3
- package/src/LinearMafDisplay/components/SetRowHeight.tsx +6 -5
- package/src/LinearMafDisplay/components/SvgWrapper.tsx +39 -0
- package/src/LinearMafDisplay/components/Tree.tsx +33 -0
- package/src/LinearMafDisplay/components/YScaleBars.tsx +8 -43
- package/src/LinearMafDisplay/components/util.ts +7 -0
- package/src/LinearMafDisplay/index.ts +2 -1
- package/src/LinearMafDisplay/renderSvg.tsx +2 -1
- package/src/LinearMafDisplay/stateModel.ts +139 -18
- package/src/LinearMafDisplay/types.ts +41 -0
- package/src/LinearMafRenderer/LinearMafRenderer.ts +13 -10
- package/src/LinearMafRenderer/components/ReactComponent.tsx +2 -1
- package/src/LinearMafRenderer/index.ts +2 -1
- package/src/MafAddTrackWorkflow/AddTrackWorkflow.tsx +109 -65
- package/src/MafRPC/index.ts +39 -0
- package/src/MafTabixAdapter/MafTabixAdapter.ts +31 -25
- package/src/MafTabixAdapter/configSchema.ts +17 -1
- package/src/MafTabixAdapter/index.ts +2 -1
- package/src/MafTrack/index.ts +1 -0
- package/src/index.ts +6 -4
- package/src/parseNewick.ts +94 -0
- package/src/util.ts +11 -0
- package/LICENSE +0 -201
- package/dist/TaffyAdapter/TaffyAdapter.js +0 -89
- package/dist/TaffyAdapter/TaffyAdapter.js.map +0 -1
- package/dist/TaffyAdapter/configSchema.js.map +0 -1
- package/dist/TaffyAdapter/index.d.ts +0 -2
- package/dist/TaffyAdapter/index.js +0 -11
- package/dist/TaffyAdapter/index.js.map +0 -1
- package/src/TaffyAdapter/TaffyAdapter.ts +0 -112
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
import { types } from 'mobx-state-tree';
|
|
2
1
|
import { ConfigurationReference, getConf, } from '@jbrowse/core/configuration';
|
|
3
2
|
import { getEnv, getSession } from '@jbrowse/core/util';
|
|
3
|
+
import { getRpcSessionId } from '@jbrowse/core/util/tracks';
|
|
4
|
+
import { ascending } from 'd3-array';
|
|
5
|
+
import { cluster, hierarchy } from 'd3-hierarchy';
|
|
6
|
+
import { autorun } from 'mobx';
|
|
7
|
+
import { addDisposer, isAlive, types } from 'mobx-state-tree';
|
|
4
8
|
import SetRowHeightDialog from './components/SetRowHeight';
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
}
|
|
9
|
+
import { maxLength, setBrLength, } from './types';
|
|
10
|
+
import { normalize } from '../util';
|
|
8
11
|
/**
|
|
9
12
|
* #stateModel LinearMafDisplay
|
|
10
13
|
* extends LinearBasicDisplay
|
|
@@ -38,12 +41,28 @@ export default function stateModelFactory(configSchema, pluginManager) {
|
|
|
38
41
|
* #property
|
|
39
42
|
*/
|
|
40
43
|
mismatchRendering: true,
|
|
44
|
+
/**
|
|
45
|
+
* #property
|
|
46
|
+
*/
|
|
47
|
+
showBranchLen: false,
|
|
48
|
+
/**
|
|
49
|
+
* #property
|
|
50
|
+
*/
|
|
51
|
+
treeAreaWidth: 80,
|
|
41
52
|
}))
|
|
42
53
|
.volatile(() => ({
|
|
43
54
|
/**
|
|
44
55
|
* #volatile
|
|
45
56
|
*/
|
|
46
57
|
prefersOffset: true,
|
|
58
|
+
/**
|
|
59
|
+
* #volatile
|
|
60
|
+
*/
|
|
61
|
+
volatileSamples: [],
|
|
62
|
+
/**
|
|
63
|
+
* #volatile
|
|
64
|
+
*/
|
|
65
|
+
tree: undefined,
|
|
47
66
|
}))
|
|
48
67
|
.actions(self => ({
|
|
49
68
|
/**
|
|
@@ -70,17 +89,15 @@ export default function stateModelFactory(configSchema, pluginManager) {
|
|
|
70
89
|
setMismatchRendering(f) {
|
|
71
90
|
self.mismatchRendering = f;
|
|
72
91
|
},
|
|
73
|
-
}))
|
|
74
|
-
.views(self => ({
|
|
75
92
|
/**
|
|
76
|
-
* #
|
|
93
|
+
* #action
|
|
77
94
|
*/
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
? r.map(elt => ({ id: elt, label: elt, color: undefined }))
|
|
82
|
-
: r;
|
|
95
|
+
setSamples({ samples, tree }) {
|
|
96
|
+
self.volatileSamples = samples;
|
|
97
|
+
self.tree = tree;
|
|
83
98
|
},
|
|
99
|
+
}))
|
|
100
|
+
.views(self => ({
|
|
84
101
|
/**
|
|
85
102
|
* #getter
|
|
86
103
|
*/
|
|
@@ -98,14 +115,74 @@ export default function stateModelFactory(configSchema, pluginManager) {
|
|
|
98
115
|
type: 'LinearMafRenderer',
|
|
99
116
|
}, getEnv(self));
|
|
100
117
|
},
|
|
118
|
+
}))
|
|
119
|
+
.views(self => ({
|
|
120
|
+
/**
|
|
121
|
+
* #getter
|
|
122
|
+
*/
|
|
123
|
+
get root() {
|
|
124
|
+
return self.tree
|
|
125
|
+
? hierarchy(self.tree, d => d.children)
|
|
126
|
+
// todo: investigate whether needed, typescript says children always true
|
|
127
|
+
.sum(d => (d.children ? 0 : 1))
|
|
128
|
+
.sort((a, b) => ascending(a.data.length || 1, b.data.length || 1))
|
|
129
|
+
: undefined;
|
|
130
|
+
},
|
|
131
|
+
}))
|
|
132
|
+
.views(self => ({
|
|
133
|
+
/**
|
|
134
|
+
* #getter
|
|
135
|
+
* generates a new tree that is clustered with x,y positions
|
|
136
|
+
*/
|
|
137
|
+
get hierarchy() {
|
|
138
|
+
const r = self.root;
|
|
139
|
+
if (r) {
|
|
140
|
+
const width = self.treeAreaWidth;
|
|
141
|
+
const clust = cluster()
|
|
142
|
+
.size([this.totalHeight, width])
|
|
143
|
+
.separation(() => 1);
|
|
144
|
+
clust(r);
|
|
145
|
+
setBrLength(r, (r.data.length = 0), width / maxLength(r));
|
|
146
|
+
return r;
|
|
147
|
+
}
|
|
148
|
+
else {
|
|
149
|
+
return undefined;
|
|
150
|
+
}
|
|
151
|
+
},
|
|
152
|
+
/**
|
|
153
|
+
* #getter
|
|
154
|
+
*/
|
|
155
|
+
get samples() {
|
|
156
|
+
return this.rowNames ? normalize(this.rowNames) : self.volatileSamples;
|
|
157
|
+
},
|
|
158
|
+
/**
|
|
159
|
+
* #getter
|
|
160
|
+
*/
|
|
161
|
+
get totalHeight() {
|
|
162
|
+
return this.samples.length * self.rowHeight;
|
|
163
|
+
},
|
|
164
|
+
/**
|
|
165
|
+
* #getter
|
|
166
|
+
*/
|
|
167
|
+
get leaves() {
|
|
168
|
+
return self.root?.leaves();
|
|
169
|
+
},
|
|
170
|
+
/**
|
|
171
|
+
* #getter
|
|
172
|
+
*/
|
|
173
|
+
get rowNames() {
|
|
174
|
+
return this.leaves?.map(n => n.data.name);
|
|
175
|
+
},
|
|
101
176
|
}))
|
|
102
177
|
.views(self => {
|
|
103
|
-
const {
|
|
104
|
-
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
105
|
-
trackMenuItems: superTrackMenuItems,
|
|
106
|
-
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
107
|
-
renderProps: superRenderProps, } = self;
|
|
178
|
+
const { trackMenuItems: superTrackMenuItems, renderProps: superRenderProps, } = self;
|
|
108
179
|
return {
|
|
180
|
+
/**
|
|
181
|
+
* #getter
|
|
182
|
+
*/
|
|
183
|
+
get treeWidth() {
|
|
184
|
+
return self.hierarchy ? self.treeAreaWidth : 0;
|
|
185
|
+
},
|
|
109
186
|
/**
|
|
110
187
|
* #method
|
|
111
188
|
*/
|
|
@@ -159,8 +236,31 @@ export default function stateModelFactory(configSchema, pluginManager) {
|
|
|
159
236
|
},
|
|
160
237
|
};
|
|
161
238
|
})
|
|
239
|
+
.actions(self => ({
|
|
240
|
+
afterCreate() {
|
|
241
|
+
addDisposer(self, autorun(async () => {
|
|
242
|
+
try {
|
|
243
|
+
const { rpcManager } = getSession(self);
|
|
244
|
+
const sessionId = getRpcSessionId(self);
|
|
245
|
+
const results = (await rpcManager.call(sessionId, 'MafGetSamples', {
|
|
246
|
+
sessionId,
|
|
247
|
+
adapterConfig: self.adapterConfig,
|
|
248
|
+
statusCallback: (message) => {
|
|
249
|
+
if (isAlive(self)) {
|
|
250
|
+
self.setMessage(message);
|
|
251
|
+
}
|
|
252
|
+
},
|
|
253
|
+
}));
|
|
254
|
+
self.setSamples(results);
|
|
255
|
+
}
|
|
256
|
+
catch (e) {
|
|
257
|
+
console.error(e);
|
|
258
|
+
getSession(self).notifyError(`${e}`, e);
|
|
259
|
+
}
|
|
260
|
+
}));
|
|
261
|
+
},
|
|
262
|
+
}))
|
|
162
263
|
.actions(self => {
|
|
163
|
-
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
164
264
|
const { renderSvg: superRenderSvg } = self;
|
|
165
265
|
return {
|
|
166
266
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stateModel.js","sourceRoot":"","sources":["../../src/LinearMafDisplay/stateModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stateModel.js","sourceRoot":"","sources":["../../src/LinearMafDisplay/stateModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { HierarchyNode } from 'd3-hierarchy';
|
|
2
|
+
export interface NodeWithIds {
|
|
3
|
+
id: string;
|
|
4
|
+
name: string;
|
|
5
|
+
children: NodeWithIds[];
|
|
6
|
+
length?: number;
|
|
7
|
+
noTree?: boolean;
|
|
8
|
+
}
|
|
9
|
+
export interface NodeWithIdsAndLength {
|
|
10
|
+
id: string;
|
|
11
|
+
name: string;
|
|
12
|
+
children: NodeWithIdsAndLength[];
|
|
13
|
+
noTree?: boolean;
|
|
14
|
+
length: number;
|
|
15
|
+
}
|
|
16
|
+
export declare function maxLength(d: HierarchyNode<NodeWithIds>): number;
|
|
17
|
+
export declare function setBrLength(d: HierarchyNode<NodeWithIds>, y0: number, k: number): void;
|
|
@@ -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=types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/LinearMafDisplay/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAoB9B,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;AACD,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"}
|
|
@@ -25,12 +25,12 @@ export default class LinearMafRenderer extends FeatureRendererType {
|
|
|
25
25
|
height: number;
|
|
26
26
|
canvasRecordedData: any;
|
|
27
27
|
features: Map<string, Feature>;
|
|
28
|
-
reactElement?:
|
|
28
|
+
reactElement?: React.ReactElement;
|
|
29
29
|
html?: string;
|
|
30
30
|
} | {
|
|
31
31
|
width: number;
|
|
32
32
|
height: number;
|
|
33
|
-
reactElement:
|
|
33
|
+
reactElement: import("react/jsx-runtime").JSX.Element;
|
|
34
34
|
features: Map<string, Feature>;
|
|
35
35
|
html?: string;
|
|
36
36
|
} | {
|
|
@@ -38,7 +38,7 @@ export default class LinearMafRenderer extends FeatureRendererType {
|
|
|
38
38
|
height: number;
|
|
39
39
|
imageData: any;
|
|
40
40
|
features: Map<string, Feature>;
|
|
41
|
-
reactElement?:
|
|
41
|
+
reactElement?: React.ReactElement;
|
|
42
42
|
html?: string;
|
|
43
43
|
}>;
|
|
44
44
|
}
|
|
@@ -4,7 +4,7 @@ import { featureSpanPx, renderToAbstractCanvas, } from '@jbrowse/core/util';
|
|
|
4
4
|
import { getColorBaseMap, getContrastBaseMap } from './util';
|
|
5
5
|
function makeImageData({ ctx, renderArgs, }) {
|
|
6
6
|
const { regions, bpPerPx, rowHeight, showAllLetters, theme: configTheme, mismatchRendering, samples, rowProportion, features, } = renderArgs;
|
|
7
|
-
const
|
|
7
|
+
const region = regions[0];
|
|
8
8
|
const h = rowHeight * rowProportion;
|
|
9
9
|
const theme = createJBrowseTheme(configTheme);
|
|
10
10
|
const colorForBase = getColorBaseMap(theme);
|
|
@@ -26,7 +26,7 @@ function makeImageData({ ctx, renderArgs, }) {
|
|
|
26
26
|
const alignment = origAlignment.toLowerCase();
|
|
27
27
|
const row = sampleToRowMap.get(sample);
|
|
28
28
|
if (row === undefined) {
|
|
29
|
-
|
|
29
|
+
continue;
|
|
30
30
|
}
|
|
31
31
|
const t = rowHeight * row;
|
|
32
32
|
// gaps
|
|
@@ -65,7 +65,7 @@ function makeImageData({ ctx, renderArgs, }) {
|
|
|
65
65
|
if (seq[i] !== '-') {
|
|
66
66
|
if (c !== '-') {
|
|
67
67
|
const l = leftPx + scale * o;
|
|
68
|
-
if (seq[i] !== c) {
|
|
68
|
+
if (seq[i] !== c && c !== ' ') {
|
|
69
69
|
ctx.fillStyle = mismatchRendering
|
|
70
70
|
? // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
71
71
|
(colorForBase[c] ?? 'black')
|
|
@@ -92,8 +92,10 @@ function makeImageData({ ctx, renderArgs, }) {
|
|
|
92
92
|
const offset = (scale - charSizeW) / 2 + 1;
|
|
93
93
|
const c = alignment[i];
|
|
94
94
|
if ((showAllLetters || seq[i] !== c) && c !== '-') {
|
|
95
|
-
ctx.fillStyle =
|
|
96
|
-
|
|
95
|
+
ctx.fillStyle = mismatchRendering
|
|
96
|
+
? (contrastForBase[c] ?? 'white')
|
|
97
|
+
: 'black';
|
|
98
|
+
ctx.fillText(origAlignment[i] || '', l + offset, hp2 + t + 3);
|
|
97
99
|
}
|
|
98
100
|
o++;
|
|
99
101
|
}
|
|
@@ -112,7 +114,7 @@ function makeImageData({ ctx, renderArgs, }) {
|
|
|
112
114
|
const alignment = origAlignment.toLowerCase();
|
|
113
115
|
const row = sampleToRowMap.get(sample);
|
|
114
116
|
if (row === undefined) {
|
|
115
|
-
|
|
117
|
+
continue;
|
|
116
118
|
}
|
|
117
119
|
const t = rowHeight * row;
|
|
118
120
|
ctx.beginPath();
|
|
@@ -120,7 +122,7 @@ function makeImageData({ ctx, renderArgs, }) {
|
|
|
120
122
|
for (let i = 0, o = 0; i < alignment.length; i++) {
|
|
121
123
|
let ins = '';
|
|
122
124
|
while (seq[i] === '-') {
|
|
123
|
-
if (alignment[i] !== '-') {
|
|
125
|
+
if (alignment[i] !== '-' && alignment[i] !== ' ') {
|
|
124
126
|
ins += alignment[i];
|
|
125
127
|
}
|
|
126
128
|
i++;
|
|
@@ -150,8 +152,8 @@ export default class LinearMafRenderer extends FeatureRendererType {
|
|
|
150
152
|
}
|
|
151
153
|
async render(renderProps) {
|
|
152
154
|
const { regions, bpPerPx, samples, rowHeight } = renderProps;
|
|
153
|
-
const
|
|
154
|
-
const height = samples.length * rowHeight + 100;
|
|
155
|
+
const region = regions[0];
|
|
156
|
+
const height = samples.length * (rowHeight + 1) + 100;
|
|
155
157
|
const width = (region.end - region.start) / bpPerPx;
|
|
156
158
|
const features = await this.getFeatures(renderProps);
|
|
157
159
|
const res = await renderToAbstractCanvas(width, height, renderProps, ctx => {
|
|
@@ -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,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAGL,aAAa,EACb,sBAAsB,GACvB,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"LinearMafRenderer.js","sourceRoot":"","sources":["../../src/LinearMafRenderer/LinearMafRenderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import React from 'react';
|
|
1
2
|
import { PrerenderedCanvas } from '@jbrowse/core/ui';
|
|
2
3
|
import { observer } from 'mobx-react';
|
|
3
|
-
import React from 'react';
|
|
4
4
|
const LinearMafRendering = observer(function (props) {
|
|
5
5
|
return React.createElement(PrerenderedCanvas, { ...props });
|
|
6
6
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReactComponent.js","sourceRoot":"","sources":["../../../src/LinearMafRenderer/components/ReactComponent.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"ReactComponent.js","sourceRoot":"","sources":["../../../src/LinearMafRenderer/components/ReactComponent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,MAAM,kBAAkB,GAAG,QAAQ,CAAC,UAAU,KAG7C;IACC,OAAO,oBAAC,iBAAiB,OAAK,KAAK,GAAI,CAAA;AACzC,CAAC,CAAC,CAAA;AAEF,eAAe,kBAAkB,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import configSchema from './configSchema';
|
|
2
1
|
import LinearMafRenderer from './LinearMafRenderer';
|
|
3
2
|
import ReactComponent from './components/ReactComponent';
|
|
3
|
+
import configSchema from './configSchema';
|
|
4
4
|
export default function LinearMafRendererF(pluginManager) {
|
|
5
5
|
pluginManager.addRendererType(() => new LinearMafRenderer({
|
|
6
6
|
name: 'LinearMafRenderer',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/LinearMafRenderer/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/LinearMafRenderer/index.ts"],"names":[],"mappings":"AAEA,OAAO,iBAAiB,MAAM,qBAAqB,CAAA;AACnD,OAAO,cAAc,MAAM,6BAA6B,CAAA;AACxD,OAAO,YAAY,MAAM,gBAAgB,CAAA;AAEzC,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,aAA4B;IACrE,aAAa,CAAC,eAAe,CAC3B,GAAG,EAAE,CACH,IAAI,iBAAiB,CAAC;QACpB,IAAI,EAAE,mBAAmB;QACzB,cAAc;QACd,YAAY;QACZ,aAAa;KACd,CAAC,CACL,CAAA;AACH,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import React, { useState } from 'react';
|
|
2
|
-
import { Button, FormControl, FormControlLabel, FormLabel, Paper, Radio, RadioGroup, TextField, } from '@mui/material';
|
|
3
|
-
import { makeStyles } from 'tss-react/mui';
|
|
4
|
-
import { getSession, isSessionModelWithWidgets, isSessionWithAddTracks, } from '@jbrowse/core/util';
|
|
5
2
|
import { ErrorMessage, FileSelector } from '@jbrowse/core/ui';
|
|
3
|
+
import { getSession, isSessionModelWithWidgets, isSessionWithAddTracks, } from '@jbrowse/core/util';
|
|
4
|
+
import { Button, FormControl, FormControlLabel, FormLabel, Paper, Radio, RadioGroup, TextField, } from '@mui/material';
|
|
6
5
|
import { getRoot } from 'mobx-state-tree';
|
|
6
|
+
import { makeStyles } from 'tss-react/mui';
|
|
7
7
|
const useStyles = makeStyles()(theme => ({
|
|
8
8
|
textbox: {
|
|
9
9
|
width: '100%',
|
|
@@ -23,6 +23,7 @@ export default function MultiMAFWidget({ model }) {
|
|
|
23
23
|
const [samples, setSamples] = useState('');
|
|
24
24
|
const [loc, setLoc] = useState();
|
|
25
25
|
const [indexLoc, setIndexLoc] = useState();
|
|
26
|
+
const [nhLoc, setNhLoc] = useState();
|
|
26
27
|
const [error, setError] = useState();
|
|
27
28
|
const [trackName, setTrackName] = useState('MAF track');
|
|
28
29
|
const [fileTypeChoice, setFileTypeChoice] = useState('BigMafAdapter');
|
|
@@ -35,28 +36,34 @@ export default function MultiMAFWidget({ model }) {
|
|
|
35
36
|
React.createElement(FormLabel, null, "File type"),
|
|
36
37
|
React.createElement(RadioGroup, { value: fileTypeChoice, onChange: event => {
|
|
37
38
|
setFileTypeChoice(event.target.value);
|
|
38
|
-
} },
|
|
39
|
-
React.createElement(FormControlLabel, { value: "BigMafAdapter", control: React.createElement(Radio, null), checked: fileTypeChoice === 'BigMafAdapter', label: "bigMaf" }),
|
|
40
|
-
React.createElement(FormControlLabel, { value: "MafTabixAdapter", control: React.createElement(Radio, null), checked: fileTypeChoice === 'MafTabixAdapter', label: "mafTabix" }))),
|
|
39
|
+
} }, ['BigMafAdapter', 'MafTabixAdapter', 'BgzipTaffyAdapter'].map(r => (React.createElement(FormControlLabel, { value: r, control: React.createElement(Radio, null), checked: fileTypeChoice === r, label: r }))))),
|
|
41
40
|
fileTypeChoice === 'BigMafAdapter' ? (React.createElement(FileSelector, { location: loc, name: "Path to bigMaf", rootModel: rootModel, setLocation: arg => {
|
|
42
41
|
setLoc(arg);
|
|
43
|
-
} })) : (React.createElement(React.Fragment, null,
|
|
42
|
+
} })) : fileTypeChoice === 'MafTabixAdapter' ? (React.createElement(React.Fragment, null,
|
|
44
43
|
React.createElement(FormControl, null,
|
|
45
44
|
React.createElement(FormLabel, null, "Index type"),
|
|
46
45
|
React.createElement(RadioGroup, { value: fileTypeChoice, onChange: event => {
|
|
47
46
|
setIndexTypeChoice(event.target.value);
|
|
48
|
-
} },
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
47
|
+
} }, ['TBI', 'CSI'].map(r => (React.createElement(FormControlLabel, { value: r, control: React.createElement(Radio, null), checked: fileTypeChoice === r, label: r }))))),
|
|
48
|
+
React.createElement(FileSelector, { location: loc, name: "Path to MAF tabix", rootModel: rootModel, setLocation: arg => {
|
|
49
|
+
setLoc(arg);
|
|
50
|
+
} }),
|
|
51
|
+
React.createElement(FileSelector, { location: indexLoc, name: "Path to MAF tabix index", rootModel: rootModel, setLocation: arg => {
|
|
52
|
+
setIndexLoc(arg);
|
|
53
|
+
} }))) : (React.createElement(React.Fragment, null,
|
|
54
|
+
React.createElement(FileSelector, { location: loc, name: "Path to TAF.gz (Bgzipped TAF)", rootModel: rootModel, setLocation: arg => {
|
|
52
55
|
setLoc(arg);
|
|
53
|
-
}
|
|
54
|
-
React.createElement(FileSelector, { location: indexLoc, name: "Path to
|
|
56
|
+
} }),
|
|
57
|
+
React.createElement(FileSelector, { location: indexLoc, name: "Path to TAF.gz.tai (TAF index)", rootModel: rootModel, setLocation: arg => {
|
|
55
58
|
setIndexLoc(arg);
|
|
56
|
-
}
|
|
57
|
-
React.createElement(
|
|
58
|
-
|
|
59
|
-
|
|
59
|
+
} })))),
|
|
60
|
+
React.createElement("div", null,
|
|
61
|
+
React.createElement(FileSelector, { location: nhLoc, name: "Path to newick tree (.nh)", rootModel: rootModel, setLocation: arg => {
|
|
62
|
+
setNhLoc(arg);
|
|
63
|
+
} }),
|
|
64
|
+
React.createElement(TextField, { multiline: true, rows: 10, value: samples, onChange: event => {
|
|
65
|
+
setSamples(event.target.value);
|
|
66
|
+
}, helperText: "Sample names (optional if .nh supplied, required if not)", placeholder: 'Enter sample names from the MAF file, one per line, or JSON formatted array of samples', variant: "outlined", fullWidth: true })),
|
|
60
67
|
React.createElement(TextField, { value: trackName, helperText: "Track name", onChange: event => {
|
|
61
68
|
setTrackName(event.target.value);
|
|
62
69
|
} }),
|
|
@@ -85,16 +92,26 @@ export default function MultiMAFWidget({ model }) {
|
|
|
85
92
|
type: fileTypeChoice,
|
|
86
93
|
bigBedLocation: loc,
|
|
87
94
|
samples: sampleNames,
|
|
95
|
+
nhLocation: nhLoc,
|
|
88
96
|
}
|
|
89
|
-
:
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
97
|
+
: fileTypeChoice === 'MafTabixAdapter'
|
|
98
|
+
? {
|
|
99
|
+
type: fileTypeChoice,
|
|
100
|
+
bedGzLocation: loc,
|
|
101
|
+
nhLocation: nhLoc,
|
|
102
|
+
index: {
|
|
103
|
+
indexType: indexTypeChoice,
|
|
104
|
+
location: indexLoc,
|
|
105
|
+
},
|
|
106
|
+
samples: sampleNames,
|
|
107
|
+
}
|
|
108
|
+
: {
|
|
109
|
+
type: fileTypeChoice,
|
|
110
|
+
tafGzLocation: loc,
|
|
111
|
+
taiLocation: indexLoc,
|
|
112
|
+
nhLocation: nhLoc,
|
|
113
|
+
samples: sampleNames,
|
|
95
114
|
},
|
|
96
|
-
samples: sampleNames,
|
|
97
|
-
},
|
|
98
115
|
});
|
|
99
116
|
model.view?.showTrack(trackId);
|
|
100
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddTrackWorkflow.js","sourceRoot":"","sources":["../../src/MafAddTrackWorkflow/AddTrackWorkflow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"AddTrackWorkflow.js","sourceRoot":"","sources":["../../src/MafAddTrackWorkflow/AddTrackWorkflow.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import RpcMethodTypeWithFiltersAndRenameRegions from '@jbrowse/core/pluggableElementTypes/RpcMethodTypeWithFiltersAndRenameRegions';
|
|
2
|
+
import type PluginManager from '@jbrowse/core/PluginManager';
|
|
3
|
+
import type { AnyConfigurationModel } from '@jbrowse/core/configuration';
|
|
4
|
+
import type { Region } from '@jbrowse/core/util';
|
|
5
|
+
export declare class MafGetSamples extends RpcMethodTypeWithFiltersAndRenameRegions {
|
|
6
|
+
name: string;
|
|
7
|
+
execute(args: {
|
|
8
|
+
adapterConfig: AnyConfigurationModel;
|
|
9
|
+
stopToken?: string;
|
|
10
|
+
sessionId: string;
|
|
11
|
+
headers?: Record<string, string>;
|
|
12
|
+
regions: Region[];
|
|
13
|
+
bpPerPx: number;
|
|
14
|
+
}, rpcDriverClassName: string): Promise<any>;
|
|
15
|
+
}
|
|
16
|
+
export default function MafRPCF(pluginManager: PluginManager): void;
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { getAdapter } from '@jbrowse/core/data_adapters/dataAdapterCache';
|
|
2
|
+
import RpcMethodTypeWithFiltersAndRenameRegions from '@jbrowse/core/pluggableElementTypes/RpcMethodTypeWithFiltersAndRenameRegions';
|
|
3
|
+
export class MafGetSamples extends RpcMethodTypeWithFiltersAndRenameRegions {
|
|
4
|
+
name = 'MafGetSamples';
|
|
5
|
+
async execute(args, rpcDriverClassName) {
|
|
6
|
+
const pm = this.pluginManager;
|
|
7
|
+
const deserializedArgs = await this.deserializeArguments(args, rpcDriverClassName);
|
|
8
|
+
const { regions, adapterConfig, sessionId } = deserializedArgs;
|
|
9
|
+
const { dataAdapter } = await getAdapter(pm, sessionId, adapterConfig);
|
|
10
|
+
// @ts-expect-error
|
|
11
|
+
return dataAdapter.getSamples(regions, deserializedArgs);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
export default function MafRPCF(pluginManager) {
|
|
15
|
+
pluginManager.addRpcMethod(() => {
|
|
16
|
+
return new MafGetSamples(pluginManager);
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/MafRPC/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAA;AACzE,OAAO,wCAAwC,MAAM,8EAA8E,CAAA;AAMnI,MAAM,OAAO,aAAc,SAAQ,wCAAwC;IACzE,IAAI,GAAG,eAAe,CAAA;IAEtB,KAAK,CAAC,OAAO,CACX,IAOC,EACD,kBAA0B;QAE1B,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAA;QAC7B,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CACtD,IAAI,EACJ,kBAAkB,CACnB,CAAA;QACD,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,gBAAgB,CAAA;QAC9D,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,aAAa,CAAC,CAAA;QAEtE,mBAAmB;QACnB,OAAO,WAAW,CAAC,UAAU,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAA;IAC1D,CAAC;CACF;AAED,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,aAA4B;IAC1D,aAAa,CAAC,YAAY,CAAC,GAAG,EAAE;QAC9B,OAAO,IAAI,aAAa,CAAC,aAAa,CAAC,CAAA;IACzC,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -13,5 +13,13 @@ export default class MafTabixAdapter extends BaseFeatureDataAdapter {
|
|
|
13
13
|
getRefNames(): Promise<string[]>;
|
|
14
14
|
getHeader(): Promise<unknown>;
|
|
15
15
|
getFeatures(query: Region): import("rxjs").Observable<Feature>;
|
|
16
|
+
getSamples(_query: Region): Promise<{
|
|
17
|
+
samples: {
|
|
18
|
+
id: string;
|
|
19
|
+
label: string;
|
|
20
|
+
color?: string;
|
|
21
|
+
}[];
|
|
22
|
+
tree: Record<string, any> | undefined;
|
|
23
|
+
}>;
|
|
16
24
|
freeResources(): void;
|
|
17
25
|
}
|