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

feat(ControlsModal): list mouse view controls #685

Merged
merged 1 commit into from
Dec 18, 2024
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
15 changes: 15 additions & 0 deletions src/components/AboutBox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
For investigational use only
</v-alert>
<v-card-text>
<v-btn
class="my-2"
@click="openKeyboardShortcuts"
prepend-icon="mdi-keyboard"
color="secondary"
>
Keyboard Shortcuts and View Controls
</v-btn>
<h2 class="mt-2">About VolView</h2>
<v-divider class="mb-2" />
<p class="float-right">
Expand Down Expand Up @@ -198,6 +206,7 @@
import { defineComponent } from 'vue';
import { useDisplay } from 'vuetify';
import VolViewFullLogo from './icons/VolViewFullLogo.vue';
import { useKeyboardShortcutsStore } from '../store/keyboard-shortcuts';

export default defineComponent({
name: 'AboutBox',
Expand All @@ -207,7 +216,13 @@ export default defineComponent({
setup() {
const display = useDisplay();

const keyboardStore = useKeyboardShortcutsStore();
const openKeyboardShortcuts = () => {
keyboardStore.settingsOpen = true;
};

return {
openKeyboardShortcuts,
mobile: display.xs,
versions: {
volview: __VERSIONS__.volview,
Expand Down
6 changes: 3 additions & 3 deletions src/components/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</div>
</div>
</v-main>
<keyboard-shortcuts />
<controls-modal />
</v-app>
<persistent-overlay
:disabled="!dragHover"
Expand Down Expand Up @@ -70,7 +70,7 @@ import LayoutGrid from '@/src/components/LayoutGrid.vue';
import ModulePanel from '@/src/components/ModulePanel.vue';
import DragAndDrop from '@/src/components/DragAndDrop.vue';
import PersistentOverlay from '@/src/components/PersistentOverlay.vue';
import KeyboardShortcuts from '@/src/components/KeyboardShortcuts.vue';
import ControlsModal from '@/src/components/ControlsModal.vue';
import { useImageStore } from '@/src/store/datasets-images';
import { useServerStore } from '@/src/store/server';
import { useGlobalErrorHook } from '@/src/composables/useGlobalErrorHook';
Expand All @@ -85,7 +85,7 @@ export default defineComponent({
DragAndDrop,
ModulePanel,
PersistentOverlay,
KeyboardShortcuts,
ControlsModal,
WelcomePage,
AppBar,
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
<template>
<closeable-dialog v-model="keyboardStore.settingsOpen">
<v-card>
<v-card-title class="d-flex flex-row align-center">
Keyboard Shortcuts
</v-card-title>
<v-table class="pa-4">
<thead>
<th class="text-left">Command</th>
<th class="text-left">Keybinding</th>
</thead>
<v-card class="pa-4">
<div class="text-h4 pb-2">View Controls</div>
<v-table>
<tbody>
<tr>
<td>Scroll Slices</td>
<td>Mouse wheel or 2 finger vertical scroll</td>
</tr>
<tr>
<td>Zoom</td>
<td>Right mouse button + move vertically</td>
</tr>
<tr>
<td>Pan</td>
<td>Shift + left mouse button + move</td>
</tr>
</tbody>
</v-table>

<div class="text-h4 pb-2">Keyboard Shortcuts</div>
<v-table>
<tbody>
<tr v-for="[action, key] in bindings" :key="action">
<td>{{ action }}</td>
Expand Down
19 changes: 9 additions & 10 deletions src/components/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
<v-card>
<v-card-title class="d-flex flex-row align-center">Settings</v-card-title>
<v-card-text>
<v-btn
class="my-2"
@click="openKeyboardShortcuts"
prepend-icon="mdi-keyboard"
color="secondary"
>
Keyboard Shortcuts and View Controls
</v-btn>
<v-switch
:label="`Dark Theme (${dark ? 'On' : 'Off'})`"
v-model="dark"
Expand All @@ -27,15 +35,6 @@
hide-details
></v-switch>

<v-btn
class="my-2"
@click="openKeyboardShortcuts"
prepend-icon="mdi-keyboard"
color="secondary"
>
Keyboard Shortcuts
</v-btn>

<v-divider class="mt-2 mb-6"></v-divider>
<dicom-web-settings />

Expand All @@ -52,14 +51,14 @@ import { useTheme } from 'vuetify';
import { useLocalStorage } from '@vueuse/core';

import { useKeyboardShortcutsStore } from '@/src/store/keyboard-shortcuts';
import { useViewCameraStore } from '@/src/store/view-configs/camera';
import DicomWebSettings from './dicom-web/DicomWebSettings.vue';
import ServerSettings from './ServerSettings.vue';
import { DarkTheme, LightTheme, ThemeStorageKey } from '../constants';
import {
useErrorReporting,
errorReportingConfigured,
} from '../utils/errorReporting';
import { useViewCameraStore } from '@/src/store/view-configs/camera';

export default defineComponent({
setup() {
Expand Down
2 changes: 1 addition & 1 deletion src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const ACTIONS = {
},

mergeNewPolygon: {
readable: 'Hold down to merge new polygons with overlapping polygons',
readable: 'Hold to merge new polygons with overlapping polygons',
},

showKeyboardShortcuts: {
Expand Down
Loading