Browse Source

rename first-model trajectory preset to default

David Sehnal 5 years ago
parent
commit
745415a1d8

+ 6 - 6
src/mol-plugin-state/actions/structure.ts

@@ -36,7 +36,7 @@ export const MmcifProvider: DataFormatProvider<PluginStateObject.Data.String | P
         return Task.create('mmCIF default builder', async () => {
             const trajectory = await ctx.builders.structure.parseTrajectory(data, 'mmcif');
             const representationPreset = options.visuals ? 'auto' : 'empty';
-            await ctx.builders.structure.hierarchy.applyPreset(trajectory, 'first-model', { showUnitcell: options.visuals, representationPreset });
+            await ctx.builders.structure.hierarchy.applyPreset(trajectory, 'default', { showUnitcell: options.visuals, representationPreset });
         })
     }
 }
@@ -53,7 +53,7 @@ export const PdbProvider: DataFormatProvider<any> = {
         return Task.create('PDB default builder', async () => {
             const trajectory = await ctx.builders.structure.parseTrajectory(data, 'pdb');
             const representationPreset = options.visuals ? 'auto' : 'empty';
-            await ctx.builders.structure.hierarchy.applyPreset(trajectory, 'first-model', { showUnitcell: options.visuals, representationPreset });
+            await ctx.builders.structure.hierarchy.applyPreset(trajectory, 'default', { showUnitcell: options.visuals, representationPreset });
         })
     }
 }
@@ -70,7 +70,7 @@ export const GroProvider: DataFormatProvider<any> = {
         return Task.create('GRO default builder', async () => {
             const trajectory = await ctx.builders.structure.parseTrajectory(data, 'gro');
             const representationPreset = options.visuals ? 'auto' : 'empty';
-            await ctx.builders.structure.hierarchy.applyPreset(trajectory, 'first-model', { showUnitcell: options.visuals, representationPreset });
+            await ctx.builders.structure.hierarchy.applyPreset(trajectory, 'default', { showUnitcell: options.visuals, representationPreset });
         })
     }
 }
@@ -87,7 +87,7 @@ export const Provider3dg: DataFormatProvider<any> = {
         return Task.create('3DG default builder', async () => {
             const trajectory = await ctx.builders.structure.parseTrajectory(data, '3dg');
             const representationPreset = options.visuals ? 'auto' : 'empty';
-            await ctx.builders.structure.hierarchy.applyPreset(trajectory, 'first-model', { showUnitcell: options.visuals, representationPreset });
+            await ctx.builders.structure.hierarchy.applyPreset(trajectory, 'default', { showUnitcell: options.visuals, representationPreset });
         })
     }
 }
@@ -236,7 +236,7 @@ const DownloadStructure = StateAction.build({
             }, { state: { isGhost: true } });
             const trajectory = await plugin.builders.structure.parseTrajectory(blob, { formats: downloadParams.map((_, i) => ({ id: '' + i, format: 'cif' as 'cif' })) });
 
-            await plugin.builders.structure.hierarchy.applyPreset(trajectory, 'first-model', {
+            await plugin.builders.structure.hierarchy.applyPreset(trajectory, 'default', {
                 structure,
                 showUnitcell,
                 representationPreset
@@ -246,7 +246,7 @@ const DownloadStructure = StateAction.build({
                 const data = await plugin.builders.data.download(download, { state: { isGhost: true } });
                 const trajectory = await plugin.builders.structure.parseTrajectory(data, format);
 
-                await plugin.builders.structure.hierarchy.applyPreset(trajectory, 'first-model', {
+                await plugin.builders.structure.hierarchy.applyPreset(trajectory, 'default', {
                     structure,
                     showUnitcell,
                     representationPreset

+ 6 - 6
src/mol-plugin-state/builder/structure/hierarchy-preset.ts

@@ -31,20 +31,20 @@ export namespace TrajectoryHierarchyPresetProvider {
 
 const CommonParams = TrajectoryHierarchyPresetProvider.CommonParams
 
-const FirstModelParams = (a: PluginStateObject.Molecule.Trajectory | undefined, plugin: PluginContext) =>  ({
+const DefaultParams = (a: PluginStateObject.Molecule.Trajectory | undefined, plugin: PluginContext) =>  ({
     model: PD.Optional(PD.Group(StateTransformer.getParamDefinition(StateTransforms.Model.ModelFromTrajectory, a, plugin))),
     showUnitcell: PD.Optional(PD.Boolean(false)),
     structure: PD.Optional(RootStructureDefinition.getParams(void 0, 'assembly').type),
     ...CommonParams(a, plugin)
 });
 
-const firstModel = TrajectoryHierarchyPresetProvider({
-    id: 'preset-trajectory-first-model',
-    display: { name: 'First Model', group: 'Preset' },
+const defaultPreset = TrajectoryHierarchyPresetProvider({
+    id: 'preset-trajectory-default',
+    display: { name: 'Default (Assembly)', group: 'Preset' },
     isApplicable: o => {
         return true
     },
-    params: FirstModelParams,
+    params: DefaultParams,
     async apply(trajectory, params, plugin) {
         const builder = plugin.builders.structure;
 
@@ -153,7 +153,7 @@ const supercell = TrajectoryHierarchyPresetProvider({
 });
 
 export const PresetTrajectoryHierarchy = {
-    'first-model': firstModel,
+    'default': defaultPreset,
     'all-models': allModels,
     unitcell,
     supercell,

+ 1 - 1
src/mol-plugin-state/builder/structure/hierarchy.ts

@@ -24,7 +24,7 @@ export class TrajectoryHierarchyBuilder {
     private _providers: TrajectoryHierarchyPresetProvider[] = [];
     private providerMap: Map<string, TrajectoryHierarchyPresetProvider> = new Map();
 
-    readonly defaultProvider = PresetTrajectoryHierarchy['first-model'];
+    readonly defaultProvider = PresetTrajectoryHierarchy.default;
 
     private resolveProvider(ref: TrajectoryHierarchyPresetProviderRef) {
         return typeof ref === 'string'