Browse Source

move encoders to mol-io

JonStargaryen 4 years ago
parent
commit
e39c7c4e98

+ 4 - 4
src/servers/model/ligand-writer/ligand-encoder.ts → src/mol-io/writer/ligand-encoder.ts

@@ -4,10 +4,10 @@
  * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
  */
 
-import { StringBuilder } from '../../../mol-util';
-import Writer from '../../../mol-io/writer/writer';
-import { Encoder, Category, Field } from '../../../mol-io/writer/cif/encoder';
-import { ComponentBond } from '../../../mol-model-formats/structure/property/bonds/comp';
+import { StringBuilder } from '../../mol-util';
+import Writer from './writer';
+import { Encoder, Category, Field } from './cif/encoder';
+import { ComponentBond } from '../../mol-model-formats/structure/property/bonds/comp';
 
 interface Atom {
     label_atom_id: string,

+ 1 - 1
src/servers/model/ligand-writer/mol.ts → src/mol-io/writer/mol.ts

@@ -5,7 +5,7 @@
  */
 
 import { MolEncoder } from './mol/encoder';
-import { Encoder } from '../../../mol-io/writer/cif/encoder';
+import { Encoder } from './cif/encoder';
 
 export namespace MolWriter {
     export interface EncoderParams {

+ 3 - 3
src/servers/model/ligand-writer/mol/encoder.ts → src/mol-io/writer/mol/encoder.ts

@@ -4,9 +4,9 @@
  * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
  */
 
-import { StringBuilder } from '../../../../mol-util';
-import { Category } from '../../../../mol-io/writer/cif/encoder';
-import { getCategoryInstanceData } from '../../../../mol-io/writer/cif/encoder/util';
+import { StringBuilder } from '../../../mol-util';
+import { Category } from '../cif/encoder';
+import { getCategoryInstanceData } from '../cif/encoder/util';
 import { LigandEncoder } from '../ligand-encoder';
 
 // specification: http://c4.cabrillo.edu/404/ctfile.pdf

+ 1 - 1
src/servers/model/ligand-writer/mol2.ts → src/mol-io/writer/mol2.ts

@@ -5,7 +5,7 @@
  */
 
 import { Mol2Encoder } from './mol2/encoder';
-import { Encoder } from '../../../mol-io/writer/cif/encoder';
+import { Encoder } from './cif/encoder';
 
 export namespace Mol2Writer {
     export interface EncoderParams {

+ 4 - 4
src/servers/model/ligand-writer/mol2/encoder.ts → src/mol-io/writer/mol2/encoder.ts

@@ -4,11 +4,11 @@
  * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
  */
 
-import { Category } from '../../../../mol-io/writer/cif/encoder';
+import { Category } from '../cif/encoder';
 import { LigandEncoder } from '../ligand-encoder';
-import { StringBuilder } from '../../../../mol-util';
-import { getCategoryInstanceData } from '../../../../mol-io/writer/cif/encoder/util';
-import { BondType } from '../../../../mol-model/structure/model/types';
+import { StringBuilder } from '../../../mol-util';
+import { getCategoryInstanceData } from '../cif/encoder/util';
+import { BondType } from '../../../mol-model/structure/model/types';
 
 // specification: http://chemyang.ccnu.edu.cn/ccb/server/AIMMS/mol2.pdf
 // TODO amide (and real sp/sp2/sp3) support for bonds and SYBYL atom types: see https://www.sdsc.edu/CCMS/Packages/cambridge/pluto/atom_types.html

+ 1 - 1
src/servers/model/ligand-writer/sdf.ts → src/mol-io/writer/sdf.ts

@@ -5,7 +5,7 @@
  */
 
 import { MolEncoder } from './mol/encoder';
-import { Encoder } from '../../../mol-io/writer/cif/encoder';
+import { Encoder } from './cif/encoder';
 
 export namespace SdfWriter {
     export interface EncoderParams {

+ 5 - 5
src/servers/model/server/query.ts

@@ -23,11 +23,11 @@ import { splitCamelCase } from '../../../mol-util/string';
 import { Encoder } from '../../../mol-io/writer/cif/encoder';
 import { Encoding } from './api';
 import { ComponentBond } from '../../../mol-model-formats/structure/property/bonds/comp';
-import { SdfWriter } from '../ligand-writer/sdf';
-import { MolWriter } from '../ligand-writer/mol';
-import { Mol2Writer } from '../ligand-writer/mol2';
-import { MolEncoder } from '../ligand-writer/mol/encoder';
-import { Mol2Encoder } from '../ligand-writer/mol2/encoder';
+import { SdfWriter } from '../../../mol-io/writer/sdf';
+import { MolWriter } from '../../../mol-io/writer/mol';
+import { Mol2Writer } from '../../../mol-io/writer/mol2';
+import { MolEncoder } from '../../../mol-io/writer/mol/encoder';
+import { Mol2Encoder } from '../../../mol-io/writer/mol2/encoder';
 
 export interface Stats {
     structure: StructureWrapper,