From b1d6277837a3f2c378d78678978105c56f834c65 Mon Sep 17 00:00:00 2001
From: David Sehnal <david.sehnal@gmail.com>
Date: Thu, 14 Feb 2019 11:27:24 +0100
Subject: [PATCH] mol-model-parsers module, "standalone" pdb parser
---
.../volume/formats => mol-model-parsers/volume}/ccp4.ts | 2 +-
.../formats => mol-model-parsers/volume}/density-server.ts | 2 +-
.../volume/formats => mol-model-parsers/volume}/dsn6.ts | 2 +-
src/mol-model/volume.ts | 2 +-
src/mol-plugin/state/transforms/model.ts | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
rename src/{mol-model/volume/formats => mol-model-parsers/volume}/ccp4.ts (98%)
rename src/{mol-model/volume/formats => mol-model-parsers/volume}/density-server.ts (97%)
rename src/{mol-model/volume/formats => mol-model-parsers/volume}/dsn6.ts (97%)
diff --git a/src/mol-model/volume/formats/ccp4.ts b/src/mol-model-parsers/volume/ccp4.ts
similarity index 98%
rename from src/mol-model/volume/formats/ccp4.ts
rename to src/mol-model-parsers/volume/ccp4.ts
index 33b8087c8..5a6d9cfac 100644
--- a/src/mol-model/volume/formats/ccp4.ts
+++ b/src/mol-model-parsers/volume/ccp4.ts
@@ -4,7 +4,7 @@
* @author Alexander Rose <alexander.rose@weirdbyte.de>
*/
-import { VolumeData } from '../data'
+import { VolumeData } from 'mol-model/volume/data'
import { Task } from 'mol-task';
import { SpacegroupCell, Box3D } from 'mol-math/geometry';
import { Tensor, Vec3 } from 'mol-math/linear-algebra';
diff --git a/src/mol-model/volume/formats/density-server.ts b/src/mol-model-parsers/volume/density-server.ts
similarity index 97%
rename from src/mol-model/volume/formats/density-server.ts
rename to src/mol-model-parsers/volume/density-server.ts
index c01282e8e..450f8fcb0 100644
--- a/src/mol-model/volume/formats/density-server.ts
+++ b/src/mol-model-parsers/volume/density-server.ts
@@ -5,7 +5,7 @@
*/
import { DensityServer_Data_Database } from 'mol-io/reader/cif/schema/density-server'
-import { VolumeData } from '../data'
+import { VolumeData } from 'mol-model/volume/data'
import { Task } from 'mol-task';
import { SpacegroupCell, Box3D } from 'mol-math/geometry';
import { Tensor, Vec3 } from 'mol-math/linear-algebra';
diff --git a/src/mol-model/volume/formats/dsn6.ts b/src/mol-model-parsers/volume/dsn6.ts
similarity index 97%
rename from src/mol-model/volume/formats/dsn6.ts
rename to src/mol-model-parsers/volume/dsn6.ts
index d945c19cf..b256fe599 100644
--- a/src/mol-model/volume/formats/dsn6.ts
+++ b/src/mol-model-parsers/volume/dsn6.ts
@@ -4,7 +4,7 @@
* @author Alexander Rose <alexander.rose@weirdbyte.de>
*/
-import { VolumeData } from '../data'
+import { VolumeData } from 'mol-model/volume/data'
import { Task } from 'mol-task';
import { SpacegroupCell, Box3D } from 'mol-math/geometry';
import { Tensor, Vec3 } from 'mol-math/linear-algebra';
diff --git a/src/mol-model/volume.ts b/src/mol-model/volume.ts
index aa8cf1ce4..093da9a40 100644
--- a/src/mol-model/volume.ts
+++ b/src/mol-model/volume.ts
@@ -5,4 +5,4 @@
*/
export * from './volume/data'
-export * from './volume/formats/density-server'
\ No newline at end of file
+export * from '../mol-model-parsers/volume/density-server'
\ No newline at end of file
diff --git a/src/mol-plugin/state/transforms/model.ts b/src/mol-plugin/state/transforms/model.ts
index 1d2a96e8c..15838cd42 100644
--- a/src/mol-plugin/state/transforms/model.ts
+++ b/src/mol-plugin/state/transforms/model.ts
@@ -16,9 +16,9 @@ import { MolScriptBuilder } from 'mol-script/language/builder';
import { StateObject } from 'mol-state';
import { PluginContext } from 'mol-plugin/context';
import { stringToWords } from 'mol-util/string';
-import { volumeFromCcp4 } from 'mol-model/volume/formats/ccp4';
+import { volumeFromCcp4 } from 'mol-model-parsers/volume/ccp4';
import { Vec3 } from 'mol-math/linear-algebra';
-import { volumeFromDsn6 } from 'mol-model/volume/formats/dsn6';
+import { volumeFromDsn6 } from 'mol-model-parsers/volume/dsn6';
import { trajecotryFromMmCIF } from 'mol-model-parsers/structure/mmcif';
import { ModelFormat } from 'mol-model-parsers/structure/format';
import { parsePDB } from 'mol-io/reader/pdb/parser';
--
GitLab