Переглянути джерело

Merge branch 'master' into dev-yv-alignment

Yana Rose 4 роки тому
батько
коміт
b459c07f48
4 змінених файлів з 440 додано та 817 видалено
  1. 413 802
      package-lock.json
  2. 12 12
      package.json
  3. 5 3
      src/viewer/helpers/preset.ts
  4. 10 0
      src/viewer/index.html

Різницю між файлами не показано, бо вона завелика
+ 413 - 802
package-lock.json


+ 12 - 12
package.json

@@ -1,6 +1,6 @@
 {
     "name": "rcsb-molstar",
-    "version": "1.0.2",
+    "version": "1.0.5",
     "description": "RCSB PDB apps and props based on Mol*.",
     "homepage": "https://github.com/rcsb/rcsb-molstar#readme",
     "repository": {
@@ -36,28 +36,28 @@
     "author": "RCSB PDB and Mol* Contributors",
     "license": "MIT",
     "devDependencies": {
-        "@types/react": "^16.9.43",
+        "@types/react": "^16.9.49",
         "@types/react-dom": "^16.9.8",
-        "@typescript-eslint/eslint-plugin": "^3.7.0",
-        "@typescript-eslint/parser": "^3.7.0",
-        "concurrently": "^5.2.0",
+        "@typescript-eslint/eslint-plugin": "^3.10.1",
+        "@typescript-eslint/parser": "^3.10.1",
+        "concurrently": "^5.3.0",
         "cpx2": "^2.0.0",
         "css-loader": "^3.6.0",
-        "eslint": "^7.5.0",
+        "eslint": "^7.8.1",
         "extra-watch-webpack-plugin": "^1.0.3",
-        "file-loader": "^6.0.0",
+        "file-loader": "^6.1.0",
         "mini-css-extract-plugin": "^0.9.0",
-        "molstar": "^1.1.7",
+        "molstar": "^1.1.23",
         "node-sass": "^4.14.1",
         "raw-loader": "^4.0.1",
         "react": "^16.13.1",
         "react-dom": "^16.13.1",
-        "rxjs": "^6.6.0",
+        "rxjs": "^6.6.3",
         "sass-loader": "^8.0.2",
         "style-loader": "^1.2.1",
-        "tslib": "^2.0.0",
-        "typescript": "3.9.7",
-        "webpack": "^4.43.0",
+        "tslib": "^2.0.1",
+        "typescript": "4.0.2",
+        "webpack": "^4.44.1",
         "webpack-cli": "^3.3.12"
     },
     "dependencies": {}

+ 5 - 3
src/viewer/helpers/preset.ts

@@ -192,9 +192,11 @@ export const RcsbPreset = TrajectoryHierarchyPresetProvider({
 
         if (p.kind === 'feature' && structure.obj) {
             const loci = targetToLoci(p.target, structure.obj.data)
-            const firstResidue = StructureElement.Loci.firstResidue(loci)
-            plugin.managers.structure.focus.setFromLoci(firstResidue)
-            plugin.managers.camera.focusLoci(firstResidue)
+            // if target is only defined by chain: then don't force first residue
+            const chainMode = p.target.label_asym_id && !p.target.auth_seq_id && !p.target.label_seq_id && !p.target.label_comp_id;
+            const target = chainMode ? loci : StructureElement.Loci.firstResidue(loci)
+            plugin.managers.structure.focus.setFromLoci(target)
+            plugin.managers.camera.focusLoci(target)
         }
 
         if (p.kind === 'density' && structure.cell?.parent) {

+ 10 - 0
src/viewer/index.html

@@ -268,6 +268,16 @@
                 {
                     id: '1GRM',
                     info: 'REFINEMENT OF THE SPATIAL STRUCTURE OF THE GRAMICIDIN A TRANSMEMBRANE ION-CHANNEL. Single-starnded helix from beta-sheet. NMR structure.'
+                },
+                {
+                    id: '1B5F',
+                    info: 'oligosaccharide: NATIVE CARDOSIN A FROM CYNARA CARDUNCULUS L.',
+                    props: {
+                        kind: 'feature',
+                        target: {
+                            label_asym_id: 'E'
+                        }
+                    }
                 }
             ];
 

Деякі файли не було показано, через те що забагато файлів було змінено