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 33b8087c80d2e4d9f7153d9800972a889161fd0f..5a6d9cfac971938ed881439ac32d9c1df00111e9 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 c01282e8e9d69ebd0cb24e35fef3730da9b0f337..450f8fcb001d1005a18742949ed5e097227a6d3f 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 d945c19cfb03a6458fa57acd78138369c772c236..b256fe599afc421722d8943defc96fccc4fe4f4f 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 aa8cf1ce46056532d4723f8c3584de3842c4e484..093da9a40d46e47c5a99d42d07ff8c7685eeab25 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 1d2a96e8c8bf1e0de221251c0d0cb0ad6a97cc1d..15838cd424c04922956bf2e1c669372f25116e49 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';