From 52d2de1a285d92d339bc756d86b23017a6e7f3c8 Mon Sep 17 00:00:00 2001
From: David Sehnal <david.sehnal@gmail.com>
Date: Thu, 26 Oct 2017 14:13:25 +0200
Subject: [PATCH] data model
---
src/mol-data/{structure/symmetry.ts => query.ts} | 0
src/mol-data/selection.ts | 9 +++++++++
src/mol-data/structure.ts | 3 +--
src/mol-data/structure/selectors.ts | 11 -----------
src/mol-data/structure/structure.ts | 6 ------
5 files changed, 10 insertions(+), 19 deletions(-)
rename src/mol-data/{structure/symmetry.ts => query.ts} (100%)
delete mode 100644 src/mol-data/structure/selectors.ts
delete mode 100644 src/mol-data/structure/structure.ts
diff --git a/src/mol-data/structure/symmetry.ts b/src/mol-data/query.ts
similarity index 100%
rename from src/mol-data/structure/symmetry.ts
rename to src/mol-data/query.ts
diff --git a/src/mol-data/selection.ts b/src/mol-data/selection.ts
index e69de29bb..8ab8a8794 100644
--- a/src/mol-data/selection.ts
+++ b/src/mol-data/selection.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author David Sehnal <david.sehnal@gmail.com>
+ */
+
+import Structure from './structure'
+
+export type Selection = Structure | Structure[]
\ No newline at end of file
diff --git a/src/mol-data/structure.ts b/src/mol-data/structure.ts
index e7ae5aa15..b8dcf367c 100644
--- a/src/mol-data/structure.ts
+++ b/src/mol-data/structure.ts
@@ -47,9 +47,8 @@ export interface Structure { units: { [id: number]: Unit }, atoms: AtomSet }
export namespace Structure {
export const Empty: Structure = { units: {}, atoms: AtomSet.Empty };
-
- export enum Algebra { AddUnit, RemoveUnit, UpdateConformation /* specify which units map to which */ }
}
+export default Structure
// export interface Selection { structure: Structure, sets: AtomSet[] }
// type SelectionImpl = Structure | Structure[]
\ No newline at end of file
diff --git a/src/mol-data/structure/selectors.ts b/src/mol-data/structure/selectors.ts
deleted file mode 100644
index c8e599b3a..000000000
--- a/src/mol-data/structure/selectors.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
- *
- * @author David Sehnal <david.sehnal@gmail.com>
- */
-
-import { Selector } from './model'
-
-const set = {};
-
-export type Selectors = Selector.Set<typeof set>
\ No newline at end of file
diff --git a/src/mol-data/structure/structure.ts b/src/mol-data/structure/structure.ts
deleted file mode 100644
index d13a9ee15..000000000
--- a/src/mol-data/structure/structure.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
- *
- * @author David Sehnal <david.sehnal@gmail.com>
- */
-
--
GitLab