@abi-software/scaffoldvuer 1.13.1-beta.13 → 1.13.1-beta.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "1.13.1-beta.13",
+  "version": "1.13.1-beta.15",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -41,7 +41,7 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/map-utilities": "^1.7.8-beta.2",
+    "@abi-software/map-utilities": "1.7.8-beta.3",
     "@abi-software/sparc-annotation": "^0.3.2",
     "@abi-software/svg-sprite": "1.0.3",
     "@element-plus/icons-vue": "^2.3.1",
@@ -53,7 +53,7 @@
     "unplugin-vue-components": "^0.26.0",
     "vue": "^3.4.21",
     "vue-router": "^4.2.5",
-    "zincjs": "^1.16.9"
+    "zincjs": "^1.16.10"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.28.0",

package/src/components/ScaffoldTooltip.vue

@@ -32,28 +32,6 @@
           :annotationEntry="annotationEntry"
           @annotation="$emit('confirm-comment', $event)"
         />
-        <div v-if="createData.toBeDeleted" class="delete-container">
-          <el-row>
-            <el-col :span="10">Delete this feature?</el-col>
-            <el-col :span="7">
-              <el-button
-                class="delete-button"
-                :icon="ElIconDelete"
-                @click="$emit('confirm-delete')"
-                >
-                  Delete
-              </el-button>
-            </el-col>
-            <el-col :span="6">
-              <el-button
-                class="delete-button"
-                @click="$emit('cancel-create')"
-                >
-                  Dismiss
-              </el-button>
-            </el-col>
-          </el-row>
-        </div>
       </template>
     </el-popover>
   </div>
@@ -68,9 +46,6 @@ import {
   ElPopover as Popover,
   ElRow as Row,
 } from "element-plus";
-import {
-  Delete as ElIconDelete,
-} from '@element-plus/icons-vue'
 import { mapState } from 'pinia';
 import { useMainStore } from "@/store/index";
 import { CreateTooltipContent, Tooltip } from '@abi-software/map-utilities'
@@ -84,7 +59,6 @@ export default {
   components: {
     Col,
     CreateTooltipContent,
-    ElIconDelete,
     Icon,
     Popover,
     Row,
@@ -143,8 +117,7 @@ export default {
   data: function () {
     return {
       display: false,
-      annotationEntry: [],
-      ElIconDelete: shallowRef(ElIconDelete),
+      annotationEntry: []
     };
   },
   computed: {
@@ -254,23 +227,5 @@ export default {
       display:none;
     }
   }
-
-  .delete-container {
-    margin-top: 12px;
-    margin-bottom: 12px;
-    font-size: 14px;
-    .delete-button {
-      pointer-events: auto;
-      cursor: pointer;
-      margin-left:8px;
-      padding-left: 8px;
-      padding-right: 8px;
-      height: 24px !important;
-      color: $app-primary-color;
-      &:hover {
-        background-color: var(--el-color-primary-light-9);
-      }
-    }
-  }
 }
 </style>

package/src/components/ScaffoldVuer.vue

@@ -1457,6 +1457,9 @@ export default {
           this.renameAnnotations(payload.region, payload.group,
             this._editingZincObject, oldGroupName);
         }
+        else if (payload.deleting) {
+          this.confirmDelete();
+        }
         if (object) {
           this.addAndEditAnnotations(payload.region, payload.group, object.zincObject, "Create");
           object.zincObject.isEditable = true;
@@ -1535,6 +1538,12 @@ export default {
             this.offlineAnnotations = this.offlineAnnotations.filter(offline => offline.item.id !== annotation.item.id);
             sessionStorage.setItem('anonymous-annotation', JSON.stringify(this.offlineAnnotations));
           }
+          this.$emit('userPrimitivesUpdated', {
+            region,
+            group,
+            zincObject: this._editingZincObject,
+            deleted: true
+          });
         }
       }
       this.cancelCreate();
@@ -1840,6 +1849,21 @@ export default {
         setTimeout(this.stopFreeSpin, 4000);
       }
     },
