@abi-software/scaffoldvuer 1.3.0-beta.0 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "1.3.0-beta.0",
+  "version": "1.3.1",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -41,7 +41,7 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/map-utilities": "^0.0.0-beta.4",
+    "@abi-software/map-utilities": "^1.0.0",
     "@abi-software/sparc-annotation": "^0.3.1",
     "@abi-software/svg-sprite": "^1.0.0",
     "@element-plus/icons-vue": "^2.3.1",
@@ -55,7 +55,7 @@
     "vue": "^3.4.15",
     "vue-router": "^4.2.5",
     "vue3-component-svg-sprite": "^0.0.1",
-    "zincjs": "^1.8.5"
+    "zincjs": "^1.10.0"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.6.2",

package/src/App.vue

@@ -27,11 +27,12 @@
         :view-u-r-l="viewURL"
         :format="format"
         :marker-labels="markerLabels"
-        :enableLocalAnnotations="true"
+        :enableLocalAnnotations="false"
         @open-map="openMap"
         @on-ready="onReady"
         @scaffold-selected="onSelected"
         @scaffold-navigated="onNavigated"
+        @user-primitives-updated="userPrimitivesUpdated"
         @timeChanged="updateCurrentTime"
         @zinc-object-added="objectAdded"
         @vue:mounted="viewerMounted"
@@ -358,7 +359,7 @@ export default {
   data: function () {
     return {
       consoleOn: true,
-      createLinesWithNormal: true,
+      createLinesWithNormal: false,
       url: undefined,
       input: undefined,
       displayUI: true,
@@ -572,6 +573,9 @@ export default {
     viewModelClicked: function (location) {
       this.input = location;
     },
+    userPrimitivesUpdated: function (event) {
+      console.log(event);
+    },
     screenCapture: function () {
       this.$refs.scaffold.captureScreenshot("capture.png");
     },
@@ -671,6 +675,7 @@ export default {
         //this.$refs.scaffold.showRegionTooltipWithAnnotations(data, false, true);
         if (this.onClickMarkers) this.$refs.scaffold.setMarkerModeForObjectsWithName(data[0].data.group, "on");
       }
+      if (this.consoleOn) console.log(data);
     },
 
     onNavigated: function (data) {

package/src/components/LinesControls.vue

@@ -28,24 +28,26 @@
         </el-col>
       </el-row>
       <template v-if="currentIndex > -1 && distance > 0">
-        <el-col :offset="0" :span="4">
-          <el-button
-            size='small'
-            :disabled="currentIndex === 0"
-            :icon="ElIconArrowLeft"
-            @click="changeIndex(false)"
-          />
-        </el-col>
-        <el-col :offset="4" :span="9">
-          Editing Line {{ currentIndex + 1}}
-        </el-col>
-        <el-col :offset="2" :span="2">
-          <el-button
-            size='small'
-            :icon="ElIconArrowRight"
-            @click="changeIndex(true)"
-          />
-        </el-col>
+        <el-row>
+          <el-col :offset="0" :span="4">
+            <el-button
+              size='small'
+              :disabled="currentIndex === 0"
+              :icon="ElIconArrowLeft"
+              @click="changeIndex(false)"
+            />
+          </el-col>
+          <el-col :offset="4" :span="9">
+            Editing Line {{ currentIndex + 1}}
+          </el-col>
+          <el-col :offset="2" :span="2">
+            <el-button
+              size='small'
+              :icon="ElIconArrowRight"
+              @click="changeIndex(true)"
+            />
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :offset="0" :span="6">
             Move:
@@ -137,6 +139,7 @@ export default {
       adjust: 0,
       pAdjust: 0,
       lengthScale: 0,
+      distance: 0,
       newDistance: 0, 
       width: 1,
       currentIndex: 0,

package/src/components/PointsControls.vue

@@ -134,6 +134,7 @@ import {
   ElContainer as Container,
   ElInputNumber as InputNumber,
   ElMain as Main,
+  ElRow as Row,
   ElSelect as Select,
   ElSlider as Slider,
   ElOption as Option,
@@ -155,6 +156,7 @@ export default {
     Main,
     Select,
     Slider,
+    Row,
     Option,
     ElIconArrowLeft,
     ElIconArrowRight,

package/src/components/ScaffoldVuer.vue

@@ -1057,7 +1057,7 @@ export default {
      * Add and edit local annotations
      */
     addAndEditAnnotations: function (region, group, zincObject, comment) {
-      const annotation =addUserAnnotationWithFeature(this.annotator, this.userToken, zincObject,
+      const annotation = addUserAnnotationWithFeature(this.annotator, this.userToken, zincObject,
         region, group, this.url, comment);
       if (this.enableLocalAnnotations) {
         annotation.group = group;
@@ -1070,6 +1070,7 @@ export default {
         this.removeFromLocalAnnotationList(regionPath, group);
         this.localAnnotationsList.push(annotation);
       }
+      this.$emit('userPrimitivesUpdated', {region, group, zincObject});
     },
     /**
      * @vuese
@@ -1082,7 +1083,6 @@ export default {
         const region = object.region.getFullPath();
         this.addAndEditAnnotations(region, group, object, "Position Updated");
       }
-
     },
     /**
      * @vuese

package/src/scripts/OrgansRenderer.js

@@ -245,7 +245,8 @@ const OrgansSceneData = function() {
 					intersected ? intersected.point.y : 0,
 					intersected ? intersected.point.z : 0,
 				],
-				intersected,
+				intersected: intersected,
+				intersects: intersects,
 			};
       const coords = { x: window_x, y: window_y };
       if (idObject.id) {

package/src/scripts/RendererModule.js

@@ -37,6 +37,7 @@ const RendererModule = function()  {
   this.selectedScreenCoordinates = new THREE.Vector3();
   this.selectedCenter = undefined;
   this.liveUpdatesObjects = undefined;
+  this.ignorePreviousSelected = false;
 }
 
 RendererModule.prototype = Object.create(BaseModule.prototype);
@@ -88,6 +89,9 @@ RendererModule.prototype.getAnnotationsFromObjects = function(objects) {
           annotation.data.id = objects[i].name;
         }
       }
+      if (annotation) {
+        annotation.data.zincObject = zincObject;
+      }
     }
     if (annotation)
       annotations.push(annotation);
@@ -174,7 +178,7 @@ RendererModule.prototype.setSelectedByObjects = function(
   } else {
     changed = true;
   }
-  if (changed) {
+  if (changed || this.ignorePreviousSelected) {
     const zincObjects = this.objectsToZincObjects(objects);
     if (this.selectObjectOnPick) {
       this.setupLiveCoordinates(zincObjects);