Skip to content

Commit

Permalink
close #166
Browse files Browse the repository at this point in the history
DavidZhang73 committed Jun 8, 2022

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
1 parent 819698f commit 40b5806
Showing 1 changed file with 35 additions and 2 deletions.
37 changes: 35 additions & 2 deletions src/pages/annotation/CanvasPanel.vue
Original file line number Diff line number Diff line change
@@ -40,7 +40,8 @@
<div
class="absolute bg-black text-white"
v-if="actionList && actionList.length"
style="bottom: 0; padding: 4px; font-size: 20px; opacity: 0.8"
:style="actionIndicatorStyle"
style="padding: 4px; font-size: 20px; opacity: 0.8"
>Action: <span
v-for="(action, index) in actionList"
:style="{color: action.color}"
@@ -215,6 +216,9 @@ let dragContext
let activeContext
/// action indicator
const actionIndicatorStyle = ref({
bottom: '0'
})
const actionList = computed(
() => annotationStore.actionAnnotationList.filter(action =>
currentFrame.value >= utils.time2index(action.start)
@@ -246,7 +250,8 @@ const labelOption = computed(() => configurationStore.objectLabelData.map(label
}
}))
const handleSelectInput = (labelId) => {
annotationList.value[annotationList.value.length - 1].color = configurationStore.objectLabelData.find(label => label.id === labelId).color
annotationList.value[annotationList.value.length - 1].color = configurationStore.objectLabelData.find(
label => label.id === labelId).color
}
/// autofocus
@@ -473,19 +478,30 @@ const handleMousemove = event => {
y: mouseY
}
}
let isActionIndicatorOverlapsStatus = false
if (mouseX > annotationStore.video.width / 2 && mouseY > annotationStore.video.height / 2) {
statusStyle.value = {
...statusBaseStyle,
top: '1px',
left: '1px'
}
isActionIndicatorOverlapsStatus = true
} else {
statusStyle.value = {
...statusBaseStyle,
bottom: '1px',
right: '1px'
}
}
if (mouseY > annotationStore.video.height / 2) {
actionIndicatorStyle.value = {
top: isActionIndicatorOverlapsStatus ? '17px' : '0'
}
} else {
actionIndicatorStyle.value = {
bottom: '0'
}
}
if (annotationStore.mode === 'object' && preferenceStore.objects) {
// creating an object
if (createContext) {
@@ -946,6 +962,9 @@ const handleMouseupAndMouseout = event => {
dragContext = undefined
}
}
actionIndicatorStyle.value = {
bottom: '0'
}
}
const handleMouseenter = event => {
const [mouseX, mouseY] = getMouseLocation(event)
@@ -1149,19 +1168,30 @@ const handleTouchmove = event => {
y: mouseY
}
}
let isActionIndicatorOverlapsStatus = false
if (mouseX > annotationStore.video.width / 2 && mouseY > annotationStore.video.height / 2) {
statusStyle.value = {
...statusBaseStyle,
top: '1px',
left: '1px'
}
isActionIndicatorOverlapsStatus = true
} else {
statusStyle.value = {
...statusBaseStyle,
bottom: '1px',
right: '1px'
}
}
if (mouseY > annotationStore.video.height / 2) {
actionIndicatorStyle.value = {
top: isActionIndicatorOverlapsStatus ? '17px' : '0'
}
} else {
actionIndicatorStyle.value = {
bottom: '0'
}
}
if (annotationStore.mode === 'object' && preferenceStore.objects) {
// creating an object
if (createContext) {
@@ -1291,6 +1321,9 @@ const handleTouchend = () => {
dragContext = undefined
}
}
actionIndicatorStyle.value = {
bottom: '0'
}
}
/// zoom

0 comments on commit 40b5806

Please sign in to comment.