+    activateDeleteMode: function(eventIdentifiers) {
+      const zincObject = getDeletableObjects(eventIdentifiers);
+      if (zincObject) {
+        this._editingZincObject = zincObject;
+        this.createData.faceIndex = -1;
+        this.createData.editingIndex = -1;
+        this.createData.renaming = false;
+        this.createData.tempGroupName = this._editingZincObject.groupName;
+        this.createData.regionPrefix =  this._editingZincObject.region.getFullPath();
+        this.createData.toBeConfirmed = true;
+        this.createData.toBeDeleted = true;
+        this.tData.x = 50;
+        this.tData.y = 200;
+      }
+    },
     activateEditingMode: function(eventIdentifiers) {
       let editing = getEditablePoint(eventIdentifiers);
       if (editing) {
@@ -1866,6 +1890,7 @@ export default {
         this.createData.tempGroupName = this._editingZincObject.groupName;
         this.createData.regionPrefix =  this._editingZincObject.region.getFullPath();
         this.createData.toBeConfirmed = true;
+        this.createData.toBeDeleted = false;
         this.showRegionTooltipWithAnnotations(eventIdentifiers, false, false);
         this.tData.x = 50;
         this.tData.y = 200;
@@ -1886,11 +1911,7 @@ export default {
           if (this.activeDrawMode === "Edit") {
             this.activateEditingMode(event.identifiers);
           } else if (this.activeDrawMode === "Delete") {
-            const zincObject = getDeletableObjects(event);
-            if (zincObject) {
-              this.createData.toBeDeleted = true;
-              this._editingZincObject = zincObject;
-            }
+            this.activateDeleteMode(event.identifiers);
           }
           if (this.activeDrawMode !== "Point" && this.activeDrawMode !== "LineString") {
             this.showRegionTooltipWithAnnotations(event.identifiers, true, false);
@@ -1906,6 +1927,7 @@ export default {
       this._editingZincObject = zincObject;
       this.createData.faceIndex = -1;
       this.createData.renaming = false;
+      this.createData.toBeDeleted = false;
       this.createData.editingIndex = index;
       this.createData.regionPrefix =  this._editingZincObject.region.getFullPath();
       this.createData.tempGroupName = this._editingZincObject.groupName;
@@ -1915,6 +1937,7 @@ export default {
       this._editingZincObject = zincObject;
       this.createData.faceIndex = faceIndex;
       this.createData.renaming = false;
+      this.createData.toBeDeleted = false;
       this.createData.editingIndex = vertexIndex;
       this.createData.regionPrefix =  this._editingZincObject.region.getFullPath();
       this.createData.tempGroupName = this._editingZincObject.groupName;

package/src/components/TextureSlidesControls.vue

@@ -1,6 +1,13 @@
 <template>
   <el-container class="t-slides-container">
     <el-main class="slides-block">
+      <el-row class="slide-row">
+      <el-checkbox
+          v-model="discardAlpha"
+        >
+          Discard Translucent Pixel
+        </el-checkbox>
+      </el-row>
       <el-row class="slide-row">
         <el-col :offset="0" :span="8">
           Brightness
@@ -120,6 +127,7 @@ import {
   Plus as ElIconPlus,
 } from '@element-plus/icons-vue'
 import {
+  ElCheckbox as Checkbox,
   ElCol as Col,
   ElContainer as Container,
   ElDivider as Divider,
@@ -140,6 +148,7 @@ import { markRaw } from 'vue';
 export default {
   name: "TextureSlidesControls",
   components: {
+    Checkbox,
     Col,
     Container,
     Divider,
@@ -158,6 +167,7 @@ export default {
     return {
       brightness: 0.0,
       contrast: 1.0,
+      discardAlpha: true,
       settings: [],
       directions: [
         {
@@ -192,6 +202,14 @@ export default {
         }
       },
       immediate: false,
+    },
+    discardAlpha: {
+      handler: function (value) {
+        if (this.zincObject) {
+          this.zincObject.discardAlphaPixel(value);
+        }
+      },
+      immediate: false,
     }
   },
   methods: {
@@ -201,11 +219,13 @@ export default {
         this.settings = this.zincObject.getTextureSettings();
         this.brightness = this.zincObject.getBrightness();
         this.contrast = this.zincObject.getContrast();
+        this.discardAlpha = this.zincObject.isAlphaPixelDiscarded();
       } else {
         this.zincObject = undefined;
         this.settings = [];
         this.brightness = 0.0;
         this.contrast = 1.0;
+        this.discardAlpha = true;
       }
     },
     addNewSlide: function () {
@@ -277,7 +297,7 @@ export default {
 
 .t-slides-container {
   width: 250px;
-  height: 218px;
+  height: 250px;
   overflow-y: auto;
 }
 

package/src/components.d.ts

@@ -8,6 +8,7 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElCollapse: typeof import('element-plus/es')['ElCollapse']
     ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']

package/src/scripts/Utilities.js

@@ -50,6 +50,16 @@ export const getEditablePoint = (eventIdentifiers) => {
   return undefined;
 }
 
+export const getDeletableObjects = (eventIdentifiers) => {
+  const zincObject = eventIdentifiers[0].data?.zincObject;
+  if (zincObject) {
+    if (zincObject.isEditable) {
+      return zincObject;
+    }
+  }
+  return undefined;
+}
+
 export const getEditableLines = (eventIdentifiers) => {
   const zincObject = eventIdentifiers[0].data?.zincObject;
   if (zincObject) {
@@ -82,17 +92,6 @@ export const getClickedObjects = (event) => {
   return undefined;
 }
 
-export const getDeletableObjects = (event) => {
-  const zincObjects = event.zincObjects;
-  if (zincObjects.length > 0 && zincObjects[0]) {
-    const zincObject = zincObjects[0];
-    if (zincObject.isEditable) {
-      return zincObject;
-    }
-  }
-  return undefined;
-}
-
 export const movePoint = (zincObject, index, diff) => {
   if (zincObject?.isEditable && zincObject?.isPointset) {
     let found = false;