From 09fc2b4be5935ff451396a34a920c562584d1f9f Mon Sep 17 00:00:00 2001 From: Arjun Raj Date: Sat, 5 Oct 2024 05:44:22 -0400 Subject: [PATCH 1/3] Fix naming convention --- .../AnnotationProperties/PropertyCreation.vue | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/components/AnnotationBrowser/AnnotationProperties/PropertyCreation.vue b/src/components/AnnotationBrowser/AnnotationProperties/PropertyCreation.vue index 2a7dd5eb..2f8c3ab1 100644 --- a/src/components/AnnotationBrowser/AnnotationProperties/PropertyCreation.vue +++ b/src/components/AnnotationBrowser/AnnotationProperties/PropertyCreation.vue @@ -28,10 +28,7 @@ - +
Measure this property:
@@ -68,9 +65,9 @@
- SUBMIT + Create Property - CANCEL + Cancel
@@ -161,7 +158,11 @@ export default class PropertyCreation extends Vue { if (this.filteringTags.length) { nameList.push(this.filteringTags.join(", ")); } else { - nameList.push("No tag"); + if (this.areTagsExclusive) { + nameList.push("No tag"); + } else { + nameList.push("All"); + } } if (this.dockerImage) { const imageInterfaceName = @@ -238,11 +239,7 @@ export default class PropertyCreation extends Vue { } createProperty() { - if ( - !this.dockerImage || - !this.filteringShape || - !this.filteringTags.length - ) { + if (!this.dockerImage || !this.filteringShape) { return; } this.propertyStore From ec37f54638470b8071adc3e91483dc896e5eeb79 Mon Sep 17 00:00:00 2001 From: Arjun Raj Date: Sat, 5 Oct 2024 06:11:13 -0400 Subject: [PATCH 2/3] Added toggle to compute upon creation Users often want to compute the property right when it is created. This edit makes that the default option (with a checkbox to toggle). --- .../AnnotationProperties/PropertyCreation.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/components/AnnotationBrowser/AnnotationProperties/PropertyCreation.vue b/src/components/AnnotationBrowser/AnnotationProperties/PropertyCreation.vue index 2f8c3ab1..1716cce1 100644 --- a/src/components/AnnotationBrowser/AnnotationProperties/PropertyCreation.vue +++ b/src/components/AnnotationBrowser/AnnotationProperties/PropertyCreation.vue @@ -62,6 +62,11 @@
+
@@ -139,6 +144,8 @@ export default class PropertyCreation extends Vue { interfaceValues: IWorkerInterfaceValues = {}; + computeUponCreation = true; + get deduplicatedName() { // Find a name which is not already taken let count = 0; @@ -255,6 +262,9 @@ export default class PropertyCreation extends Vue { }) .then((property) => { this.propertyStore.togglePropertyPathVisibility([property.id]); + if (this.computeUponCreation) { + this.propertyStore.computeProperty(property); + } }); this.reset(); } @@ -266,6 +276,7 @@ export default class PropertyCreation extends Vue { this.dockerImage = null; this.originalName = "New Property"; this.isNameGenerated = true; + this.computeUponCreation = true; } } From 14a333f75c2a1a811585cbc0e5af5f585ffeb561 Mon Sep 17 00:00:00 2001 From: Arjun Raj Date: Sat, 5 Oct 2024 06:31:31 -0400 Subject: [PATCH 3/3] Do not reset the computeUponCreation checkbox every time --- .../AnnotationBrowser/AnnotationProperties/PropertyCreation.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/AnnotationBrowser/AnnotationProperties/PropertyCreation.vue b/src/components/AnnotationBrowser/AnnotationProperties/PropertyCreation.vue index 1716cce1..7804ba19 100644 --- a/src/components/AnnotationBrowser/AnnotationProperties/PropertyCreation.vue +++ b/src/components/AnnotationBrowser/AnnotationProperties/PropertyCreation.vue @@ -276,7 +276,6 @@ export default class PropertyCreation extends Vue { this.dockerImage = null; this.originalName = "New Property"; this.isNameGenerated = true; - this.computeUponCreation = true; } }