|
@@ -11,10 +11,10 @@ import { Asset } from 'molstar/lib/mol-util/assets';
|
|
|
import { Mat4 } from 'molstar/lib/mol-math/linear-algebra';
|
|
|
import { StateTransforms } from 'molstar/lib/mol-plugin-state/transforms';
|
|
|
import { BuiltInTrajectoryFormat } from 'molstar/lib/mol-plugin-state/formats/trajectory';
|
|
|
-import {TrajectoryHierarchyPresetProvider} from 'molstar/lib/mol-plugin-state/builder/structure/hierarchy-preset';
|
|
|
+import { TrajectoryHierarchyPresetProvider } from 'molstar/lib/mol-plugin-state/builder/structure/hierarchy-preset';
|
|
|
|
|
|
export class ModelLoader {
|
|
|
- async load<P={}>(load: LoadParams, props?: PresetProps, matrix?: Mat4, reprProvider?: TrajectoryHierarchyPresetProvider<P>, params?: P) {
|
|
|
+ async load<P = {}>(load: LoadParams, props?: PresetProps, matrix?: Mat4, reprProvider?: TrajectoryHierarchyPresetProvider<P>, params?: P) {
|
|
|
const { fileOrUrl, format, isBinary } = load;
|
|
|
|
|
|
const data = fileOrUrl instanceof File
|
|
@@ -23,17 +23,17 @@ export class ModelLoader {
|
|
|
await this.handleTrajectory<P>(data, format, props, matrix, reprProvider, params);
|
|
|
}
|
|
|
|
|
|
- async parse<P={}>(parse: ParseParams, props?: PresetProps & { dataLabel?: string }, matrix?: Mat4, reprProvider?: TrajectoryHierarchyPresetProvider<P>, params?: P) {
|
|
|
+ async parse<P = {}>(parse: ParseParams, props?: PresetProps & { dataLabel?: string }, matrix?: Mat4, reprProvider?: TrajectoryHierarchyPresetProvider<P>, params?: P) {
|
|
|
const { data, format } = parse;
|
|
|
const _data = await this.plugin.builders.data.rawData({ data, label: props?.dataLabel });
|
|
|
await this.handleTrajectory(_data, format, props, matrix, reprProvider, params);
|
|
|
}
|
|
|
|
|
|
- private async handleTrajectory<P={}>(data: any, format: BuiltInTrajectoryFormat, props?: PresetProps, matrix?: Mat4, reprProvider?: TrajectoryHierarchyPresetProvider<P>, params?: P) {
|
|
|
+ private async handleTrajectory<P = {}>(data: any, format: BuiltInTrajectoryFormat, props?: PresetProps, matrix?: Mat4, reprProvider?: TrajectoryHierarchyPresetProvider<P>, params?: P) {
|
|
|
const trajectory = await this.plugin.builders.structure.parseTrajectory(data, format);
|
|
|
- if(reprProvider){
|
|
|
- await this.plugin.builders.structure.hierarchy.applyPreset(trajectory, reprProvider, {...params});
|
|
|
- }else{
|
|
|
+ if (reprProvider) {
|
|
|
+ await this.plugin.builders.structure.hierarchy.applyPreset(trajectory, reprProvider, { ...params });
|
|
|
+ } else {
|
|
|
const selector = await this.plugin.builders.structure.hierarchy.applyPreset(trajectory, RcsbPreset, {
|
|
|
preset: props || { kind: 'standard', assemblyId: '' }
|
|
|
});
|