From 458aad01615862e030304df259fc881d9760e186 Mon Sep 17 00:00:00 2001
From: dsehnal <david.sehnal@gmail.com>
Date: Mon, 17 Oct 2022 20:05:56 +0200
Subject: [PATCH] Volume.PickingGranuality custom property
---
src/cli/structure-info/volume.ts | 2 +-
src/mol-model/volume/volume.ts | 10 ++++++++++
src/mol-repr/volume/isosurface.ts | 6 +++---
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/cli/structure-info/volume.ts b/src/cli/structure-info/volume.ts
index c8ebd5aee..23bf618af 100644
--- a/src/cli/structure-info/volume.ts
+++ b/src/cli/structure-info/volume.ts
@@ -38,7 +38,7 @@ function print(volume: Volume) {
}
async function doMesh(volume: Volume, filename: string) {
- const mesh = await Task.create('', runtime => createVolumeIsosurfaceMesh({ runtime }, volume, Theme.createEmpty(), { isoValue: Volume.IsoValue.absolute(1.5), pickingGranularity: 'voxels' })).run();
+ const mesh = await Task.create('', runtime => createVolumeIsosurfaceMesh({ runtime }, volume, Theme.createEmpty(), { isoValue: Volume.IsoValue.absolute(1.5) })).run();
console.log({ vc: mesh.vertexCount, tc: mesh.triangleCount });
// Export the mesh in OBJ format.
diff --git a/src/mol-model/volume/volume.ts b/src/mol-model/volume/volume.ts
index 1bf87a936..521ab451d 100644
--- a/src/mol-model/volume/volume.ts
+++ b/src/mol-model/volume/volume.ts
@@ -219,4 +219,14 @@ export namespace Volume {
return Sphere3D.expand(bs, bs, Mat4.getMaxScaleOnAxis(transform) * 10);
}
}
+
+ export type PickingGranuality = 'surface' | 'voxel';
+ export const PickingGranuality = {
+ set(volume: Volume, granuality: PickingGranuality) {
+ volume._propertyData['__picking_granuality__'] = granuality;
+ },
+ get(volume: Volume): PickingGranuality {
+ return volume._propertyData['__picking_granuality__'] ?? 'voxel';
+ }
+ };
}
\ No newline at end of file
diff --git a/src/mol-repr/volume/isosurface.ts b/src/mol-repr/volume/isosurface.ts
index 9ad3da6ef..6d3ab3b21 100644
--- a/src/mol-repr/volume/isosurface.ts
+++ b/src/mol-repr/volume/isosurface.ts
@@ -32,8 +32,7 @@ import { BaseGeometry } from '../../mol-geo/geometry/base';
import { ValueCell } from '../../mol-util/value-cell';
export const VolumeIsosurfaceParams = {
- isoValue: Volume.IsoValueParam,
- pickingGranularity: PD.Select<'voxels' | 'surfaces'>('voxels', [['voxels', 'Voxels'], ['surfaces', 'Surfaces']]),
+ isoValue: Volume.IsoValueParam
};
export type VolumeIsosurfaceParams = typeof VolumeIsosurfaceParams
export type VolumeIsosurfaceProps = PD.Values<VolumeIsosurfaceParams>
@@ -67,8 +66,9 @@ function getLoci(volume: Volume, props: VolumeIsosurfaceProps) {
function getIsosurfaceLoci(pickingId: PickingId, volume: Volume, props: VolumeIsosurfaceProps, id: number) {
const { objectId, groupId } = pickingId;
+
if (id === objectId) {
- if (props.pickingGranularity === 'surfaces') {
+ if (Volume.PickingGranuality.get(volume) === 'surface') {
return Volume.Isosurface.Loci(volume, props.isoValue);
} else {
return Volume.Cell.Loci(volume, Interval.ofSingleton(groupId as Volume.CellIndex));
--
GitLab