Merge branch 'master' into cartoon-repr
# Conflicts: # src/mol-data/int/impl/segmentation.ts # src/mol-data/int/segmentation.ts # src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts # src/mol-geo/representation/structure/visual/util/polymer.ts # src/mol-model/structure/model/formats/mmcif.ts # src/mol-model/structure/model/formats/mmcif/atomic.ts # src/mol-model/structure/model/formats/mmcif/ihm.ts # src/mol-model/structure/model/properties/atomic/hierarchy.ts # src/mol-model/structure/model/properties/coarse/hierarchy.ts
No related branches found
No related tags found
Showing
- data/mmcif-field-names.csv 9 additions, 0 deletionsdata/mmcif-field-names.csv
- src/apps/cif2bcif/converter.ts 5 additions, 9 deletionssrc/apps/cif2bcif/converter.ts
- src/apps/domain-annotation-server/mapping.ts 4 additions, 4 deletionssrc/apps/domain-annotation-server/mapping.ts
- src/apps/domain-annotation-server/utils.ts 0 additions, 37 deletionssrc/apps/domain-annotation-server/utils.ts
- src/apps/structure-info/model.ts 8 additions, 8 deletionssrc/apps/structure-info/model.ts
- src/mol-data/db/column.ts 2 additions, 2 deletionssrc/mol-data/db/column.ts
- src/mol-data/int/_spec/segmentation.spec.ts 2 additions, 2 deletionssrc/mol-data/int/_spec/segmentation.spec.ts
- src/mol-data/int/impl/segmentation.ts 20 additions, 20 deletionssrc/mol-data/int/impl/segmentation.ts
- src/mol-data/int/segmentation.ts 13 additions, 11 deletionssrc/mol-data/int/segmentation.ts
- src/mol-data/int/sorted-ranges.ts 8 additions, 8 deletionssrc/mol-data/int/sorted-ranges.ts
- src/mol-data/util/interval-iterator.ts 6 additions, 6 deletionssrc/mol-data/util/interval-iterator.ts
- src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts 3 additions, 3 deletions...geo/representation/structure/visual/polymer-trace-mesh.ts
- src/mol-geo/representation/structure/visual/util/element.ts 7 additions, 7 deletionssrc/mol-geo/representation/structure/visual/util/element.ts
- src/mol-geo/representation/structure/visual/util/polymer.ts 36 additions, 34 deletionssrc/mol-geo/representation/structure/visual/util/polymer.ts
- src/mol-geo/theme/structure/color/chain-id.ts 7 additions, 7 deletionssrc/mol-geo/theme/structure/color/chain-id.ts
- src/mol-geo/theme/structure/size/physical.ts 3 additions, 3 deletionssrc/mol-geo/theme/structure/size/physical.ts
- src/mol-io/reader/cif/schema/mmcif.ts 15 additions, 5 deletionssrc/mol-io/reader/cif/schema/mmcif.ts
- src/mol-io/writer/cif/encoder.ts 13 additions, 13 deletionssrc/mol-io/writer/cif/encoder.ts
- src/mol-io/writer/cif/encoder/binary.ts 12 additions, 12 deletionssrc/mol-io/writer/cif/encoder/binary.ts
- src/mol-io/writer/cif/encoder/text.ts 24 additions, 23 deletionssrc/mol-io/writer/cif/encoder/text.ts
Loading
Please register or sign in to comment