Skip to content
Open
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
122 changes: 66 additions & 56 deletions src/components/VolumeRendering.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ import { useVolumeColoringInitializer } from '@/src/composables/useVolumeColorin
import { useResizeObserver } from '@/src/composables/useResizeObserver';
import { useCurrentImage } from '@/src/composables/useCurrentImage';
import useVolumeColoringStore from '@/src/store/view-configs/volume-coloring';
import {
getColorFunctionRangeFromPreset,
getShiftedOpacityFromPreset,
} from '@/src/utils/vtk-helpers';
import { mappingRangeSliders } from '@/src/utils/mappingRangeSliders';
import { getShiftedOpacityFromPreset } from '@/src/utils/vtk-helpers';

const WIDGET_WIDTH = 250;
const WIDGET_HEIGHT = 150;
Expand Down Expand Up @@ -226,12 +224,11 @@ export default defineComponent({
} else if (opFunc.mode === vtkPiecewiseFunctionProxy.Mode.Points) {
pwfWidget.setPointsMode();
// get non-shifted points for the widget
const points = getShiftedOpacityFromPreset(
opFunc.preset,
opFunc.mappingRange,
0,
0
);
const points = getShiftedOpacityFromPreset({
...opFunc,
shift: 0,
shiftAlpha: 0,
});
pwfWidget.setOpacityPoints(points, opFunc.shift, opFunc.shiftAlpha);
}
},
Expand All @@ -245,19 +242,13 @@ export default defineComponent({
);
const hasCurrentImage = computed(() => !!currentImageData.value);

// the data range, if any
const imageDataRange = computed((): [number, number] => {
const image = currentImageData.value;
if (image) {
return image.getPointData().getScalars().getRange();
}
return [0, 1];
});

const fullMappingRange = computed(
() =>
getColorFunctionRangeFromPreset(selectedPreset.value || '') ||
imageDataRange.value
const fullMappingRange = computed(() =>
currentImageID.value && selectedPreset.value
? volumeColoringStore.getPresetColorRange(
currentImageID.value,
selectedPreset.value
)
: [0, 1]
);
const fullMappingRangeWidth = computed(() => {
const range = fullMappingRange.value;
Expand All @@ -273,6 +264,10 @@ export default defineComponent({
);
};

const resetColoring = () => {
if (selectedPreset.value) selectPreset(selectedPreset.value);
};

// --- mapping range editing --- //

onKeyDown('Control', () => pwfWidget.setShiftOpacityValues(true));
Expand Down Expand Up @@ -336,53 +331,68 @@ export default defineComponent({
mappingRange: computed(
() => colorTransferFunctionRef.value!.mappingRange
),
colorSliderStep: computed(() => {
const [low, high] = imageDataRange.value;
const width = high - low;
const step = Math.min(1, width / 256);
return step > 1 ? Math.round(step) : step;
}),
rangeShiftMin: computed(() => -fullMappingRangeWidth.value / 2),
rangeShiftMax: computed(() => fullMappingRangeWidth.value / 2),
sliders: computed(() => mappingRangeSliders(fullMappingRangeWidth.value)),
rangeShift,
rangeWidth,
rangeWidthMax: computed(() => fullMappingRangeWidth.value * 2),
request3DAnimation,
cancel3DAnimation,
selectPreset,
resetColoring,
};
},
});
</script>

<template>
<div class="overflow-hidden">
<div class="mt-4 pwf-editor" ref="editorContainerRef">
<div
class="mt-4 pwf-editor"
ref="editorContainerRef"
data-testid="volume-opacity-editor"
>
<div ref="pwfEditorRef" />
</div>
<div class="mapping-range-editor">
<v-slider
v-model="rangeShift"
density="compact"
hide-details
label="Shift"
:min="rangeShiftMin"
:max="rangeShiftMax"
:step="colorSliderStep"
@pointerdown="request3DAnimation"
@pointerup="cancel3DAnimation"
/>
<v-slider
v-model="rangeWidth"
density="compact"
hide-details
label="Width"
min="1"
:max="rangeWidthMax"
:step="colorSliderStep"
@pointerdown="request3DAnimation"
@pointerup="cancel3DAnimation"
/>
<div class="mapping-range-editor d-flex align-center ga-2">
<div class="flex-grow-1">
<v-slider
v-model="rangeShift"
data-testid="volume-color-shift"
density="compact"
hide-details
label="Shift"
:min="sliders.shift[0]"
:max="sliders.shift[1]"
:step="sliders.step"
@pointerdown="request3DAnimation"
@pointerup="cancel3DAnimation"
/>
<v-slider
v-model="rangeWidth"
data-testid="volume-color-width"
density="compact"
hide-details
label="Width"
:min="sliders.width[0]"
:max="sliders.width[1]"
:step="sliders.step"
@pointerdown="request3DAnimation"
@pointerup="cancel3DAnimation"
/>
</div>
<v-tooltip text="Reset color and opacity to the preset">
<template #activator="{ props: tooltipProps }">
<v-btn
v-bind="tooltipProps"
data-testid="volume-reset-color-opacity"
aria-label="Reset color and opacity"
icon="mdi-restore"
size="small"
density="compact"
variant="text"
@click="resetColoring"
/>
</template>
</v-tooltip>
</div>
</div>
</template>
Expand Down
7 changes: 1 addition & 6 deletions src/composables/useColoringEffect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,7 @@ export function applyOpacityFunction(
);
break;
case vtkPiecewiseFunctionProxy.Mode.Points: {
const opacityPoints = getShiftedOpacityFromPreset(
opacityFunction.preset,
opacityFunction.mappingRange,
opacityFunction.shift,
opacityFunction.shiftAlpha
);
const opacityPoints = getShiftedOpacityFromPreset(opacityFunction);
if (opacityPoints) {
applyPointsToPiecewiseFunction(ofun, opacityPoints, mappingRange);
}
Expand Down
67 changes: 35 additions & 32 deletions src/composables/useVolumeThumbnailing.ts
Original file line number Diff line number Diff line change
@@ -1,41 +1,34 @@
import { onBeforeUnmount, reactive, ref, watch } from 'vue';
import { computed, onBeforeUnmount, reactive, ref, watch } from 'vue';
import { Mode as LookupTableProxyMode } from '@kitware/vtk.js/Proxy/Core/LookupTableProxy';
import vtkImageData from '@kitware/vtk.js/Common/DataModel/ImageData';
import vtkPiecewiseFunctionProxy from '@kitware/vtk.js/Proxy/Core/PiecewiseFunctionProxy';
import { getPresetByName } from '@/src/types/color-map-preset';
import { createVolumeThumbnailer } from '../core/thumbnailers/volume-thumbnailer';
import { useCameraOrientation } from './useCameraOrientation';
import { useImageStore } from '../store/datasets-images';
import { useImageStatsStore } from '../store/image-stats';
import { useCurrentImage } from './useCurrentImage';
import {
getColorFunctionRangeFromPreset,
getOpacityRangeFromPreset,
} from '../utils/vtk-helpers';
import { getShiftedOpacityFromPreset } from '../utils/vtk-helpers';
import useVolumeColoringStore from '../store/view-configs/volume-coloring';
import { PresetNameList } from '../vtk/ColorMaps';
import { logError } from '../utils/loggers';

function resetOpacityFunction(
pwfProxy: vtkPiecewiseFunctionProxy,
dataRange: [number, number],
fitRange: [number, number],
presetName: string
) {
// reset pwf proxy range
pwfProxy.setDataRange(...dataRange);

const preset = getPresetByName(presetName);
if (preset?.OpacityPoints) {
const OpacityPoints = preset.OpacityPoints;
const points = [];
for (let i = 0; i < OpacityPoints.length; i += 2) {
points.push([OpacityPoints[i], OpacityPoints[i + 1]]);
}

const [xmin, xmax] = dataRange;
const width = xmax - xmin;
const pointsNormalized = points.map(([x, y]) => [(x - xmin) / width, y]);

const points = getShiftedOpacityFromPreset({
preset: presetName,
mappingRange: dataRange,
shift: 0,
shiftAlpha: 0,
fitRange,
});
if (points) {
pwfProxy.setMode(vtkPiecewiseFunctionProxy.Mode.Points);
pwfProxy.setPoints(pointsNormalized);
pwfProxy.setPoints(points);
} else {
pwfProxy.setMode(vtkPiecewiseFunctionProxy.Mode.Gaussians);
pwfProxy.setGaussians(vtkPiecewiseFunctionProxy.Defaults.Gaussians);
Expand All @@ -52,6 +45,8 @@ export function useVolumeThumbnailing(

const { currentImageMetadata, currentImageID, currentImageData } =
useCurrentImage();
const volumeColoringStore = useVolumeColoringStore();
const imageStatsStore = useImageStatsStore();

// same as 3D view
const { cameraDirVec, cameraUpVec } = useCameraOrientation(
Expand Down Expand Up @@ -96,19 +91,20 @@ export function useVolumeThumbnailing(
return;
}

const opRange = getOpacityRangeFromPreset(presetName);
const colorRange = volumeColoringStore.getPresetColorRange(
imageID,
presetName
);
resetOpacityFunction(
thumbnailer.opacityFuncProxy,
opRange || imageDataRange,
imageDataRange,
colorRange,
presetName
);

thumbnailer.colorTransferFuncProxy.setMode(LookupTableProxyMode.Preset);
thumbnailer.colorTransferFuncProxy.setPresetName(presetName);
const ctRange = getColorFunctionRangeFromPreset(presetName);
thumbnailer.colorTransferFuncProxy.setDataRange(
...(ctRange || imageDataRange)
);
thumbnailer.colorTransferFuncProxy.setDataRange(...colorRange);

thumbnailer.resetCameraWithOrientation(
cameraDirVec.value,
Expand Down Expand Up @@ -157,13 +153,20 @@ export function useVolumeThumbnailing(
.catch(logError);
});

// Relative presets map onto the fit range, which arrives after loading.
const fitRange = computed(
() =>
currentImageID.value &&
imageStatsStore.stats[currentImageID.value]?.autoRangeValues?.LowContrast
);

// trigger thumbnailing
watch(
currentImageID,
(imageID) => {
if (imageID) {
doThumbnailing(imageID, currentImageData.value!);
}
[currentImageID, fitRange],
([imageID], previous) => {
if (!imageID) return;
if (imageID === previous?.[0]) delete thumbnails[imageID];
doThumbnailing(imageID, currentImageData.value!);
},
{ immediate: true }
);
Expand Down
4 changes: 3 additions & 1 deletion src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,14 @@ export const STROKE_WIDTH_ANNOTATION_TOOL_DEFAULT = 1;

export const DEFAULT_PRESET_BY_MODALITY: Record<string, string> = {
CT: 'CT-AAA',
MR: 'CT-Coronary-Arteries-2',
MR: 'MR-Default',
US: 'US-Fetal',
};

export const DEFAULT_PRESET = 'CT-AAA';

export const DEFAULT_GRAYSCALE_PRESET = 'Grayscale';

// Keyboard shortcuts/hotkeys. Can add modifiers: 'Shift+Ctrl+a'
export const ACTION_TO_KEY = {
windowLevel: 'l',
Expand Down
1 change: 1 addition & 0 deletions src/io/state-file/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ const OpacityPoints = z.object({
shift: z.number(),
shiftAlpha: z.number(),
mappingRange: z.tuple([z.number(), z.number()]),
fitRange: z.tuple([z.number(), z.number()]).optional(),
}) satisfies z.ZodType<OpacityPoints>;

const OpacityNodes = z.object({
Expand Down
Loading
Loading