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

package/src/components/PrimitiveControls.vue

@@ -12,7 +12,7 @@
             :zincObject="zincObject"
             ref="opacityControls" />
         </el-collapse-item>
-        <el-collapse-item title="Transformation" name="trControls">
+        <el-collapse-item v-show="!isEditable" title="Transformation" name="trControls">
           <transformation-controls
             class="transformation-controls"
             ref="transformationControls" />
@@ -25,13 +25,17 @@
         <el-collapse-item v-show="isPointset" title="Points" name="pControls">
           <points-controls
             class="pointset-controls"
-            ref="pointsetControls" />
+            ref="pointsetControls"
+            @primitivesUpdated="$emit('primitivesUpdated', $event)"
+          />
         </el-collapse-item>
         <el-collapse-item v-show="isLines" title="Lines" name="lControls">
           <lines-controls
             class="lines-controls"
             ref="linesControls"
-            :createData="createData" />
+            :createData="createData"
+            @primitivesUpdated="$emit('primitivesUpdated', $event)"
+          />
         </el-collapse-item>
       </el-collapse>
     </div>
@@ -91,6 +95,7 @@ export default {
       isLines: false,
       drawerOpen: true,
       zincObject: undefined,
+      isEditable: false,
     };
   },
   methods: {
@@ -107,10 +112,11 @@ export default {
       } else {
         this.zincObject = undefined;
       }
+      this.isEditable = this.zincObject?.isEditable ? true : false;
       this.isPointset = false;
       this.isTextureSlides = false;
       this.isLines = false;
-      this.activeName  = "oControls";
+      this.activeName  = "trControls";
       if (object) {
         if (object.isTextureSlides) {
           this.isTextureSlides = true;

package/src/components/ScaffoldTooltip.vue

@@ -19,7 +19,7 @@
           :createData="createData"
           @confirm-create="$emit('confirm-create', $event)"
           @cancel-create="$emit('cancel-create')"
-        /> 
+        />
         <Tooltip
           class="p-tooltip"
           v-show="annotationDisplay && !createData.toBeConfirmed"
@@ -27,14 +27,45 @@
           :annotationDisplay="true"
           :annotationEntry="annotationEntry"
         />
+        <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>
 </template>
 
 <script>
+import { shallowRef } from 'vue';
 /* eslint-disable no-alert, no-console */
-import { ElPopover as Popover } from "element-plus";
+import {
+  ElCol as Col,
+  ElIcon as Icon,
+  ElPopover as Popover,
+  ElRow as Row,
+} from "element-plus";
+import {
+  Delete as ElIconDelete,
+} from '@element-plus/icons-vue'
 import CreateTooltiipContent from "./CreateTooltipContent.vue";
 import { mapState } from 'pinia';
 import { useMainStore } from "@/store/index";
@@ -47,8 +78,12 @@ import '@abi-software/map-utilities/dist/style.css'
 export default {
   name: "ScaffoldTooltip",
   components: {
+    Col,
     CreateTooltiipContent,
+    ElIconDelete,
+    Icon,
     Popover,
+    Row,
     Tooltip,
   },
   props: {
@@ -96,7 +131,8 @@ export default {
   data: function () {
     return {
       display: false,
-      annotationEntry: { }
+      annotationEntry: { },
+      ElIconDelete: shallowRef(ElIconDelete),
     };
   },
   computed: {
@@ -206,5 +242,23 @@ 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/ScaffoldTreeControls.vue

@@ -175,6 +175,23 @@ export default {
         }
       }
     },
+    zincObjectRemoved: function(zincObject) {
+      const group = zincObject.groupName;
+      const objects = zincObject.region.findObjectsWithGroupName(group, false);
+      if (objects.length === 0) {
+        const paths = zincObject.region.getFullSeparatedPath();
+        const regionData = this.findOrCreateRegion(this.treeData[0], paths, "");
+        if (regionData.children) {
+          for (let i = 0; i < regionData.children.length; i++) {
+            if (regionData.children[i].label === group) {
+              regionData.children.splice(i, 1);
+              this.__nodeNumbers--;
+              return;
+            }
+          }
+        }
+      }
+    },
     checkChanged: function (node, data) {
       const isRegion = node.isRegion;
       const isPrimitives = node.isPrimitives;
@@ -325,6 +342,7 @@ export default {
         this.zincObjectAdded(zincObject);
       });
       this.$module.addOrganPartAddedCallback(this.zincObjectAdded);
+      this.$module.addOrganPartRemovedCallback(this.zincObjectRemoved);
     },
     setColourField: function (treeData, nodeData = undefined) {
       treeData