Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use consistent terminology #153

Merged
merged 1 commit into from
Oct 10, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -194,7 +194,7 @@ export default Vue.extend({
:value="categoryIndex(category.label)"
class="h-superpixel-select-option"
>
Class: {{ category.label }}
Label: {{ category.label }}
</option>
</select>
</div>
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ export default Vue.extend({
showLabelingContainer: true,
editingLabel: -1,
checkedCategories: [],
currentCategoryLabel: 'New Category',
currentCategoryLabel: 'New Label',
currentCategoryFillColor: getFillColor(0),
editingHotkey: -1,
currentHotkeyInput: []
@@ -52,7 +52,7 @@ export default Vue.extend({
const errors = [];
const counts = _.map(Object.keys(this.labeledSuperpixelCounts), (entry) => this.labeledSuperpixelCounts[entry].count);
if (_.filter(counts, (count) => count > 0).length < 2) {
errors.push('You must label superpixels for at least two different categories.');
errors.push('You must label superpixels for at least two different labels.');
}
return errors;
},
@@ -222,7 +222,7 @@ export default Vue.extend({
*************************/
addCategory(newName, newFillColor) {
if (_.isUndefined(newName)) {
newName = 'New Category';
newName = 'New Label';
}
if (_.isUndefined(newFillColor)) {
const idx = store.categoriesAndIndices.length || 0;
@@ -320,7 +320,7 @@ export default Vue.extend({
this.$emit('combine');
},
mergeCategory(newLabel, newFillColor) {
this.addCategory('Merged Categories', newFillColor);
this.addCategory('Merged Labels', newFillColor);
this.combineCategories(this.checkedCategories, true);
_.last(store.categoriesAndIndices).category.label = this.enforceUniqueName(newLabel);
},
@@ -347,9 +347,9 @@ export default Vue.extend({
return _.contains(predictions, labels[i + 1].label);
});
});
const predictionsWarning = `Deleting a category with predictions will
const predictionsWarning = `Deleting a label with predictions will
immediately force retraining to run.`;
const labelingWarning = `Deleting categories cannot be undone.`;
const labelingWarning = `Deleting labels cannot be undone.`;
const message = `${hasPredictions ? predictionsWarning : labelingWarning}
Are you sure you want to delete all ${labelCounts} labeled
superpixels?`;
@@ -669,7 +669,7 @@ export default Vue.extend({
class="btn btn-danger btn-xs"
:disabled="checkedCategories.length < 1"
data-toggle="tooltip"
title="Delete category"
title="Delete label"
@click="() => deleteCategory(checkedCategories)"
>
<i class="icon-trash" />
@@ -694,7 +694,7 @@ export default Vue.extend({
:disabled="!currentCategoryFormValid"
@click="() => addCategory()"
>
<i class="icon-plus" /> Add Category
<i class="icon-plus" /> Add Label
</button>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -507,7 +507,7 @@ export default Vue.extend({
href="#categories"
@click="categoriesPanelCollapsed = !categoriesPanelCollapsed"
>
Categories
Labels
<i
v-if="categoriesPanelCollapsed"
class="icon-angle-down"
@@ -992,7 +992,7 @@ export default Vue.extend({
type="checkbox"
value="selectedCategory"
>
Class Name
Label Name
</label>
</li>
<li>
@@ -1126,7 +1126,7 @@ export default Vue.extend({
data-toggle="dropdown"
:disabled="selectedReviewSuperpixels.length < 1"
>
Change Class
Change Label
<span class="caret" />
</button>
<ul
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ export default Vue.extend({
data() {
return {
currentCategoryFillColor: 'rgba(0, 0, 0, 0.5)',
categoryName: 'Merged Categories'
categoryName: 'Merged Labels'
};
},
computed: {
@@ -22,8 +22,8 @@ export default Vue.extend({
const labelCounts = _.reduce([...store.selectedLabels.values()], (acc, selected) => {
return acc + selected.count;
}, 0);
const message = `This will combine ${numCategories} categories into
one category containing all ${labelCounts} labeled
const message = `This will combine ${numCategories} labels into
one label containing all ${labelCounts} labeled
superpixels.`;
return message;
},
@@ -80,11 +80,11 @@ export default Vue.extend({
&times;
</button>
<h4 class="modal-title">
Merge Categories
Merge Labels
</h4>
</div>
<div class="modal-body">
<p> WARNING: Merging categories cannot be undone. {{ warningMessage }} </p>
<p> WARNING: Merging labels cannot be undone. {{ warningMessage }} </p>
<div class="form-group h-form-inputs">
<label for="usr">New Name:</label>
<input
Original file line number Diff line number Diff line change
@@ -312,7 +312,7 @@ export default Vue.extend({
const fillColor = getFillColor(store.categoriesAndIndices.length);
store.categoriesAndIndices.push({
category: {
label: 'New Category',
label: 'New Label',
fillColor,
strokeColor: boundaryColor
},
Original file line number Diff line number Diff line change
@@ -51,14 +51,14 @@ export const activeLearningSteps = {
export const groupByOptions = {
0: '(None)',
1: 'Slide',
2: 'Class',
2: 'Label',
3: 'Agree/Disagree'
};

export const sortByOptions = {
0: '(None)',
1: 'Slide',
2: 'Class',
2: 'Label',
3: 'Agree/Disagree',
4: 'Confidence',
5: 'Certainty'
Original file line number Diff line number Diff line change
@@ -123,7 +123,7 @@ const updatePixelmapLayerStyle = () => {
d += 1;
}
if (d < 0 || d >= store.categories.length) {
console.warn(`No category found at index ${d} in the category map.`);
console.warn(`No label found at index ${d} in the label map.`);
return 'rgba(0, 0, 0, 0)';
}
const category = store.categories[d];