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.

Sign up for GitHub

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

fix: use region instead of drawnRegion for labelType in label file #582

Merged
merged 4 commits into from
Sep 23, 2020
Merged

fix: use region instead of drawnRegion for labelType in label file #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
528bff1
fix: use region instead of drawnRegion for labelType in label file
stew-ro Sep 15, 2020
14e2505
Merge branch 'master' into stew-ro/use-region-instead-of-drawnRegion-…
stew-ro Sep 22, 2020
403dbc6
Merge branch 'master' into stew-ro/use-region-instead-of-drawnRegion-…
stew-ro Sep 23, 2020
1ae3339
Merge branch 'master' into stew-ro/use-region-instead-of-drawnRegion-…
stew-ro Sep 23, 2020
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
2 changes: 1 addition & 1 deletion src/common/localization/en-us.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ export const english: IAppStrings = {
unknownTagName: "Unknown",
notCompatibleTagType: "Tag type is not compatible with this feature. If you want to change type of this tag, please remove or reassign all labels which using this tag in your project.",
checkboxPerTagLimit: "Cannot assign more than one checkbox per tag",
notCompatibleWithDrawnRegionTag: "drawnRegion and ${otherCatagory} values cannot both be assigned to the same document's tag",
notCompatibleWithDrawnRegionTag: "Drawn regions and ${otherCatagory} values cannot both be assigned to the same document's tag",
},
toolbar: {
add: "Add new tag",
Expand Down
4 changes: 2 additions & 2 deletions src/models/applicationState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ export enum FieldType {
}

export enum LabelType {
DrawnRegion = "drawnRegion"
DrawnRegion = "region"
}

export enum FieldFormat {
Expand All @@ -413,7 +413,7 @@ export enum FeatureCategory {
Text = "text",
Checkbox = "checkbox",
Label = "label",
DrawnRegion = "drawnRegion"
DrawnRegion = "region"
alex-krasn marked this conversation as resolved.
Show resolved Hide resolved
}

export enum ImageMapParent {
Expand Down