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
17 changes: 3 additions & 14 deletions src/components/LayoutGrid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,11 @@
</template>

<script lang="ts">
import { Component, computed, defineComponent, PropType, toRefs } from 'vue';
import { computed, defineComponent, PropType, toRefs } from 'vue';
import { storeToRefs } from 'pinia';
import VtkTwoView from './VtkTwoView.vue';
import VtkObliqueView from './VtkObliqueView.vue';
import VtkObliqueThreeView from './VtkObliqueThreeView.vue';
import VtkThreeView from './VtkThreeView.vue';
import { ViewTypeToComponent } from '@/src/core/viewTypes';
import { Layout, LayoutDirection } from '../types/layout';
import { useViewStore } from '../store/views';
import { ViewType } from '../types/views';

const TYPE_TO_COMPONENT: Record<ViewType, Component> = {
'2D': VtkTwoView,
'3D': VtkThreeView,
Oblique: VtkObliqueView,
Oblique3D: VtkObliqueThreeView,
};

export default defineComponent({
name: 'LayoutGrid',
Expand Down Expand Up @@ -63,7 +52,7 @@ export default defineComponent({
return {
type: 'view',
id: item,
component: TYPE_TO_COMPONENT[spec.viewType],
component: ViewTypeToComponent[spec.viewType],
props: spec.props,
};
}
Expand Down
12 changes: 12 additions & 0 deletions src/core/viewTypes.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import VtkObliqueThreeView from '@/src/components/VtkObliqueThreeView.vue';
import VtkObliqueView from '@/src/components/VtkObliqueView.vue';
import VtkThreeView from '@/src/components/VtkThreeView.vue';
import VtkTwoView from '@/src/components/VtkTwoView.vue';
import { Component } from 'vue';

export const ViewTypeToComponent: Record<string, Component> = {
'2D': VtkTwoView,
'3D': VtkThreeView,
Oblique: VtkObliqueView,
Oblique3D: VtkObliqueThreeView,
};
10 changes: 1 addition & 9 deletions src/io/state-file/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import {
import { LPSAxisDir, LPSAxis } from '../../types/lps';
import { LayoutDirection } from '../../types/layout';
import {
ViewType,
ColorBy,
ColorTransferFunction,
OpacityFunction,
Expand Down Expand Up @@ -220,18 +219,11 @@ const ViewConfig = z.object({
volumeColorConfig: VolumeColorConfig.optional(),
});

const ViewType = z.union([
z.literal('2D'),
z.literal('3D'),
z.literal('Oblique'),
z.literal('Oblique3D'),
]) satisfies z.ZodType<ViewType>;

export type ViewConfig = z.infer<typeof ViewConfig>;

const View = z.object({
id: z.string(),
type: ViewType,
type: z.string(),
props: z.record(z.any()),
config: z.record(ViewConfig),
});
Expand Down
4 changes: 1 addition & 3 deletions src/types/views.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ import {
PiecewiseNode,
} from '@kitware/vtk.js/Proxy/Core/PiecewiseFunctionProxy';

export type ViewType = '2D' | '3D' | 'Oblique' | 'Oblique3D';

export interface ViewSpec {
viewType: ViewType;
viewType: string;
props: Record<string, any>;
}

Expand Down