diff --git a/src/apps/state-docs/pd-to-md.ts b/src/apps/state-docs/pd-to-md.ts index dbe7deedd572cb2808840e9d25a8ac196a7733f2..b285668073b8b80f070ff20d1b201f45fcda0943 100644 --- a/src/apps/state-docs/pd-to-md.ts +++ b/src/apps/state-docs/pd-to-md.ts @@ -16,6 +16,7 @@ function paramInfo(param: PD.Any, offset: number): string { case 'boolean': return 'true/false'; case 'number': return 'Numeric value'; case 'converted': return paramInfo(param.converted, offset); + case 'conditioned': return getParams(param.conditionParams, offset); case 'multi-select': return `Array of ${oToS(param.options)}`; case 'color': return 'Color as 0xrrggbb'; case 'color-scale': return `One of ${oToS(param.options)}`; diff --git a/src/apps/structure-info/volume.ts b/src/apps/structure-info/volume.ts index 80564de4b2e06d1b156d6aeb3641a6161376f5ad..56a7812d9af2ae3b78f588bd80ec21d60057ce9a 100644 --- a/src/apps/structure-info/volume.ts +++ b/src/apps/structure-info/volume.ts @@ -15,7 +15,7 @@ import { DensityServer_Data_Database } from 'mol-io/reader/cif/schema/density-se import { Table } from 'mol-data/db'; import { StringBuilder } from 'mol-util'; import { Task } from 'mol-task'; -import { createVolumeIsosurfaceMesh } from 'mol-repr/volume/isosurface-mesh'; +import { createVolumeIsosurfaceMesh } from 'mol-repr/volume/isosurface'; import { createEmptyTheme } from 'mol-theme/theme'; require('util.promisify').shim(); @@ -39,7 +39,7 @@ function print(data: Volume) { } async function doMesh(data: Volume, filename: string) { - const mesh = await Task.create('', runtime => createVolumeIsosurfaceMesh({ runtime }, data.volume, createEmptyTheme(), { isoValue: VolumeIsoValue.calcAbsolute(data.volume.dataStats, 1.5) } )).run(); + const mesh = await Task.create('', runtime => createVolumeIsosurfaceMesh({ runtime }, data.volume, createEmptyTheme(), { isoValue: VolumeIsoValue.absolute(data.volume.dataStats, 1.5) } )).run(); console.log({ vc: mesh.vertexCount, tc: mesh.triangleCount }); // Export the mesh in OBJ format. diff --git a/src/mol-repr/volume/isosurface-mesh.ts b/src/mol-repr/volume/isosurface.ts similarity index 100% rename from src/mol-repr/volume/isosurface-mesh.ts rename to src/mol-repr/volume/isosurface.ts diff --git a/src/mol-repr/volume/registry.ts b/src/mol-repr/volume/registry.ts index 7c8631590b2bd0ac39af0675045d7420309e883e..51507b46e7188e41f305255fcf422d6e4a780d3d 100644 --- a/src/mol-repr/volume/registry.ts +++ b/src/mol-repr/volume/registry.ts @@ -6,7 +6,7 @@ import { RepresentationProvider, RepresentationRegistry, Representation } from '../representation'; import { VolumeData } from 'mol-model/volume'; -import { IsosurfaceRepresentationProvider } from './isosurface-mesh'; +import { IsosurfaceRepresentationProvider } from './isosurface'; import { DirectVolumeRepresentationProvider } from './direct-volume'; export class VolumeRepresentationRegistry extends RepresentationRegistry<VolumeData, Representation.State> { diff --git a/src/mol-util/param-definition.ts b/src/mol-util/param-definition.ts index 746c9a62bc965f4110c7d521018506377636b9dc..4fb2e52bfd49a283ab63ca5cc73574f6cb9ea956 100644 --- a/src/mol-util/param-definition.ts +++ b/src/mol-util/param-definition.ts @@ -203,7 +203,7 @@ export namespace ParamDefinition { type: 'conditioned', select: Select<string>, conditionParams: C - conditionForValue(v: T): keyof C + conditionForValue(v: T): keyof C conditionedValue(v: T, condition: keyof C): T, } export function Conditioned<T, P extends Base<T>, C = { [k: string]: P }>(defaultValue: T, conditionParams: C, conditionForValue: (v: T) => keyof C, conditionedValue: (v: T, condition: keyof C) => T): Conditioned<T, P, C> {