David Sehnal 7 سال پیش
والد
کامیت
835185bb69

+ 1 - 1
src/mol-math/geometry.ts

@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>

+ 5 - 5
src/mol-math/geometry/_spec/lookup3d.spec.ts

@@ -1,8 +1,8 @@
-/*
-* Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
-*
-* @author David Sehnal <david.sehnal@gmail.com>
-*/
+/**
+ * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author David Sehnal <david.sehnal@gmail.com>
+ */
 
 import { GridLookup3D } from '../../geometry';
 import { sortArray } from 'mol-data/util';

+ 5 - 5
src/mol-math/geometry/common.ts

@@ -1,8 +1,8 @@
-/*
-* Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
-*
-* @author David Sehnal <david.sehnal@gmail.com>
-*/
+/**
+ * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author David Sehnal <david.sehnal@gmail.com>
+ */
 
 import { OrderedSet } from 'mol-data/int'
 

+ 1 - 1
src/mol-math/geometry/lookup3d/common.ts

@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>

+ 1 - 1
src/mol-math/geometry/lookup3d/grid.ts

@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>

+ 1 - 1
src/mol-math/geometry/primitives/box3d.ts

@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>

+ 1 - 1
src/mol-math/geometry/primitives/sphere3d.ts

@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>

+ 0 - 40
src/mol-model/annotation/annotation.ts

@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
- *
- * @author David Sehnal <david.sehnal@gmail.com>
- */
-
-import { Structure, ElementSet, Element } from '../structure'
-
-interface Annotation<E = any> {
-    definition: Annotation.Definition<E>,
-    getValue(l: Element.Location): E | undefined,
-    getAll(l: ElementSet): { annotations: E[], /* TODO: map annotations to elements */ }
-}
-
-namespace Annotation {
-    export const enum Kind {
-        Atom,
-        Residue,
-        Sequence,
-        Chain,
-        Entity,
-        Coarse,
-        Spatial
-    }
-
-    export const enum Type {
-        Num,
-        Str,
-        Obj
-    }
-
-    export interface Definition<E = any> {
-        name: string,
-        kind: Kind,
-        type: Type,
-        prepare<Data>(s: Structure, data: Data): Annotation<E>,
-    }
-}
-
-export { Annotation }

+ 0 - 17
src/mol-model/annotations.ts

@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
- *
- * @author David Sehnal <david.sehnal@gmail.com>
- */
-
-import { Annotation } from './annotation/annotation'
-import { UUID } from 'mol-util'
-
-interface Annotations {
-    id: UUID,
-    all: Annotation[],
-    byKind: { [kind: number]: Annotation }
-    //getAll()
-}
-
-export { Annotations }

+ 0 - 3
src/mol-model/structure/model/model.ts

@@ -14,8 +14,6 @@ import CoarseGrained from './properties/coarse-grained'
 import from_gro from './formats/gro'
 import from_mmCIF from './formats/mmcif'
 
-import { Annotations } from '../../annotations'
-
 /**
  * Interface to the "source data" of the molecule.
  *
@@ -32,7 +30,6 @@ interface Model extends Readonly<{
     conformation: Conformation,
     symmetry: Symmetry,
     coarseGrained: CoarseGrained,
-    annotations: Annotations,
 
     atomCount: number,
 }> {