From 60d5e85b4c0dd7850379b3051d796dba9a6a6bf8 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alexander.rose@weirdbyte.de>
Date: Tue, 14 Apr 2020 16:17:37 -0700
Subject: [PATCH] moved rcsb code to extensions folder
---
README.md | 4 +--
src/apps/viewer/index.ts | 5 ++-
src/extensions/rcsb/README.md | 4 +++
.../rcsb/assembly-symmetry/behavior.ts} | 24 ++++++-------
.../rcsb/assembly-symmetry/color.ts} | 4 +--
.../rcsb/assembly-symmetry/prop.ts} | 30 ++++++++--------
.../rcsb/assembly-symmetry/representation.ts} | 2 +-
.../rcsb/assembly-symmetry/ui.tsx} | 22 ++++++------
.../extensions/rcsb/graphql}/codegen.yml | 4 +--
.../rcsb/graphql/symmetry.gql.ts | 0
.../rcsb/graphql/types.ts | 2 +-
src/extensions/rcsb/index.ts | 8 +++++
.../rcsb/validation-report/behavior.ts} | 34 +++++++++---------
.../validation-report/color}/density-fit.ts | 16 ++++-----
.../color}/geometry-quality.ts | 22 ++++++------
.../color}/random-coil-index.ts | 16 ++++-----
.../rcsb/validation-report/prop.ts} | 36 +++++++++----------
.../rcsb/validation-report/representation.ts} | 4 +--
src/mol-model-props/index.ts | 0
.../behavior/dynamic/custom-props.ts | 4 +--
src/mol-plugin/index.ts | 2 --
21 files changed, 127 insertions(+), 116 deletions(-)
create mode 100644 src/extensions/rcsb/README.md
rename src/{mol-plugin/behavior/dynamic/custom-props/rcsb/assembly-symmetry.ts => extensions/rcsb/assembly-symmetry/behavior.ts} (91%)
rename src/{mol-model-props/rcsb/themes/assembly-symmetry-cluster.ts => extensions/rcsb/assembly-symmetry/color.ts} (96%)
rename src/{mol-model-props/rcsb/assembly-symmetry.ts => extensions/rcsb/assembly-symmetry/prop.ts} (89%)
rename src/{mol-model-props/rcsb/representations/assembly-symmetry.ts => extensions/rcsb/assembly-symmetry/representation.ts} (99%)
rename src/{mol-plugin/behavior/dynamic/custom-props/rcsb/ui/assembly-symmetry.tsx => extensions/rcsb/assembly-symmetry/ui.tsx} (87%)
rename {data/rcsb-graphql => src/extensions/rcsb/graphql}/codegen.yml (66%)
rename src/{mol-model-props => extensions}/rcsb/graphql/symmetry.gql.ts (100%)
rename src/{mol-model-props => extensions}/rcsb/graphql/types.ts (99%)
create mode 100644 src/extensions/rcsb/index.ts
rename src/{mol-plugin/behavior/dynamic/custom-props/rcsb/validation-report.ts => extensions/rcsb/validation-report/behavior.ts} (92%)
rename src/{mol-model-props/rcsb/themes => extensions/rcsb/validation-report/color}/density-fit.ts (83%)
rename src/{mol-model-props/rcsb/themes => extensions/rcsb/validation-report/color}/geometry-quality.ts (85%)
rename src/{mol-model-props/rcsb/themes => extensions/rcsb/validation-report/color}/random-coil-index.ts (80%)
rename src/{mol-model-props/rcsb/validation-report.ts => extensions/rcsb/validation-report/prop.ts} (94%)
rename src/{mol-model-props/rcsb/representations/validation-report-clashes.ts => extensions/rcsb/validation-report/representation.ts} (99%)
delete mode 100644 src/mol-model-props/index.ts
diff --git a/README.md b/README.md
index 4da71bf2e..d30244e44 100644
--- a/README.md
+++ b/README.md
@@ -97,7 +97,7 @@ and navigate to `build/viewer`
**GraphQL schemas**
- ./node_modules/.bin/graphql-codegen -c ./data/rcsb-graphql/codegen.yml
+ ./node_modules/.bin/graphql-codegen -c ./src/extensions/rcsb/graphql/codegen.yml
### Other scripts
**Create chem comp bond table**
@@ -115,7 +115,7 @@ and navigate to `build/viewer`
**Convert any CIF to BinaryCIF**
node lib/servers/model/preprocess -i file.cif -ob file.bcif
-
+
To see all available commands, use ``node lib/servers/model/preprocess -h``.
Or
diff --git a/src/apps/viewer/index.ts b/src/apps/viewer/index.ts
index 64afb2401..69a78551c 100644
--- a/src/apps/viewer/index.ts
+++ b/src/apps/viewer/index.ts
@@ -15,6 +15,7 @@ import { PluginSpec } from '../../mol-plugin/spec';
import { DownloadStructure } from '../../mol-plugin-state/actions/structure';
import { PluginConfig } from '../../mol-plugin/config';
import { CellPack } from '../../extensions/cellpack';
+import { RCSBAssemblySymmetry, RCSBValidationReport } from '../../extensions/rcsb';
require('mol-plugin-ui/skin/light.scss');
function getParam(name: string, regex: string): string {
@@ -29,7 +30,9 @@ function init() {
actions: [...DefaultPluginSpec.actions],
behaviors: [
...DefaultPluginSpec.behaviors,
- PluginSpec.Behavior(CellPack)
+ PluginSpec.Behavior(CellPack),
+ PluginSpec.Behavior(RCSBAssemblySymmetry),
+ PluginSpec.Behavior(RCSBValidationReport),
],
animations: [...DefaultPluginSpec.animations || []],
customParamEditors: DefaultPluginSpec.customParamEditors,
diff --git a/src/extensions/rcsb/README.md b/src/extensions/rcsb/README.md
new file mode 100644
index 000000000..129aa33c6
--- /dev/null
+++ b/src/extensions/rcsb/README.md
@@ -0,0 +1,4 @@
+### Code generation
+**GraphQL schemas**
+
+ ./node_modules/.bin/graphql-codegen -c ./src/extensions/rcsb/graphql/codegen.yml
\ No newline at end of file
diff --git a/src/mol-plugin/behavior/dynamic/custom-props/rcsb/assembly-symmetry.ts b/src/extensions/rcsb/assembly-symmetry/behavior.ts
similarity index 91%
rename from src/mol-plugin/behavior/dynamic/custom-props/rcsb/assembly-symmetry.ts
rename to src/extensions/rcsb/assembly-symmetry/behavior.ts
index a091f4c3f..01c9f16c6 100644
--- a/src/mol-plugin/behavior/dynamic/custom-props/rcsb/assembly-symmetry.ts
+++ b/src/extensions/rcsb/assembly-symmetry/behavior.ts
@@ -4,18 +4,18 @@
* @author Alexander Rose <alexander.rose@weirdbyte.de>
*/
-import { ParamDefinition as PD } from '../../../../../mol-util/param-definition';
-import { AssemblySymmetryProvider, AssemblySymmetry, AssemblySymmetryDataProvider } from '../../../../../mol-model-props/rcsb/assembly-symmetry';
-import { PluginBehavior } from '../../../behavior';
-import { AssemblySymmetryParams, AssemblySymmetryRepresentation } from '../../../../../mol-model-props/rcsb/representations/assembly-symmetry';
-import { AssemblySymmetryClusterColorThemeProvider } from '../../../../../mol-model-props/rcsb/themes/assembly-symmetry-cluster';
-import { PluginStateTransform, PluginStateObject } from '../../../../../mol-plugin-state/objects';
-import { Task } from '../../../../../mol-task';
-import { PluginContext } from '../../../../context';
-import { StateTransformer, StateAction, StateObject, StateTransform, StateObjectRef } from '../../../../../mol-state';
-import { GenericRepresentationRef } from '../../../../../mol-plugin-state/manager/structure/hierarchy-state';
-import { AssemblySymmetryControls } from './ui/assembly-symmetry';
-import { StructureRepresentationPresetProvider, PresetStructureRepresentations } from '../../../../../mol-plugin-state/builder/structure/representation-preset';
+import { ParamDefinition as PD } from '../../../mol-util/param-definition';
+import { AssemblySymmetryProvider, AssemblySymmetry, AssemblySymmetryDataProvider } from './prop';
+import { PluginBehavior } from '../../../mol-plugin/behavior/behavior';
+import { AssemblySymmetryParams, AssemblySymmetryRepresentation } from './representation';
+import { AssemblySymmetryClusterColorThemeProvider } from './color';
+import { PluginStateTransform, PluginStateObject } from '../../../mol-plugin-state/objects';
+import { Task } from '../../../mol-task';
+import { PluginContext } from '../../../mol-plugin/context';
+import { StateTransformer, StateAction, StateObject, StateTransform, StateObjectRef } from '../../../mol-state';
+import { GenericRepresentationRef } from '../../../mol-plugin-state/manager/structure/hierarchy-state';
+import { AssemblySymmetryControls } from './ui';
+import { StructureRepresentationPresetProvider, PresetStructureRepresentations } from '../../../mol-plugin-state/builder/structure/representation-preset';
const Tag = AssemblySymmetry.Tag;
diff --git a/src/mol-model-props/rcsb/themes/assembly-symmetry-cluster.ts b/src/extensions/rcsb/assembly-symmetry/color.ts
similarity index 96%
rename from src/mol-model-props/rcsb/themes/assembly-symmetry-cluster.ts
rename to src/extensions/rcsb/assembly-symmetry/color.ts
index 99fb472c5..6eb67ba43 100644
--- a/src/mol-model-props/rcsb/themes/assembly-symmetry-cluster.ts
+++ b/src/extensions/rcsb/assembly-symmetry/color.ts
@@ -7,13 +7,13 @@
import { ThemeDataContext } from '../../../mol-theme/theme';
import { ColorTheme, LocationColor } from '../../../mol-theme/color';
import { ParamDefinition as PD } from '../../../mol-util/param-definition';
-import { AssemblySymmetryProvider, AssemblySymmetry } from '../assembly-symmetry';
+import { AssemblySymmetryProvider, AssemblySymmetry } from './prop';
import { Color } from '../../../mol-util/color';
import { Unit, StructureElement, StructureProperties } from '../../../mol-model/structure';
import { Location } from '../../../mol-model/location';
import { ScaleLegend, TableLegend } from '../../../mol-util/legend';
import { getPalette, getPaletteParams } from '../../../mol-util/color/palette';
-import { CustomProperty } from '../../common/custom-property';
+import { CustomProperty } from '../../../mol-model-props/common/custom-property';
const DefaultColor = Color(0xCCCCCC);
diff --git a/src/mol-model-props/rcsb/assembly-symmetry.ts b/src/extensions/rcsb/assembly-symmetry/prop.ts
similarity index 89%
rename from src/mol-model-props/rcsb/assembly-symmetry.ts
rename to src/extensions/rcsb/assembly-symmetry/prop.ts
index d6f985984..e4128ab3d 100644
--- a/src/mol-model-props/rcsb/assembly-symmetry.ts
+++ b/src/extensions/rcsb/assembly-symmetry/prop.ts
@@ -4,21 +4,21 @@
* @author Alexander Rose <alexander.rose@weirdbyte.de>
*/
-import { AssemblySymmetryQuery, AssemblySymmetryQueryVariables } from './graphql/types';
-import query from './graphql/symmetry.gql';
-
-import { ParamDefinition as PD } from '../../mol-util/param-definition';
-import { CustomPropertyDescriptor, Structure, Model, StructureSelection, QueryContext } from '../../mol-model/structure';
-import { Database as _Database, Column } from '../../mol-data/db';
-import { GraphQLClient } from '../../mol-util/graphql-client';
-import { CustomProperty } from '../common/custom-property';
-import { NonNullableArray } from '../../mol-util/type-helpers';
-import { CustomStructureProperty } from '../common/custom-structure-property';
-import { MmcifFormat } from '../../mol-model-formats/structure/mmcif';
-import { ReadonlyVec3 } from '../../mol-math/linear-algebra/3d/vec3';
-import { SetUtils } from '../../mol-util/set';
-import { MolScriptBuilder as MS } from '../../mol-script/language/builder';
-import { compile } from '../../mol-script/runtime/query/compiler';
+import { AssemblySymmetryQuery, AssemblySymmetryQueryVariables } from '../graphql/types';
+import query from '../graphql/symmetry.gql';
+
+import { ParamDefinition as PD } from '../../../mol-util/param-definition';
+import { CustomPropertyDescriptor, Structure, Model, StructureSelection, QueryContext } from '../../../mol-model/structure';
+import { Database as _Database, Column } from '../../../mol-data/db';
+import { GraphQLClient } from '../../../mol-util/graphql-client';
+import { CustomProperty } from '../../../mol-model-props/common/custom-property';
+import { NonNullableArray } from '../../../mol-util/type-helpers';
+import { CustomStructureProperty } from '../../../mol-model-props/common/custom-structure-property';
+import { MmcifFormat } from '../../../mol-model-formats/structure/mmcif';
+import { ReadonlyVec3 } from '../../../mol-math/linear-algebra/3d/vec3';
+import { SetUtils } from '../../../mol-util/set';
+import { MolScriptBuilder as MS } from '../../../mol-script/language/builder';
+import { compile } from '../../../mol-script/runtime/query/compiler';
const BiologicalAssemblyNames = new Set([
'author_and_software_defined_assembly',
diff --git a/src/mol-model-props/rcsb/representations/assembly-symmetry.ts b/src/extensions/rcsb/assembly-symmetry/representation.ts
similarity index 99%
rename from src/mol-model-props/rcsb/representations/assembly-symmetry.ts
rename to src/extensions/rcsb/assembly-symmetry/representation.ts
index 7c8f2632d..57011a613 100644
--- a/src/mol-model-props/rcsb/representations/assembly-symmetry.ts
+++ b/src/extensions/rcsb/assembly-symmetry/representation.ts
@@ -5,7 +5,7 @@
*/
import { ParamDefinition as PD } from '../../../mol-util/param-definition';
-import { AssemblySymmetryValue, AssemblySymmetryProvider, AssemblySymmetry } from '../assembly-symmetry';
+import { AssemblySymmetryValue, AssemblySymmetryProvider, AssemblySymmetry } from './prop';
import { MeshBuilder } from '../../../mol-geo/geometry/mesh/mesh-builder';
import { Vec3, Mat4, Mat3 } from '../../../mol-math/linear-algebra';
import { addCylinder } from '../../../mol-geo/geometry/mesh/builder/cylinder';
diff --git a/src/mol-plugin/behavior/dynamic/custom-props/rcsb/ui/assembly-symmetry.tsx b/src/extensions/rcsb/assembly-symmetry/ui.tsx
similarity index 87%
rename from src/mol-plugin/behavior/dynamic/custom-props/rcsb/ui/assembly-symmetry.tsx
rename to src/extensions/rcsb/assembly-symmetry/ui.tsx
index 8ae2f8b39..253c79296 100644
--- a/src/mol-plugin/behavior/dynamic/custom-props/rcsb/ui/assembly-symmetry.tsx
+++ b/src/extensions/rcsb/assembly-symmetry/ui.tsx
@@ -5,17 +5,17 @@
*/
import * as React from 'react';
-import { CollapsableState, CollapsableControls } from '../../../../../../mol-plugin-ui/base';
-import { ApplyActionControl } from '../../../../../../mol-plugin-ui/state/apply-action';
-import { InitAssemblySymmetry3D, AssemblySymmetry3D, AssemblySymmetryPreset, tryCreateAssemblySymmetry } from '../assembly-symmetry';
-import { AssemblySymmetryProvider, AssemblySymmetryProps, AssemblySymmetryDataProvider, AssemblySymmetry } from '../../../../../../mol-model-props/rcsb/assembly-symmetry';
-import { ParameterControls } from '../../../../../../mol-plugin-ui/controls/parameters';
-import { ParamDefinition as PD } from '../../../../../../mol-util/param-definition';
-import { StructureHierarchyManager } from '../../../../../../mol-plugin-state/manager/structure/hierarchy';
-import { StateAction, StateSelection } from '../../../../../../mol-state';
-import { PluginStateObject } from '../../../../../../mol-plugin-state/objects';
-import { PluginContext } from '../../../../../context';
-import { Task } from '../../../../../../mol-task';
+import { CollapsableState, CollapsableControls } from '../../../mol-plugin-ui/base';
+import { ApplyActionControl } from '../../../mol-plugin-ui/state/apply-action';
+import { InitAssemblySymmetry3D, AssemblySymmetry3D, AssemblySymmetryPreset, tryCreateAssemblySymmetry } from './behavior';
+import { AssemblySymmetryProvider, AssemblySymmetryProps, AssemblySymmetryDataProvider, AssemblySymmetry } from './prop';
+import { ParameterControls } from '../../../mol-plugin-ui/controls/parameters';
+import { ParamDefinition as PD } from '../../../mol-util/param-definition';
+import { StructureHierarchyManager } from '../../../mol-plugin-state/manager/structure/hierarchy';
+import { StateAction, StateSelection } from '../../../mol-state';
+import { PluginStateObject } from '../../../mol-plugin-state/objects';
+import { PluginContext } from '../../../mol-plugin/context';
+import { Task } from '../../../mol-task';
interface AssemblySymmetryControlState extends CollapsableState {
isBusy: boolean
diff --git a/data/rcsb-graphql/codegen.yml b/src/extensions/rcsb/graphql/codegen.yml
similarity index 66%
rename from data/rcsb-graphql/codegen.yml
rename to src/extensions/rcsb/graphql/codegen.yml
index d42a711fe..a6d7ebd17 100644
--- a/data/rcsb-graphql/codegen.yml
+++ b/src/extensions/rcsb/graphql/codegen.yml
@@ -1,7 +1,7 @@
schema: https://data.rcsb.org/graphql
-documents: './src/mol-model-props/rcsb/graphql/symmetry.gql.ts'
+documents: './src/extensions/rcsb/graphql/symmetry.gql.ts'
generates:
- './src/mol-model-props/rcsb/graphql/types.ts':
+ './src/extensions/rcsb/graphql/types.ts':
plugins:
- add: '/* eslint-disable */'
- time
diff --git a/src/mol-model-props/rcsb/graphql/symmetry.gql.ts b/src/extensions/rcsb/graphql/symmetry.gql.ts
similarity index 100%
rename from src/mol-model-props/rcsb/graphql/symmetry.gql.ts
rename to src/extensions/rcsb/graphql/symmetry.gql.ts
diff --git a/src/mol-model-props/rcsb/graphql/types.ts b/src/extensions/rcsb/graphql/types.ts
similarity index 99%
rename from src/mol-model-props/rcsb/graphql/types.ts
rename to src/extensions/rcsb/graphql/types.ts
index d62903be2..0a27dabcf 100644
--- a/src/mol-model-props/rcsb/graphql/types.ts
+++ b/src/extensions/rcsb/graphql/types.ts
@@ -1,7 +1,7 @@
/* eslint-disable */
export type Maybe<T> = T | null;
-// Generated in 2020-04-08T16:22:40-07:00
+// Generated in 2020-04-14T16:35:00-07:00
/** All built-in and custom scalars, mapped to their actual values */
export type Scalars = {
diff --git a/src/extensions/rcsb/index.ts b/src/extensions/rcsb/index.ts
new file mode 100644
index 000000000..4ec9ee805
--- /dev/null
+++ b/src/extensions/rcsb/index.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
+ */
+
+export { RCSBAssemblySymmetry } from './assembly-symmetry/behavior';
+export { RCSBValidationReport } from './validation-report/behavior';
\ No newline at end of file
diff --git a/src/mol-plugin/behavior/dynamic/custom-props/rcsb/validation-report.ts b/src/extensions/rcsb/validation-report/behavior.ts
similarity index 92%
rename from src/mol-plugin/behavior/dynamic/custom-props/rcsb/validation-report.ts
rename to src/extensions/rcsb/validation-report/behavior.ts
index 0ff1e55de..fed94bf7b 100644
--- a/src/mol-plugin/behavior/dynamic/custom-props/rcsb/validation-report.ts
+++ b/src/extensions/rcsb/validation-report/behavior.ts
@@ -4,23 +4,23 @@
* @author Alexander Rose <alexander.rose@weirdbyte.de>
*/
-import { ParamDefinition as PD } from '../../../../../mol-util/param-definition';
-import { PluginBehavior } from '../../../behavior';
-import { ValidationReport, ValidationReportProvider } from '../../../../../mol-model-props/rcsb/validation-report';
-import { RandomCoilIndexColorThemeProvider } from '../../../../../mol-model-props/rcsb/themes/random-coil-index';
-import { GeometryQualityColorThemeProvider } from '../../../../../mol-model-props/rcsb/themes/geometry-quality';
-import { Loci } from '../../../../../mol-model/loci';
-import { OrderedSet } from '../../../../../mol-data/int';
-import { ClashesRepresentationProvider } from '../../../../../mol-model-props/rcsb/representations/validation-report-clashes';
-import { DensityFitColorThemeProvider } from '../../../../../mol-model-props/rcsb/themes/density-fit';
-import { cantorPairing } from '../../../../../mol-data/util';
-import { DefaultQueryRuntimeTable } from '../../../../../mol-script/runtime/query/compiler';
-import { StructureSelectionQuery, StructureSelectionCategory } from '../../../../../mol-plugin-state/helpers/structure-selection-query';
-import { MolScriptBuilder as MS } from '../../../../../mol-script/language/builder';
-import { Task } from '../../../../../mol-task';
-import { StructureRepresentationPresetProvider, PresetStructureRepresentations } from '../../../../../mol-plugin-state/builder/structure/representation-preset';
-import { StateObjectRef } from '../../../../../mol-state';
-import { Model } from '../../../../../mol-model/structure';
+import { ParamDefinition as PD } from '../../../mol-util/param-definition';
+import { PluginBehavior } from '../../../mol-plugin/behavior/behavior';
+import { ValidationReport, ValidationReportProvider } from './prop';
+import { RandomCoilIndexColorThemeProvider } from './color/random-coil-index';
+import { GeometryQualityColorThemeProvider } from './color/geometry-quality';
+import { Loci } from '../../../mol-model/loci';
+import { OrderedSet } from '../../../mol-data/int';
+import { ClashesRepresentationProvider } from './representation';
+import { DensityFitColorThemeProvider } from './color/density-fit';
+import { cantorPairing } from '../../../mol-data/util';
+import { DefaultQueryRuntimeTable } from '../../../mol-script/runtime/query/compiler';
+import { StructureSelectionQuery, StructureSelectionCategory } from '../../../mol-plugin-state/helpers/structure-selection-query';
+import { MolScriptBuilder as MS } from '../../../mol-script/language/builder';
+import { Task } from '../../../mol-task';
+import { StructureRepresentationPresetProvider, PresetStructureRepresentations } from '../../../mol-plugin-state/builder/structure/representation-preset';
+import { StateObjectRef } from '../../../mol-state';
+import { Model } from '../../../mol-model/structure';
export const RCSBValidationReport = PluginBehavior.create<{ autoAttach: boolean, showTooltip: boolean }>({
name: 'rcsb-validation-report-prop',
diff --git a/src/mol-model-props/rcsb/themes/density-fit.ts b/src/extensions/rcsb/validation-report/color/density-fit.ts
similarity index 83%
rename from src/mol-model-props/rcsb/themes/density-fit.ts
rename to src/extensions/rcsb/validation-report/color/density-fit.ts
index eca9c533e..e9c6fdbb2 100644
--- a/src/mol-model-props/rcsb/themes/density-fit.ts
+++ b/src/extensions/rcsb/validation-report/color/density-fit.ts
@@ -4,14 +4,14 @@
* @author Alexander Rose <alexander.rose@weirdbyte.de>
*/
-import { ThemeDataContext } from '../../../mol-theme/theme';
-import { ColorTheme, LocationColor } from '../../../mol-theme/color';
-import { ParamDefinition as PD } from '../../../mol-util/param-definition';
-import { Color, ColorScale } from '../../../mol-util/color';
-import { StructureElement, Model } from '../../../mol-model/structure';
-import { Location } from '../../../mol-model/location';
-import { CustomProperty } from '../../common/custom-property';
-import { ValidationReportProvider, ValidationReport } from '../validation-report';
+import { ThemeDataContext } from '../../../../mol-theme/theme';
+import { ColorTheme, LocationColor } from '../../../../mol-theme/color';
+import { ParamDefinition as PD } from '../../../../mol-util/param-definition';
+import { Color, ColorScale } from '../../../../mol-util/color';
+import { StructureElement, Model } from '../../../../mol-model/structure';
+import { Location } from '../../../../mol-model/location';
+import { CustomProperty } from '../../../../mol-model-props/common/custom-property';
+import { ValidationReportProvider, ValidationReport } from '../prop';
const DefaultColor = Color(0xCCCCCC);
diff --git a/src/mol-model-props/rcsb/themes/geometry-quality.ts b/src/extensions/rcsb/validation-report/color/geometry-quality.ts
similarity index 85%
rename from src/mol-model-props/rcsb/themes/geometry-quality.ts
rename to src/extensions/rcsb/validation-report/color/geometry-quality.ts
index 685291259..a6dc480d1 100644
--- a/src/mol-model-props/rcsb/themes/geometry-quality.ts
+++ b/src/extensions/rcsb/validation-report/color/geometry-quality.ts
@@ -4,17 +4,17 @@
* @author Alexander Rose <alexander.rose@weirdbyte.de>
*/
-import { ThemeDataContext } from '../../../mol-theme/theme';
-import { ColorTheme, LocationColor } from '../../../mol-theme/color';
-import { ParamDefinition as PD } from '../../../mol-util/param-definition';
-import { Color } from '../../../mol-util/color';
-import { StructureElement } from '../../../mol-model/structure';
-import { Location } from '../../../mol-model/location';
-import { CustomProperty } from '../../common/custom-property';
-import { ValidationReportProvider, ValidationReport } from '../validation-report';
-import { TableLegend } from '../../../mol-util/legend';
-import { PolymerType } from '../../../mol-model/structure/model/types';
-import { SetUtils } from '../../../mol-util/set';
+import { ThemeDataContext } from '../../../../mol-theme/theme';
+import { ColorTheme, LocationColor } from '../../../../mol-theme/color';
+import { ParamDefinition as PD } from '../../../../mol-util/param-definition';
+import { Color } from '../../../../mol-util/color';
+import { StructureElement } from '../../../../mol-model/structure';
+import { Location } from '../../../../mol-model/location';
+import { CustomProperty } from '../../../../mol-model-props/common/custom-property';
+import { ValidationReportProvider, ValidationReport } from '../prop';
+import { TableLegend } from '../../../../mol-util/legend';
+import { PolymerType } from '../../../../mol-model/structure/model/types';
+import { SetUtils } from '../../../../mol-util/set';
const DefaultColor = Color(0x909090);
diff --git a/src/mol-model-props/rcsb/themes/random-coil-index.ts b/src/extensions/rcsb/validation-report/color/random-coil-index.ts
similarity index 80%
rename from src/mol-model-props/rcsb/themes/random-coil-index.ts
rename to src/extensions/rcsb/validation-report/color/random-coil-index.ts
index 1a1e42fae..f92cbc9f9 100644
--- a/src/mol-model-props/rcsb/themes/random-coil-index.ts
+++ b/src/extensions/rcsb/validation-report/color/random-coil-index.ts
@@ -4,14 +4,14 @@
* @author Alexander Rose <alexander.rose@weirdbyte.de>
*/
-import { ThemeDataContext } from '../../../mol-theme/theme';
-import { ColorTheme, LocationColor } from '../../../mol-theme/color';
-import { ParamDefinition as PD } from '../../../mol-util/param-definition';
-import { Color, ColorScale } from '../../../mol-util/color';
-import { StructureElement, Model } from '../../../mol-model/structure';
-import { Location } from '../../../mol-model/location';
-import { CustomProperty } from '../../common/custom-property';
-import { ValidationReportProvider, ValidationReport } from '../validation-report';
+import { ThemeDataContext } from '../../../../mol-theme/theme';
+import { ColorTheme, LocationColor } from '../../../../mol-theme/color';
+import { ParamDefinition as PD } from '../../../../mol-util/param-definition';
+import { Color, ColorScale } from '../../../../mol-util/color';
+import { StructureElement, Model } from '../../../../mol-model/structure';
+import { Location } from '../../../../mol-model/location';
+import { CustomProperty } from '../../../../mol-model-props/common/custom-property';
+import { ValidationReportProvider, ValidationReport } from '../prop';
const DefaultColor = Color(0xCCCCCC);
diff --git a/src/mol-model-props/rcsb/validation-report.ts b/src/extensions/rcsb/validation-report/prop.ts
similarity index 94%
rename from src/mol-model-props/rcsb/validation-report.ts
rename to src/extensions/rcsb/validation-report/prop.ts
index f5a28d382..c57125afc 100644
--- a/src/mol-model-props/rcsb/validation-report.ts
+++ b/src/extensions/rcsb/validation-report/prop.ts
@@ -4,24 +4,24 @@
* @author Alexander Rose <alexander.rose@weirdbyte.de>
*/
-import { ParamDefinition as PD } from '../../mol-util/param-definition';
-import { CustomPropertyDescriptor, Structure, Unit } from '../../mol-model/structure';
-import { CustomProperty } from '../common/custom-property';
-import { CustomModelProperty } from '../common/custom-model-property';
-import { Model, ElementIndex, ResidueIndex } from '../../mol-model/structure/model';
-import { IntAdjacencyGraph } from '../../mol-math/graph';
-import { readFromFile } from '../../mol-util/data-source';
-import { CustomStructureProperty } from '../common/custom-structure-property';
-import { InterUnitGraph } from '../../mol-math/graph/inter-unit-graph';
-import { UnitIndex } from '../../mol-model/structure/structure/element/element';
-import { IntMap, SortedArray } from '../../mol-data/int';
-import { arrayMax } from '../../mol-util/array';
-import { equalEps } from '../../mol-math/linear-algebra/3d/common';
-import { Vec3 } from '../../mol-math/linear-algebra';
-import { MmcifFormat } from '../../mol-model-formats/structure/mmcif';
-import { QuerySymbolRuntime } from '../../mol-script/runtime/query/compiler';
-import { CustomPropSymbol } from '../../mol-script/language/symbol';
-import Type from '../../mol-script/language/type';
+import { ParamDefinition as PD } from '../../../mol-util/param-definition';
+import { CustomPropertyDescriptor, Structure, Unit } from '../../../mol-model/structure';
+import { CustomProperty } from '../../../mol-model-props/common/custom-property';
+import { CustomModelProperty } from '../../../mol-model-props/common/custom-model-property';
+import { Model, ElementIndex, ResidueIndex } from '../../../mol-model/structure/model';
+import { IntAdjacencyGraph } from '../../../mol-math/graph';
+import { readFromFile } from '../../../mol-util/data-source';
+import { CustomStructureProperty } from '../../../mol-model-props/common/custom-structure-property';
+import { InterUnitGraph } from '../../../mol-math/graph/inter-unit-graph';
+import { UnitIndex } from '../../../mol-model/structure/structure/element/element';
+import { IntMap, SortedArray } from '../../../mol-data/int';
+import { arrayMax } from '../../../mol-util/array';
+import { equalEps } from '../../../mol-math/linear-algebra/3d/common';
+import { Vec3 } from '../../../mol-math/linear-algebra';
+import { MmcifFormat } from '../../../mol-model-formats/structure/mmcif';
+import { QuerySymbolRuntime } from '../../../mol-script/runtime/query/compiler';
+import { CustomPropSymbol } from '../../../mol-script/language/symbol';
+import Type from '../../../mol-script/language/type';
export { ValidationReport };
diff --git a/src/mol-model-props/rcsb/representations/validation-report-clashes.ts b/src/extensions/rcsb/validation-report/representation.ts
similarity index 99%
rename from src/mol-model-props/rcsb/representations/validation-report-clashes.ts
rename to src/extensions/rcsb/validation-report/representation.ts
index 9f93c3ab7..65357cc3b 100644
--- a/src/mol-model-props/rcsb/representations/validation-report-clashes.ts
+++ b/src/extensions/rcsb/validation-report/representation.ts
@@ -19,8 +19,8 @@ import { createLinkCylinderMesh, LinkCylinderParams, LinkCylinderStyle } from '.
import { UnitsMeshParams, UnitsVisual, UnitsMeshVisual, StructureGroup } from '../../../mol-repr/structure/units-visual';
import { VisualUpdateState } from '../../../mol-repr/util';
import { LocationIterator } from '../../../mol-geo/util/location-iterator';
-import { ClashesProvider, IntraUnitClashes, InterUnitClashes, ValidationReport } from '../validation-report';
-import { CustomProperty } from '../../common/custom-property';
+import { ClashesProvider, IntraUnitClashes, InterUnitClashes, ValidationReport } from './prop';
+import { CustomProperty } from '../../../mol-model-props/common/custom-property';
import { ComplexMeshParams, ComplexVisual, ComplexMeshVisual } from '../../../mol-repr/structure/complex-visual';
import { Color } from '../../../mol-util/color';
import { MarkerActions } from '../../../mol-util/marker-action';
diff --git a/src/mol-model-props/index.ts b/src/mol-model-props/index.ts
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/mol-plugin/behavior/dynamic/custom-props.ts b/src/mol-plugin/behavior/dynamic/custom-props.ts
index 027908349..8248530a2 100644
--- a/src/mol-plugin/behavior/dynamic/custom-props.ts
+++ b/src/mol-plugin/behavior/dynamic/custom-props.ts
@@ -12,6 +12,4 @@ export { ValenceModel } from './custom-props/computed/valence-model';
export { CrossLinkRestraint } from './custom-props/integrative/cross-link-restraint';
-export { PDBeStructureQualityReport } from './custom-props/pdbe/structure-quality-report';
-export { RCSBAssemblySymmetry } from './custom-props/rcsb/assembly-symmetry';
-export { RCSBValidationReport } from './custom-props/rcsb/validation-report';
\ No newline at end of file
+export { PDBeStructureQualityReport } from './custom-props/pdbe/structure-quality-report';
\ No newline at end of file
diff --git a/src/mol-plugin/index.ts b/src/mol-plugin/index.ts
index 2d5389954..81d13c721 100644
--- a/src/mol-plugin/index.ts
+++ b/src/mol-plugin/index.ts
@@ -76,8 +76,6 @@ export const DefaultPluginSpec: PluginSpec = {
PluginSpec.Behavior(PluginBehaviors.CustomProps.CrossLinkRestraint),
PluginSpec.Behavior(PluginBehaviors.CustomProps.PDBeStructureQualityReport),
- PluginSpec.Behavior(PluginBehaviors.CustomProps.RCSBAssemblySymmetry),
- PluginSpec.Behavior(PluginBehaviors.CustomProps.RCSBValidationReport),
],
customParamEditors: [
[CreateVolumeStreamingBehavior, VolumeStreamingCustomControls]
--
GitLab