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.

Sign up for GitHub

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

Camera disconnected + stream normalization improvements #1701

Merged
merged 12 commits into from
Jan 14, 2025
Merged

Camera disconnected + stream normalization improvements #1701

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3faec81
fix disconnected camera logic
DevonRD Jan 11, 2025
6603e88
better stream height normalization
DevonRD Jan 11, 2025
c7aeb41
lint
DevonRD Jan 11, 2025
4fc7954
Merge branch 'main' into main
DevonRD Jan 11, 2025
a17efab
Merge branch 'main' into main
DevonRD Jan 12, 2025
899f787
update error text on blue background
DevonRD Jan 13, 2025
cdf8ffc
Merge branch 'main' of https://github.com/DevonRD/photonvision
DevonRD Jan 13, 2025
be14d58
Merge branch 'main' into main
DevonRD Jan 13, 2025
f48f141
Merge branch 'main' into main
mcm001 Jan 14, 2025
2b51e9c
change loader
DevonRD Jan 14, 2025
ccfae53
Merge branch 'main' of https://github.com/DevonRD/photonvision
DevonRD Jan 14, 2025
55e0246
?
DevonRD Jan 14, 2025
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
Binary file added photon-client/src/assets/images/loading-transparent.gif
View file
Open in desktop
DevonRD marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 11 additions & 5 deletions photon-client/src/components/app/photon-camera-stream.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<script setup lang="ts">
import { computed, inject, ref, onBeforeUnmount } from "vue";
import { useStateStore } from "@/stores/StateStore";
import loadingImage from "@/assets/images/loading.svg";
import loadingImage from "@/assets/images/loading-transparent.gif";
import type { StyleValue } from "vue/types/jsx";
import PvIcon from "@/components/common/pv-icon.vue";
import type { UiCameraConfiguration } from "@/types/SettingTypes";

const props = defineProps<{
streamType: "Raw" | "Processed";
id: string;
outerId?: string;
cameraSettings: UiCameraConfiguration;
}>();

Expand Down Expand Up @@ -91,7 +90,7 @@ onBeforeUnmount(() => {
</script>

<template>
<div :id="outerId" class="stream-container" :style="containerStyle">
<div class="stream-container" :style="containerStyle">
<img :src="loadingImage" class="stream-loading" />
<img
:id="id"
Expand Down Expand Up @@ -131,18 +130,25 @@ onBeforeUnmount(() => {
display: flex;
position: relative;
width: 100%;
height: 100%;
max-width: 100%;
max-height: 100%;
justify-content: center;
align-items: center;
}

.stream-loading {
position: absolute;
width: 100%;
height: 100%;
width: 25%;
height: 25%;
object-fit: contain;
}

.stream-video {
position: absolute;
width: 100%;
height: 100%;
object-fit: contain;
}

.stream-overlay {
Expand Down
8 changes: 4 additions & 4 deletions photon-client/src/components/common/pv-camera-info-card.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ const cameraInfoFor: any = (camera: PVCameraInfo) => {
<td>Path:</td>
<td style="word-break: break-all">{{ cameraInfoFor(camera).path }}</td>
</tr>
<tr v-if="cameraInfoFor(camera).otherPaths !== undefined && cameraInfoFor(camera).otherPaths !== null">
<td>Other Paths:</td>
<td>{{ cameraInfoFor(camera).otherPaths }}</td>
</tr>
<tr v-if="cameraInfoFor(camera).uniquePath !== undefined && cameraInfoFor(camera).uniquePath !== null">
<td>Unique Path:</td>
<td style="word-break: break-all">{{ cameraInfoFor(camera).uniquePath }}</td>
</tr>
<tr v-if="cameraInfoFor(camera).otherPaths !== undefined && cameraInfoFor(camera).otherPaths !== null">
<td>Other Paths:</td>
<td>{{ cameraInfoFor(camera).otherPaths }}</td>
</tr>
</tbody>
</v-simple-table>
</div>
Expand Down
16 changes: 8 additions & 8 deletions photon-client/src/components/common/pv-camera-match-card.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,6 @@ const cameraInfoFor = (camera: PVCameraInfo): any => {
<td style="word-break: break-all">{{ cameraInfoFor(saved).path }}</td>
<td style="word-break: break-all">{{ cameraInfoFor(current).path }}</td>
</tr>
<tr
v-if="cameraInfoFor(saved).otherPaths !== undefined && cameraInfoFor(saved).otherPaths !== null"
:class="!_.isEqual(cameraInfoFor(saved).otherPaths, cameraInfoFor(current).otherPaths) ? 'mismatch' : ''"
>
<td>Other Paths:</td>
<td>{{ cameraInfoFor(saved).otherPaths }}</td>
<td>{{ cameraInfoFor(current).otherPaths }}</td>
</tr>
<tr
v-if="cameraInfoFor(saved).uniquePath !== undefined && cameraInfoFor(saved).uniquePath !== null"
:class="cameraInfoFor(saved).uniquePath !== cameraInfoFor(current).uniquePath ? 'mismatch' : ''"
Expand All @@ -111,6 +103,14 @@ const cameraInfoFor = (camera: PVCameraInfo): any => {
<td style="word-break: break-all">{{ cameraInfoFor(saved).uniquePath }}</td>
<td style="word-break: break-all">{{ cameraInfoFor(current).uniquePath }}</td>
</tr>
<tr
v-if="cameraInfoFor(saved).otherPaths !== undefined && cameraInfoFor(saved).otherPaths !== null"
:class="!_.isEqual(cameraInfoFor(saved).otherPaths, cameraInfoFor(current).otherPaths) ? 'mismatch' : ''"
>
<td>Other Paths:</td>
<td>{{ cameraInfoFor(saved).otherPaths }}</td>
<td>{{ cameraInfoFor(current).otherPaths }}</td>
</tr>
</tbody>
</v-simple-table>
</div>
Expand Down
6 changes: 3 additions & 3 deletions photon-client/src/components/settings/ObjectDetectionCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const supportedModels = computed(() => {
<div class="pa-6 pt-0">
<v-row>
<v-col cols="12 ">
<v-btn color="secondary" @click="() => (showObjectDetectionImportDialog = true)" class="justify-center">
<v-btn color="secondary" class="justify-center" @click="() => (showObjectDetectionImportDialog = true)">
<v-icon left class="open-icon"> mdi-import </v-icon>
<span class="open-label">Import New Model</span>
</v-btn>
Expand All @@ -92,10 +92,10 @@ const supportedModels = computed(() => {
named <code>note-640-640-yolov5s-labels.txt</code>. Note that ONLY 640x640 YOLOv5 & YOLOv8 models
trained and converted to `.rknn` format for RK3588 CPUs are currently supported!
<v-row class="mt-6 ml-4 mr-8">
<v-file-input label="RKNN File" v-model="importRKNNFile" accept=".rknn" />
<v-file-input v-model="importRKNNFile" label="RKNN File" accept=".rknn" />
</v-row>
<v-row class="mt-6 ml-4 mr-8">
<v-file-input label="Labels File" v-model="importLabelsFile" accept=".txt" />
<v-file-input v-model="importLabelsFile" label="Labels File" accept=".txt" />
</v-row>
<v-row
class="mt-12 ml-8 mr-8 mb-1"
Expand Down
Loading
Loading