From b1301da2928ce75eed0a5a99ec9eaf4acc487fb5 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Mon, 11 Feb 2019 10:22:41 -0800
Subject: [PATCH] isosurface params fixes/tweaks
---
src/apps/state-docs/pd-to-md.ts | 1 +
src/apps/structure-info/volume.ts | 4 ++--
src/mol-repr/volume/{isosurface-mesh.ts => isosurface.ts} | 0
src/mol-repr/volume/registry.ts | 2 +-
src/mol-util/param-definition.ts | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
rename src/mol-repr/volume/{isosurface-mesh.ts => isosurface.ts} (100%)
diff --git a/src/apps/state-docs/pd-to-md.ts b/src/apps/state-docs/pd-to-md.ts
index dbe7deedd..b28566807 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 80564de4b..56a7812d9 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 7c8631590..51507b46e 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 746c9a62b..4fb2e52bf 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> {
--
GitLab