diff --git a/apps/visr/src/components/tomography/CameraViewer.tsx b/apps/visr/src/components/tomography/CameraViewer.tsx
deleted file mode 100644
index fcc80a53..00000000
--- a/apps/visr/src/components/tomography/CameraViewer.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Box, Typography } from "@mui/material";
-
-export default function CameraViewer() {
- // static image showing camera view/projection feed
- return (
-
-
-
- Camera View
-
-
-
-
-
-
-
- );
-}
diff --git a/apps/visr/src/components/tomography/SliceViewer.tsx b/apps/visr/src/components/tomography/SliceViewer.tsx
index 132ad5fa..c3b8def6 100644
--- a/apps/visr/src/components/tomography/SliceViewer.tsx
+++ b/apps/visr/src/components/tomography/SliceViewer.tsx
@@ -1,4 +1,4 @@
-import { Box, Typography } from "@mui/material";
+import { Box } from "@mui/material";
import { Plane } from "./PlaneEnum";
import { HeatmapPlot } from "@diamondlightsource/davidia";
import ndarray from "ndarray";
@@ -39,44 +39,12 @@ export default function SliceViewer({
}
return (
-
-
-
- Slice View
-
-
-
-
-
-
+
);
}
diff --git a/apps/visr/src/components/tomography/TomographyPlots.tsx b/apps/visr/src/components/tomography/TomographyPlots.tsx
index d0d33376..4ce3026c 100644
--- a/apps/visr/src/components/tomography/TomographyPlots.tsx
+++ b/apps/visr/src/components/tomography/TomographyPlots.tsx
@@ -1,9 +1,8 @@
-import { Box } from "@mui/material";
-import CameraViewer from "./CameraViewer";
-import VolumeViewer from "./VolumeViewer";
+import { Box, Typography } from "@mui/material";
import SliceViewer from "./SliceViewer";
import { Plane } from "./PlaneEnum";
import { ReactGridLayout, useContainerWidth } from "react-grid-layout";
+import VolumeRenderer from "./VolumeRenderer";
interface Props {
volumeData: Uint8Array;
@@ -17,7 +16,6 @@ interface Props {
function TomographyPlots({
volumeData,
volumeShape,
- volumeVisible,
plane,
slice,
drawerOpen,
@@ -35,11 +33,14 @@ function TomographyPlots({
if (!volumeData) return ;
const views = [
- ,
- ,
+ ,
,
];
+ const titles = ["Camera View", "Reconstruction", "Slice View"];
const plots = views.map((view, i) => (
+
+
+ {titles[i]}
+
+
{view}
));
diff --git a/apps/visr/src/components/tomography/VolumeViewer.tsx b/apps/visr/src/components/tomography/VolumeViewer.tsx
deleted file mode 100644
index 13ae0341..00000000
--- a/apps/visr/src/components/tomography/VolumeViewer.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Box, Typography } from "@mui/material";
-import VolumeRenderer from "./VolumeRenderer";
-
-interface Props {
- volumeData: Uint8Array;
- volumeShape: [number, number, number];
- visible: boolean;
- // revolve?: boolean
-}
-
-// Currently loads a static test volume from public/test-data/
-export default function VolumeViewer({
- volumeData,
- volumeShape,
- visible,
-}: Props) {
- return (
-
-
-
- Reconstruction
-
-
-
- {visible && volumeData && volumeShape ? (
-
- ) : (
-
- ...
-
- )}
-
- );
-}