diff --git a/src/apps/schema-generator/util/cif-dic.ts b/src/apps/schema-generator/util/cif-dic.ts index 8376fcb3d35e776ca12abb4a4940894ab614d0eb..e800ba3d350fc92f6610d57f3d41ad7079780bf8 100644 --- a/src/apps/schema-generator/util/cif-dic.ts +++ b/src/apps/schema-generator/util/cif-dic.ts @@ -160,6 +160,7 @@ const COMMA_SEPARATED_LIST_FIELDS = [ '_diffrn_source.pdbx_wavelength_list', '_em_diffraction.tilt_angle_list', // 20,40,50,55 '_em_entity_assembly.entity_id_list', + '_entity.pdbx_description', // Endolysin,Beta-2 adrenergic receptor '_entity.pdbx_ec', '_entity_poly.pdbx_strand_id', // A,B '_pdbx_depui_entry_details.experimental_methods', diff --git a/src/mol-io/reader/cif/schema/bird.ts b/src/mol-io/reader/cif/schema/bird.ts index b6a8950046a8b53a695a28e6ad4856bdb8c9f49d..b525c0e6a49e20c5566a6e9a50fb64a93582f402 100644 --- a/src/mol-io/reader/cif/schema/bird.ts +++ b/src/mol-io/reader/cif/schema/bird.ts @@ -1,7 +1,7 @@ /** * Copyright (c) 2017-2018 mol* contributors, licensed under MIT, See LICENSE file for more info. * - * Code-generated 'BIRD' schema file. Dictionary versions: mmCIF 5.303, IHM 0.139, CARB draft. + * Code-generated 'BIRD' schema file. Dictionary versions: mmCIF 5.304, IHM 0.139, CARB draft. * * @author mol-star package (src/apps/schema-generator/generate) */ diff --git a/src/mol-io/reader/cif/schema/ccd.ts b/src/mol-io/reader/cif/schema/ccd.ts index 7086e69b7c6ee5aaa4f7714ff7bb7f581cf34acb..e81dc33d1fb16e7128835722789802565748cfba 100644 --- a/src/mol-io/reader/cif/schema/ccd.ts +++ b/src/mol-io/reader/cif/schema/ccd.ts @@ -1,7 +1,7 @@ /** * Copyright (c) 2017-2018 mol* contributors, licensed under MIT, See LICENSE file for more info. * - * Code-generated 'CCD' schema file. Dictionary versions: mmCIF 5.303, IHM 0.139, CARB draft. + * Code-generated 'CCD' schema file. Dictionary versions: mmCIF 5.304, IHM 0.139, CARB draft. * * @author mol-star package (src/apps/schema-generator/generate) */ diff --git a/src/mol-io/reader/cif/schema/mmcif.ts b/src/mol-io/reader/cif/schema/mmcif.ts index 94ef98f339e9389ac4320ee33d1077dc5fa68ad3..55e21efb5e009a557dddc44fccf0b7a250d01d5b 100644 --- a/src/mol-io/reader/cif/schema/mmcif.ts +++ b/src/mol-io/reader/cif/schema/mmcif.ts @@ -1,7 +1,7 @@ /** * Copyright (c) 2017-2018 mol* contributors, licensed under MIT, See LICENSE file for more info. * - * Code-generated 'mmCIF' schema file. Dictionary versions: mmCIF 5.303, IHM 0.139, CARB draft. + * Code-generated 'mmCIF' schema file. Dictionary versions: mmCIF 5.304, IHM 0.139, CARB draft. * * @author mol-star package (src/apps/schema-generator/generate) */ @@ -491,7 +491,7 @@ export const mmCIF_Schema = { * * Corresponds to the compound name in the PDB format. */ - pdbx_description: str, + pdbx_description: List(',', x => x), /** * A place holder for the number of molecules of the entity in * the entry. diff --git a/src/mol-plugin/behavior/dynamic/labels.ts b/src/mol-plugin/behavior/dynamic/labels.ts index 655a72016638378dbac99b0ff58bc68851c6831c..f717178939a788da751fa6bb364176fa7a41b391 100644 --- a/src/mol-plugin/behavior/dynamic/labels.ts +++ b/src/mol-plugin/behavior/dynamic/labels.ts @@ -152,7 +152,7 @@ export const SceneLabels = PluginBehavior.create<SceneLabelsProps>({ l.element = u.elements[0] if (p.levels.includes('polymer') && u.polymerElements.length) { - label = `${StructureProperties.entity.pdbx_description(l)} (${getAsymId(u)(l)})` + label = `${StructureProperties.entity.pdbx_description(l).join(', ')} (${getAsymId(u)(l)})` } if (p.levels.includes('ligand') && !u.polymerElements.length) { @@ -160,7 +160,7 @@ export const SceneLabels = PluginBehavior.create<SceneLabelsProps>({ const chemComp = u.model.properties.chemicalComponentMap.get(compId) const moleculeType = chemComp ? chemComp.moleculeType : MoleculeType.unknown if (moleculeType === MoleculeType.other || moleculeType === MoleculeType.saccharide) { - label = `${StructureProperties.entity.pdbx_description(l)} (${getAsymId(u)(l)})` + label = `${StructureProperties.entity.pdbx_description(l).join(', ')} (${getAsymId(u)(l)})` } }