@abi-software/scaffoldvuer 0.1.52-beta.1 → 0.1.52-beta.2

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "0.1.52-beta.0",
+  "version": "0.1.52-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -18732,9 +18732,9 @@
       "integrity": "sha512-OSPPKcGvFSiGkG3jFrwwC76PBV/ZSrGxpBbg28bW8s9GU8r/y2spNGtEXHEb/CVqo0Ctf5Lx2rVaxQZB6OasaA=="
     },
     "three-spritetext": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/three-spritetext/-/three-spritetext-1.6.3.tgz",
-      "integrity": "sha512-AE9AzUvY3xpQryTy+H5ylYkaWs+ZgsPqbF7yGXPEjthX5n/coIxobSVZAcPCTyl77DnM0Ub/YH7gLI54Eyg+dQ=="
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/three-spritetext/-/three-spritetext-1.6.4.tgz",
+      "integrity": "sha512-KngnmDnpRe5UdnhD1N+5GrhGC9aibs5/5nnBWFH23FDSYdLIk8NUwZFtEJpXXYKjUp/jjAw4dz0vRKroz8cILg=="
     },
     "throttle-debounce": {
       "version": "1.1.0",
@@ -21436,9 +21436,9 @@
       }
     },
     "zincjs": {
-      "version": "0.50.0-beta.0",
-      "resolved": "https://registry.npmjs.org/zincjs/-/zincjs-0.50.0-beta.0.tgz",
-      "integrity": "sha512-0FuYExwy/ri+BexLQHk9EprG3El6FY0ruPBfrcCAgzYImJwTtXERVqlhEzwzxOPIdqvaEgzlVwun/2uE4pAhDA==",
+      "version": "0.50.0-beta-1",
+      "resolved": "https://registry.npmjs.org/zincjs/-/zincjs-0.50.0-beta-1.tgz",
+      "integrity": "sha512-43ilhXvbPp/2dKTh5dJsYr7FvPv+0f2pzG/zpqq/kXGZj7KWYpKsj3hpWAaQq3nl140uaQshwMGy1CTln6SlLQ==",
       "requires": {
         "css-element-queries": "^1.2.2",
         "lodash": "^4.17.19",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "0.1.52-beta.1",
+  "version": "0.1.52-beta.2",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "vue": "^2.6.10",
     "vue-drag-resize": "^1.3.2",
     "vue-router": "^3.5.1",
-    "zincjs": "^0.50.0-beta.0"
+    "zincjs": "^0.50.0-beta.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.0.0",

package/src/App.vue

@@ -111,13 +111,37 @@
         <el-row :gutter="30">
           <el-col
             :span="7"
-            :offset="11"
+            :offset="2"
           >
             <el-switch
               v-model="syncMode"
               active-text="Sync Mode"
               active-color="#8300bf"
             />
+            <el-row v-if="syncMode">
+              <el-input-number
+                v-model="zoom"
+                :min="1.0"
+                :controls="false"
+                placeholder="Please input"
+                label="zoom"
+              />
+              <el-input-number
+                v-model="pos[0]"
+                :min="-1.0"
+                :max="1.0"
+                :controls="false"
+                placeholder="Please input"
+                label="x"
+              />
+              <el-input-number
+                v-model="pos[1]"
+                :min="-1.0"
+                :max="1.0"
+                :controls="false"
+                label="y"
+              />
+            </el-row>
           </el-col>
         </el-row>
         <el-row :gutter="30">
@@ -203,7 +227,7 @@
 import { ScaffoldVuer } from "./components/index.js";
 import ModelsTable from "./components/ModelsTable.vue";
 import Vue from "vue";
-import { Button, Col, Icon, Input, Popover, Row, Switch } from "element-ui";
+import { Button, Col, Icon, Input, InputNumber, Popover, Row, Switch } from "element-ui";
 import lang from "element-ui/lib/locale/lang/en";
 import locale from "element-ui/lib/locale";
 
@@ -212,6 +236,7 @@ Vue.use(Button);
 Vue.use(Col);
 Vue.use(Icon);
 Vue.use(Input);
+Vue.use(InputNumber);
 Vue.use(Popover);
 Vue.use(Row);
 Vue.use(Switch);
@@ -269,7 +294,9 @@ export default {
       region: "",
       viewURL: "",
       renderInfoOn: false,
-      rendererInfo: undefined
+      rendererInfo: undefined,
+      zoom: 1,
+      pos: [0, 0],
     };
   },
   watch: {
@@ -353,7 +380,10 @@ export default {
       }
     },
     onNavigated: function(data) {
-      console.log(data);
+      console.log(data)
+      this.zoom = data.zoom;
+      this.pos[0] = data.target[0];
+      this.pos[1] = data.target[1];
     },
     parseInput: function() {
       if (this.$route.query.url !== this.input)

package/src/components/ScaffoldVuer.vue

@@ -665,7 +665,11 @@ export default {
         let objects = this.$module.scene.findObjectsWithGroupName(name);
         let box = this.$module.scene.getBoundingBoxOfZincObjects(objects);
         if (box) {
-          this.$module.scene.viewAllWithBoundingBox(box);
+          if (this.$module.isSyncControl()) {
+            this.$module.setSyncControlZoomToBox(box);
+          } else {
+            this.$module.scene.viewAllWithBoundingBox(box);
+          }
         }
       }
     },

package/src/scripts/organsRenderer.js

@@ -90,7 +90,18 @@ const OrgansSceneData = function() {
       cameraControl.resetView();
       this.NDCCameraControl = cameraControl.enableSyncControl();
     } else {
-      this.NDCCameraControl = cameraControl.disableSyncControl();
+      cameraControl.disableSyncControl();
+      this.NDCCameraControl = undefined;
+    }
+  }
+
+  this.isSyncControl = () => {
+    return this.NDCCameraControl !== undefined;
+  }
+
+  this.setSyncControlZoomToBox = (box) => {
+    if (this.NDCCameraControl) {
+      this.NDCCameraControl.zoomToBox(box, 2);
     }
   }