diff --git a/src/apps/canvas/component/structure-representation.tsx b/src/apps/canvas/component/structure-representation.tsx index 0a0b12fe84c2f61a816cdfb48d7102fb7c43b5ed..ce10f4d5a4542317a1ca1d2b4b5df411f621c7b1 100644 --- a/src/apps/canvas/component/structure-representation.tsx +++ b/src/apps/canvas/component/structure-representation.tsx @@ -53,6 +53,7 @@ export class StructureRepresentationComponent extends React.Component<StructureR await repr.createOrUpdate(props).run() this.props.viewer.add(repr) this.props.viewer.requestDraw() + console.log(this.props.viewer.stats) const newState = { ...this.state, diff --git a/src/apps/canvas/structure-view.ts b/src/apps/canvas/structure-view.ts index 32cfa02bf9c99fd7d9a309a52dd700a4084b1968..a1a5de9e25cee2dc50b72c7fead0450d20cc5ffe 100644 --- a/src/apps/canvas/structure-view.ts +++ b/src/apps/canvas/structure-view.ts @@ -23,6 +23,7 @@ import { PointRepresentation } from 'mol-geo/representation/structure/representa import { StructureRepresentation } from 'mol-geo/representation/structure'; import { BehaviorSubject } from 'rxjs'; import { SpacefillRepresentation } from 'mol-geo/representation/structure/representation/spacefill'; +import { DistanceRestraintRepresentation } from 'mol-geo/representation/structure/representation/distance-restraint'; export interface StructureView { readonly viewer: Viewer @@ -68,8 +69,9 @@ export async function StructureView(viewer: Viewer, models: ReadonlyArray<Model> ballAndStick: false, carbohydrate: false, spacefill: false, + distanceRestraint: false, symmetryAxes: false, - polymerSphere: false, + // polymerSphere: false, } const structureRepresentations: { [k: string]: StructureRepresentation<any> } = { @@ -78,6 +80,7 @@ export async function StructureView(viewer: Viewer, models: ReadonlyArray<Model> ballAndStick: BallAndStickRepresentation(), carbohydrate: CarbohydrateRepresentation(), spacefill: SpacefillRepresentation(), + distanceRestraint: DistanceRestraintRepresentation(), } const symmetryAxes = ShapeRepresentation() @@ -241,6 +244,7 @@ export async function StructureView(viewer: Viewer, models: ReadonlyArray<Model> updated.next(null) viewer.requestDraw() + console.log(viewer.stats) } async function createSymmetryRepr() { diff --git a/src/mol-view/viewer.ts b/src/mol-view/viewer.ts index 95952a7fdd5754441f0bd66f69691ee2e4278655..0580a883fc1af868a05190b0b03fa92ca2f96227 100644 --- a/src/mol-view/viewer.ts +++ b/src/mol-view/viewer.ts @@ -99,9 +99,7 @@ namespace Viewer { const ctx = createContext(gl) const scene = Scene.create(ctx) - // const controls = TrackballControls.create(input, scene, {}) const controls = TrackballControls.create(input, camera, {}) - // const renderer = Renderer.create(ctx, camera, { clearColor: 0xFFFFFF }) const renderer = Renderer.create(ctx, camera, { clearColor: Color(0x000000) }) const pickScale = 1 @@ -130,9 +128,9 @@ namespace Viewer { } function mark(loci: Loci, action: MarkerAction) { - // reprMap.forEach((roSet, repr) => repr.mark(loci, action)) - // scene.update() - // requestDraw() + reprMap.forEach((roSet, repr) => repr.mark(loci, action)) + scene.update() + requestDraw() } let nearPlaneDelta = 0