Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
be763d4
begin multiAlignment
xzhuo May 10, 2019
90b39fb
Merge branch 'master' of https://github.com/lidaof/eg-react into alig…
xzhuo May 10, 2019
036b647
multialignment in progress
xzhuo May 10, 2019
c21baf2
multialign in progress
xzhuo May 13, 2019
0ea25db
multi align inprogress
xzhuo May 15, 2019
2b6f052
multi align refactor in progress
xzhuo May 21, 2019
b5b029c
multi align refactor in progress
xzhuo May 21, 2019
fed5ba8
multiple alignment in progress
xzhuo May 22, 2019
fa635dd
fix a fine mode hober box bug, multi in progress
xzhuo May 23, 2019
f8b361e
mutipleAlignment in progress
xzhuo May 24, 2019
353c054
finalize multiAlign feature
xzhuo May 29, 2019
855b8fa
delete debug console log
xzhuo May 29, 2019
80123e8
remove things I don't need
xzhuo May 29, 2019
f897223
add some simple comments
xzhuo May 29, 2019
6a7faa2
Merge branch 'master' of https://github.com/lidaof/eg-react into alig…
xzhuo Jun 11, 2019
e4d733e
pull from master 48.5
xzhuo Jun 12, 2019
94a2fd1
Merge branch 'master' of https://github.com/lidaof/eg-react into alig…
xzhuo Jul 1, 2019
879cbfc
skip seq string manipulation for pairwise align
xzhuo Jul 1, 2019
b02fa13
fix a bug related to context in gap region
xzhuo Jul 3, 2019
d771c21
Merge branch 'master' of https://github.com/lidaof/eg-react into alig…
xzhuo Jul 26, 2019
fe01c4d
Merge branch 'master' of https://github.com/lidaof/eg-react into alig…
xzhuo Jul 29, 2019
55bd0e9
Merge branch 'master' of https://github.com/lidaof/eg-react into alig…
xzhuo Jan 9, 2020
3afe1b5
Merge branch 'master' of https://github.com/lidaof/eg-react into alig…
xzhuo Jan 16, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions frontend/src/components/trackContainers/TrackDataManager.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react';
import _ from 'lodash';

import { AlignmentPromises } from './TrackViewManager';
import { getTrackConfig } from '../trackConfig/getTrackConfig';
import DataSource from '../../dataSources/DataSource';

Expand All @@ -10,8 +9,7 @@ import { TrackModel } from '../../model/TrackModel';
import NavigationContext from '../../model/NavigationContext';
import { GuaranteeMap } from '../../model/GuaranteeMap';
import { ViewExpansion } from '../../model/RegionExpander';
import { Alignment } from '../../model/alignment/AlignmentViewCalculator';

import { Alignment, MultiAlignment } from '../../model/alignment/MultiAlignmentViewCalculator';
interface TrackDataMap {
[id: number]: TrackData
}
Expand All @@ -21,7 +19,7 @@ interface DataManagerProps {
tracks: TrackModel[]; // Tracks
viewRegion: DisplayedRegionModel; // Region that the user requested
basesPerPixel: number;
alignments: AlignmentPromises;
alignments: MultiAlignment;
primaryViewPromise: Promise<ViewExpansion>;
}

Expand Down Expand Up @@ -135,7 +133,8 @@ export function withTrackData(WrappedComponent: React.ComponentType<{ trackData:
const primaryView = await this.props.primaryViewPromise;
visRegion = primaryView.visRegion;
} else {
alignment = await this.props.alignments[genome];
const alignments = await this.props.alignments;
alignment = alignments[genome];
visRegion = alignment.queryRegion;
}

Expand Down
Loading