Skip to content
Merged
Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion client/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ export default defineComponent({
sideTab,
isAdmin,
isNaBat,
configuration,
};
},
});
Expand Down Expand Up @@ -137,7 +138,7 @@ export default defineComponent({
</h3>
<v-spacer />
<v-tooltip
v-if="containsSpectro && nextShared !== false"
v-if="(containsSpectro && nextShared !== false) && !configuration.mark_annotations_completed_enabled"
bottom
>
<template #activator="{ props: subProps }">
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/PulseMetadataButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export default defineComponent({
</template>
<v-card min-width="260">
<v-card-title class="text-subtitle-1 px-3 pt-3">
Pulse metadata style
Pulse Metrics
</v-card-title>
<v-card-text class="pt-0">
<div class="mt-1 d-flex align-center">
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/RecordingAnnotationEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ export default defineComponent({
/>
</v-row>
<v-row
v-if="type !== 'nabat'"
v-if="type !== 'nabat' && !configuration.mark_annotations_completed_enabled"
>
<v-slider
v-model="confidence"
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/RecordingList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export default defineComponent({
<v-col>
<v-checkbox
v-model="showSubmittedRecordings"
label="Show submitted recordings"
label="Show recordings with submitted annotations"
hide-details
/>
</v-col>
Expand Down Expand Up @@ -158,7 +158,7 @@ export default defineComponent({
>
<v-col>
<div>
<b>Submitted: </b>
<b>Annotation Submitted: </b>
<v-icon
v-if="userSubmittedAnnotation(item)"
color="success"
Expand Down
6 changes: 3 additions & 3 deletions client/src/components/geoJS/layers/pulseMetadataLayer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,15 @@ export default class PulseMetadataLayer extends BaseTextLayer<TextData> {
});

this.textData.push({
text: `${(maxFreq / 1000).toFixed(1)} kHz`,
text: `Fₘₐₓ ${(maxFreq / 1000).toFixed(1)}kHz`,
x: topLeft.x - freqLineOffsetX - labelOffset,
y: topLeft.y,
offsetX: 0,
offsetY: 0,
textAlign: 'end',
});
this.textData.push({
text: `${(minFreq / 1000).toFixed(1)} kHz`,
text: `Fₘᵢₙ ${(minFreq / 1000).toFixed(1)}kHz`,
x: bottomLeft.x - freqLineOffsetX - labelOffset,
y: bottomLeft.y,
offsetX: 0,
Expand Down Expand Up @@ -231,7 +231,7 @@ export default class PulseMetadataLayer extends BaseTextLayer<TextData> {
this.pointData.push({ x: pos.x, y: pos.y, label: 'char_freq' });
const charFreqKhz = (pulse.char_freq[1] / 1000).toFixed(1);
this.textData.push({
text: `Char ${charFreqKhz} kHz`,
text: `Fc ${charFreqKhz} kHz`,
x: pos.x,
y: pos.y - 2,
offsetX: 0,
Expand Down
2 changes: 1 addition & 1 deletion client/src/views/Recordings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ export default defineComponent({
<v-checkbox
v-model="showSubmittedRecordings"
class="mr-4"
label="Show submitted recordings"
label="Show recordings with submitted annotations"
hide-details
/>
<v-menu v-if="configuration.is_admin || configuration.non_admin_upload_enabled">
Expand Down
29 changes: 25 additions & 4 deletions client/src/views/Spectrogram.vue
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,10 @@ export default defineComponent({
</template>
<span>Use a draggable straight edge to measure frequency</span>
</v-tooltip>
<v-tooltip bottom>
<v-tooltip
v-if="configuration.display_pulse_annotations || configuration.display_sequence_annotations"
bottom
>
<template #activator="{ props: subProps }">
<v-icon
v-bind="subProps"
Expand All @@ -543,7 +546,10 @@ export default defineComponent({
</template>
<span> Turn Species Label On/Off</span>
</v-tooltip>
<v-tooltip bottom>
<v-tooltip
v-if="configuration.display_pulse_annotations || configuration.display_sequence_annotations"
bottom
>
<template #activator="{ props: subProps }">
<v-btn
v-bind="subProps"
Expand All @@ -558,7 +564,10 @@ export default defineComponent({
</template>
<span> Turn Time Endpoint Labels On/Off</span>
</v-tooltip>
<v-tooltip bottom>
<v-tooltip
v-if="configuration.display_pulse_annotations || configuration.display_sequence_annotations"
bottom
>
<template #activator="{ props: subProps }">
<v-btn
v-bind="subProps"
Expand All @@ -573,7 +582,10 @@ export default defineComponent({
</template>
<span> Turn Time Duration Labels On/Off</span>
</v-tooltip>
<v-tooltip bottom>
<v-tooltip
v-if="configuration.display_pulse_annotations || configuration.display_sequence_annotations"
bottom
>
<template #activator="{ props: subProps }">
<v-btn
v-bind="subProps"
Expand Down Expand Up @@ -802,6 +814,15 @@ export default defineComponent({
</v-btn>
</v-col>
</v-row>
<v-row v-else-if="loading">
<v-col>
<v-progress-circular
indeterminate
size="24"
color="primary"
/>
</v-col>
</v-row>
<v-row v-else>
<v-col>
There are no more files to review
Expand Down