mirror of
https://github.com/PhotonVision/photonvision
synced 2026-07-01 02:41:42 +00:00
Show Saved Snapshots in UI (#995)
Add Camera Control tab to Cameras for the button to live in
This commit is contained in:
@@ -7,3 +7,14 @@ $heading-font-family: $default-font;
|
|||||||
.v-application {
|
.v-application {
|
||||||
font-family: $default-font !important;
|
font-family: $default-font !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.v-row-group__header {
|
||||||
|
background: #005281 !important;
|
||||||
|
}
|
||||||
|
.theme--dark.v-data-table
|
||||||
|
> .v-data-table__wrapper
|
||||||
|
> table
|
||||||
|
> tbody
|
||||||
|
> tr:hover:not(.v-data-table__expanded__content):not(.v-data-table__empty-wrapper) {
|
||||||
|
background: #005281 !important;
|
||||||
|
}
|
||||||
|
|||||||
@@ -218,7 +218,7 @@ const endCalibration = () => {
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<v-card class="pr-6 pb-3" color="primary" dark>
|
<v-card class="mb-3 pr-6 pb-3" color="primary" dark>
|
||||||
<v-card-title>Camera Calibration</v-card-title>
|
<v-card-title>Camera Calibration</v-card-title>
|
||||||
<div class="ml-5">
|
<div class="ml-5">
|
||||||
<v-row>
|
<v-row>
|
||||||
|
|||||||
202
photon-client/src/components/cameras/CameraControlCard.vue
Normal file
202
photon-client/src/components/cameras/CameraControlCard.vue
Normal file
@@ -0,0 +1,202 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { ref } from "vue";
|
||||||
|
import axios from "axios";
|
||||||
|
import { useStateStore } from "@/stores/StateStore";
|
||||||
|
|
||||||
|
interface SnapshotMetadata {
|
||||||
|
snapshotName: string;
|
||||||
|
cameraNickname: string;
|
||||||
|
streamType: "input" | "output";
|
||||||
|
timeCreated: Date;
|
||||||
|
}
|
||||||
|
const getSnapshotMetadataFromName = (snapshotName: string): SnapshotMetadata => {
|
||||||
|
snapshotName = snapshotName.replace(/\.[^/.]+$/, "");
|
||||||
|
|
||||||
|
const data = snapshotName.split("_");
|
||||||
|
|
||||||
|
const cameraName = data.slice(0, data.length - 2).join("_");
|
||||||
|
const streamType = data[data.length - 2] as "input" | "output";
|
||||||
|
const dateStr = data[data.length - 1];
|
||||||
|
|
||||||
|
const year = parseInt(dateStr.substring(0, 4), 10);
|
||||||
|
const month = parseInt(dateStr.substring(5, 7), 10) - 1; // Months are zero-based
|
||||||
|
const day = parseInt(dateStr.substring(8, 10), 10);
|
||||||
|
const hours = parseInt(dateStr.substring(11, 13), 10);
|
||||||
|
const minutes = parseInt(dateStr.substring(13, 15), 10);
|
||||||
|
const seconds = parseInt(dateStr.substring(15, 17), 10);
|
||||||
|
const milliseconds = parseInt(dateStr.substring(17), 10);
|
||||||
|
|
||||||
|
return {
|
||||||
|
snapshotName: snapshotName,
|
||||||
|
cameraNickname: cameraName,
|
||||||
|
streamType: streamType,
|
||||||
|
timeCreated: new Date(year, month, day, hours, minutes, seconds, milliseconds)
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
interface Snapshot {
|
||||||
|
index: number;
|
||||||
|
snapshotName: string;
|
||||||
|
snapshotShortName: string;
|
||||||
|
cameraUniqueName: string;
|
||||||
|
cameraNickname: string;
|
||||||
|
streamType: "input" | "output";
|
||||||
|
timeCreated: Date;
|
||||||
|
snapshotSrc: string;
|
||||||
|
}
|
||||||
|
const imgData = ref<Snapshot[]>([]);
|
||||||
|
const fetchSnapshots = () => {
|
||||||
|
axios
|
||||||
|
.get("/utils/getImageSnapshots")
|
||||||
|
.then((response) => {
|
||||||
|
imgData.value = response.data.map(
|
||||||
|
(snapshotData: { snapshotName: string; cameraUniqueName: string; snapshotData: string }, index) => {
|
||||||
|
const metadata = getSnapshotMetadataFromName(snapshotData.snapshotName);
|
||||||
|
|
||||||
|
return {
|
||||||
|
index: index,
|
||||||
|
snapshotName: snapshotData.snapshotName,
|
||||||
|
snapshotShortName: metadata.snapshotName,
|
||||||
|
cameraUniqueName: snapshotData.cameraUniqueName,
|
||||||
|
cameraNickname: metadata.cameraNickname,
|
||||||
|
streamType: metadata.streamType,
|
||||||
|
timeCreated: metadata.timeCreated,
|
||||||
|
snapshotSrc: "data:image/jpg;base64," + snapshotData.snapshotData
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
showSnapshotViewerDialog.value = true;
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
if (error.response) {
|
||||||
|
useStateStore().showSnackbarMessage({
|
||||||
|
color: "error",
|
||||||
|
message: error.response.data.text || error.response.data
|
||||||
|
});
|
||||||
|
} else if (error.request) {
|
||||||
|
useStateStore().showSnackbarMessage({
|
||||||
|
color: "error",
|
||||||
|
message: "Error while trying to process the request! The backend didn't respond."
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
useStateStore().showSnackbarMessage({
|
||||||
|
color: "error",
|
||||||
|
message: "An error occurred while trying to process the request."
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
const showSnapshotViewerDialog = ref(false);
|
||||||
|
const expanded = ref([]);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<v-card dark class="pr-6 pb-3" style="background-color: #006492">
|
||||||
|
<v-card-title>Camera Control</v-card-title>
|
||||||
|
<v-row class="pl-6">
|
||||||
|
<v-col>
|
||||||
|
<v-btn color="secondary" @click="fetchSnapshots">
|
||||||
|
<v-icon left> mdi-folder </v-icon>
|
||||||
|
Show Saved Snapshots
|
||||||
|
</v-btn>
|
||||||
|
</v-col>
|
||||||
|
</v-row>
|
||||||
|
<v-dialog v-model="showSnapshotViewerDialog">
|
||||||
|
<v-card dark class="pt-3 pl-5 pr-5" color="primary" flat>
|
||||||
|
<v-card-title> View Saved Frame Snapshots </v-card-title>
|
||||||
|
<v-divider />
|
||||||
|
<v-card-text v-if="imgData.length === 0" style="font-size: 18px; font-weight: 600" class="pt-4">
|
||||||
|
There are no snapshots saved
|
||||||
|
</v-card-text>
|
||||||
|
<div v-else class="pb-2">
|
||||||
|
<v-data-table
|
||||||
|
v-model:expanded="expanded"
|
||||||
|
:headers="[
|
||||||
|
{ text: 'Snapshot Name', value: 'snapshotShortName', sortable: false },
|
||||||
|
{ text: 'Camera Unique Name', value: 'cameraUniqueName' },
|
||||||
|
{ text: 'Camera Nickname', value: 'cameraNickname' },
|
||||||
|
{ text: 'Stream Type', value: 'streamType' },
|
||||||
|
{ text: 'Time Created', value: 'timeCreated' },
|
||||||
|
{ text: 'Actions', value: 'actions', sortable: false }
|
||||||
|
]"
|
||||||
|
:items="imgData"
|
||||||
|
group-by="cameraUniqueName"
|
||||||
|
class="elevation-0"
|
||||||
|
item-key="index"
|
||||||
|
show-expand
|
||||||
|
expand-icon="mdi-eye"
|
||||||
|
>
|
||||||
|
<template #expanded-item="{ headers, item }">
|
||||||
|
<td :colspan="headers.length">
|
||||||
|
<div style="display: flex; justify-content: center; width: 100%">
|
||||||
|
<img :src="item.snapshotSrc" alt="snapshot-image" class="snapshot-preview pt-2 pb-2" />
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</template>
|
||||||
|
<!-- eslint-disable-next-line vue/valid-v-slot-->
|
||||||
|
<template #item.actions="{ item }">
|
||||||
|
<div style="display: flex; justify-content: center">
|
||||||
|
<a :download="item.snapshotName" :href="item.snapshotSrc">
|
||||||
|
<v-icon small> mdi-download </v-icon>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</v-data-table>
|
||||||
|
<span
|
||||||
|
>Snapshot Timestamps may be incorrect as they depend on when the coprocessor was last connected to the
|
||||||
|
internet</span
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</v-card>
|
||||||
|
</v-dialog>
|
||||||
|
</v-card>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped lang="scss">
|
||||||
|
.v-divider {
|
||||||
|
border-color: white !important;
|
||||||
|
}
|
||||||
|
.v-btn {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
.v-data-table {
|
||||||
|
text-align: center;
|
||||||
|
background-color: #006492 !important;
|
||||||
|
|
||||||
|
th,
|
||||||
|
td {
|
||||||
|
background-color: #005281 !important;
|
||||||
|
font-size: 1rem !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
tbody :hover tr {
|
||||||
|
background-color: #005281 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-scrollbar {
|
||||||
|
width: 0;
|
||||||
|
height: 0.55em;
|
||||||
|
border-radius: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-scrollbar-track {
|
||||||
|
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
|
||||||
|
border-radius: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-scrollbar-thumb {
|
||||||
|
background-color: #ffd843;
|
||||||
|
border-radius: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.snapshot-preview {
|
||||||
|
max-width: 55%;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media only screen and (max-width: 512px) {
|
||||||
|
.snapshot-preview {
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -5,6 +5,7 @@ import { useCameraSettingsStore } from "@/stores/settings/CameraSettingsStore";
|
|||||||
import { computed } from "vue";
|
import { computed } from "vue";
|
||||||
import CamerasView from "@/components/cameras/CamerasView.vue";
|
import CamerasView from "@/components/cameras/CamerasView.vue";
|
||||||
import { useStateStore } from "@/stores/StateStore";
|
import { useStateStore } from "@/stores/StateStore";
|
||||||
|
import CameraControlCard from "@/components/cameras/CameraControlCard.vue";
|
||||||
|
|
||||||
const cameraViewType = computed<number[]>({
|
const cameraViewType = computed<number[]>({
|
||||||
get: (): number[] => {
|
get: (): number[] => {
|
||||||
@@ -40,6 +41,7 @@ const cameraViewType = computed<number[]>({
|
|||||||
<v-col cols="12" md="7">
|
<v-col cols="12" md="7">
|
||||||
<CamerasCard />
|
<CamerasCard />
|
||||||
<CalibrationCard />
|
<CalibrationCard />
|
||||||
|
<CameraControlCard />
|
||||||
</v-col>
|
</v-col>
|
||||||
<v-col class="pl-md-3 pt-3 pt-md-0" cols="12" md="5">
|
<v-col class="pl-md-3 pt-3 pt-md-0" cols="12" md="5">
|
||||||
<CamerasView v-model="cameraViewType" />
|
<CamerasView v-model="cameraViewType" />
|
||||||
|
|||||||
@@ -47,14 +47,16 @@ public class FileSaveFrameConsumer implements Consumer<CVMat> {
|
|||||||
private final String ntEntryName;
|
private final String ntEntryName;
|
||||||
private IntegerEntry saveFrameEntry;
|
private IntegerEntry saveFrameEntry;
|
||||||
|
|
||||||
|
private final String cameraUniqueName;
|
||||||
private String cameraNickname;
|
private String cameraNickname;
|
||||||
private final String streamType;
|
private final String streamType;
|
||||||
|
|
||||||
private long savedImagesCount = 0;
|
private long savedImagesCount = 0;
|
||||||
|
|
||||||
public FileSaveFrameConsumer(String camNickname, String streamPrefix) {
|
public FileSaveFrameConsumer(String camNickname, String cameraUniqueName, String streamPrefix) {
|
||||||
this.ntEntryName = streamPrefix + NT_SUFFIX;
|
this.ntEntryName = streamPrefix + NT_SUFFIX;
|
||||||
this.cameraNickname = camNickname;
|
this.cameraNickname = camNickname;
|
||||||
|
this.cameraUniqueName = cameraUniqueName;
|
||||||
this.streamType = streamPrefix;
|
this.streamType = streamPrefix;
|
||||||
|
|
||||||
this.rootTable = NetworkTablesManager.getInstance().kRootTable;
|
this.rootTable = NetworkTablesManager.getInstance().kRootTable;
|
||||||
@@ -74,7 +76,15 @@ public class FileSaveFrameConsumer implements Consumer<CVMat> {
|
|||||||
|
|
||||||
String fileName =
|
String fileName =
|
||||||
cameraNickname + "_" + streamType + "_" + df.format(now) + "T" + tf.format(now);
|
cameraNickname + "_" + streamType + "_" + df.format(now) + "T" + tf.format(now);
|
||||||
String saveFilePath = FILE_PATH + File.separator + fileName + FILE_EXTENSION;
|
|
||||||
|
// Check if the Unique Camera directory exists and create it if it doesn't
|
||||||
|
String cameraPath = FILE_PATH + File.separator + this.cameraUniqueName;
|
||||||
|
var cameraDir = new File(cameraPath);
|
||||||
|
if (!cameraDir.exists()) {
|
||||||
|
cameraDir.mkdir();
|
||||||
|
}
|
||||||
|
|
||||||
|
String saveFilePath = cameraPath + File.separator + fileName + FILE_EXTENSION;
|
||||||
|
|
||||||
Imgcodecs.imwrite(saveFilePath, image.getMat());
|
Imgcodecs.imwrite(saveFilePath, image.getMat());
|
||||||
|
|
||||||
|
|||||||
@@ -176,10 +176,15 @@ public class VisionModule {
|
|||||||
this.outputStreamPort = 1181 + (camStreamIdx * 2) + 1;
|
this.outputStreamPort = 1181 + (camStreamIdx * 2) + 1;
|
||||||
|
|
||||||
inputFrameSaver =
|
inputFrameSaver =
|
||||||
new FileSaveFrameConsumer(visionSource.getSettables().getConfiguration().nickname, "input");
|
new FileSaveFrameConsumer(
|
||||||
|
visionSource.getSettables().getConfiguration().nickname,
|
||||||
|
visionSource.getSettables().getConfiguration().uniqueName,
|
||||||
|
"input");
|
||||||
outputFrameSaver =
|
outputFrameSaver =
|
||||||
new FileSaveFrameConsumer(
|
new FileSaveFrameConsumer(
|
||||||
visionSource.getSettables().getConfiguration().nickname, "output");
|
visionSource.getSettables().getConfiguration().nickname,
|
||||||
|
visionSource.getSettables().getConfiguration().uniqueName,
|
||||||
|
"output");
|
||||||
|
|
||||||
String camHostname = CameraServerJNI.getHostname();
|
String camHostname = CameraServerJNI.getHostname();
|
||||||
inputVideoStreamer =
|
inputVideoStreamer =
|
||||||
|
|||||||
@@ -21,15 +21,14 @@ import com.fasterxml.jackson.core.JsonProcessingException;
|
|||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import io.javalin.http.Context;
|
import io.javalin.http.Context;
|
||||||
import io.javalin.http.UploadedFile;
|
import io.javalin.http.UploadedFile;
|
||||||
import java.io.File;
|
import java.io.*;
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.FileNotFoundException;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
import javax.imageio.ImageIO;
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.io.FileUtils;
|
||||||
import org.photonvision.common.configuration.ConfigManager;
|
import org.photonvision.common.configuration.ConfigManager;
|
||||||
import org.photonvision.common.configuration.NetworkConfig;
|
import org.photonvision.common.configuration.NetworkConfig;
|
||||||
@@ -526,6 +525,43 @@ public class RequestHandler {
|
|||||||
ctx.status(204);
|
ctx.status(204);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void onImageSnapshotsRequest(Context ctx) {
|
||||||
|
var snapshots = new ArrayList<HashMap<String, Object>>();
|
||||||
|
var cameraDirs = ConfigManager.getInstance().getImageSavePath().toFile().listFiles();
|
||||||
|
|
||||||
|
if (cameraDirs != null) {
|
||||||
|
try {
|
||||||
|
for (File cameraDir : cameraDirs) {
|
||||||
|
var cameraSnapshots = cameraDir.listFiles();
|
||||||
|
if (cameraSnapshots == null) continue;
|
||||||
|
|
||||||
|
String cameraUniqueName = cameraDir.getName();
|
||||||
|
|
||||||
|
for (File snapshot : cameraSnapshots) {
|
||||||
|
var snapshotData = new HashMap<String, Object>();
|
||||||
|
|
||||||
|
var bufferedImage = ImageIO.read(snapshot);
|
||||||
|
var buffer = new ByteArrayOutputStream();
|
||||||
|
ImageIO.write(bufferedImage, "jpg", buffer);
|
||||||
|
byte[] data = buffer.toByteArray();
|
||||||
|
|
||||||
|
snapshotData.put("snapshotName", snapshot.getName());
|
||||||
|
snapshotData.put("cameraUniqueName", cameraUniqueName);
|
||||||
|
snapshotData.put("snapshotData", data);
|
||||||
|
|
||||||
|
snapshots.add(snapshotData);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (IOException e) {
|
||||||
|
ctx.status(500);
|
||||||
|
ctx.result("Unable to read saved images");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.status(200);
|
||||||
|
ctx.json(snapshots);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a temporary file using the UploadedFile from Javalin.
|
* Create a temporary file using the UploadedFile from Javalin.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -97,6 +97,7 @@ public class Server {
|
|||||||
app.post("/api/utils/restartProgram", RequestHandler::onProgramRestartRequest);
|
app.post("/api/utils/restartProgram", RequestHandler::onProgramRestartRequest);
|
||||||
app.post("/api/utils/restartDevice", RequestHandler::onDeviceRestartRequest);
|
app.post("/api/utils/restartDevice", RequestHandler::onDeviceRestartRequest);
|
||||||
app.post("/api/utils/publishMetrics", RequestHandler::onMetricsPublishRequest);
|
app.post("/api/utils/publishMetrics", RequestHandler::onMetricsPublishRequest);
|
||||||
|
app.get("/api/utils/getImageSnapshots", RequestHandler::onImageSnapshotsRequest);
|
||||||
|
|
||||||
// Calibration
|
// Calibration
|
||||||
app.post("/api/calibration/end", RequestHandler::onCalibrationEndRequest);
|
app.post("/api/calibration/end", RequestHandler::onCalibrationEndRequest);
|
||||||
|
|||||||
Reference in New Issue
Block a user