Filtering improvements

wsi_superpixel_guided_labeling/web_client/views/body/ActiveLearningView.js

@@ -16,7 +16,7 @@ import ActiveLearningGlobalContainer from '../vue/components/ActiveLearningGloba
 import ActiveLearningToolBar from '../vue/components/ActiveLearningToolBar.vue';
 import { store, assignHotkey } from '../vue/components/store.js';
 import { activeLearningSteps } from '../vue/components/constants.js';
-import { debounce } from '../vue/components/utils.js';
+import { debounce, isValidNumber } from '../vue/components/utils.js';
 
 import '../../stylesheets/body/learning.styl';
 
@@ -129,7 +129,7 @@ const ActiveLearningView = View.extend({
                 const idx = _.findIndex([...this.categoryMap.values()], (c) => c.label === l);
                 return idx === -1 ? null : idx - 1;
             });
-            store.exclusions = _.reject(excluded, (v) => !_.isNumber(v));
+            store.exclusions = _.reject(excluded, (v) => !isValidNumber(v));
 
             return this.fetchFoldersAndItems();
         });
@@ -667,7 +667,7 @@ const ActiveLearningView = View.extend({
             const annotation = values.labels.get('annotation');
             if (annotation) {
                 _.forEach(Object.entries(annotation.attributes.metadata), ([k, v]) => {
-                    if (_.isNumber(v.reviewValue) && v.reviewEpoch >= v.labelEpoch) {
+                    if (isValidNumber(v.reviewValue) && v.reviewEpoch >= v.labelEpoch) {
                         annotation.elements[0].values[k] = v.reviewValue;
                         if (!imageIds.includes(annotation.itemId)) {
                             imageIds.push(annotation.itemId);

wsi_superpixel_guided_labeling/web_client/views/vue/components/ActiveLearning/ActiveLearningFilmStripCard.vue

@@ -3,7 +3,6 @@ import Vue from 'vue';
 import _ from 'underscore';
 
 import { store, nextCard } from '../store';
-import { updateMetadata } from '../utils';
 
 export default Vue.extend({
     props: ['index'],
@@ -113,9 +112,7 @@ export default Vue.extend({
 
             // Force computed values to update
             store.categoriesAndIndices = [...store.categoriesAndIndices];
-            updateMetadata(this.superpixelDecision, newValue, false);
-            store.backboneParent.updateAnnotationMetadata(store.currentImageId);
-            store.guidedChangeLog.push(this.superpixelDecision);
+            store.labelingChangeLog.push(this.superpixelDecision);
         },
         lastCategorySelected(categoryNumber) {
             if (!this.isSelected || typeof categoryNumber !== 'number') {

wsi_superpixel_guided_labeling/web_client/views/vue/components/ActiveLearningGlobalContainer.vue

@@ -1,6 +1,5 @@
 <script>
 import Vue from 'vue';
-import _ from 'underscore';
 
 import ActiveLearningInitialSuperpixels from './ActiveLearningSetup/ActiveLearningInitialSuperpixels.vue';
 import ActiveLearningMergeConfirmation from './ActiveLearningSetup/ActiveLearningMergeConfirmation.vue';
@@ -114,10 +113,6 @@ export default Vue.extend({
         store.categories = [...this.categoryMap.values()];
         store.currentImageId = Object.keys(this.imageNamesById)[0];
 
-        // Default to filtering out unlabeled superpixels
-        const cats = _.map(_.rest(store.categories), (cat) => `label_${cat.label}`);
-        store.filterBy = [...store.filterBy, ...cats];
-
         // We don't want to mount child components until the store has been updated
         this.storeReady = true;
     },

wsi_superpixel_guided_labeling/web_client/views/vue/components/ActiveLearningReview/ActiveLearningReviewCard.vue

@@ -3,7 +3,7 @@ import Vue from 'vue';
 import _ from 'underscore';
 
 import { store } from '../store';
-import { updateMetadata } from '../utils';
+import { isValidNumber, updateMetadata } from '../utils';
 
 export default Vue.extend({
     props: ['superpixel', 'previewSize', 'cardDetails', 'reviewValue'],
@@ -81,7 +81,7 @@ export default Vue.extend({
         },
         reviewerCategorySelection: {
             get() {
-                if (!_.isNumber(this.superpixel.reviewValue)) {
+                if (!isValidNumber(this.superpixel.reviewValue)) {
                     return this.superpixel.selectedCategory;
                 }
                 return this.superpixel.reviewValue;
@@ -95,11 +95,10 @@ export default Vue.extend({
                     // Index (newCategory) -1 indicates "Approve" or "Clear Review". If we are approving
                     // then we are setting the reviewValue to the selectedCategory. If we are clearing the
                     // review we are setting the reviewValue to null.
-                    newCategory = _.isNumber(this.superpixel.reviewValue) ? null : this.superpixel.selectedCategory;
+                    newCategory = isValidNumber(this.superpixel.reviewValue) ? null : this.superpixel.selectedCategory;
                 }
 
                 updateMetadata(this.superpixel, newCategory, true);
-                store.backboneParent.updateAnnotationMetadata(this.superpixel.imageId);
             }
         }
     },