diff --git a/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue b/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue index a42264186..38505dee0 100644 --- a/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue +++ b/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue @@ -27,6 +27,7 @@ const changeCurrentCameraIndex = (index: number) => { break; case PipelineType.ObjectDetection: pipelineType.value = WebsocketPipelineType.ObjectDetection; + break; } }; @@ -124,6 +125,18 @@ const cancelPipelineNameEdit = () => { const showPipelineCreationDialog = ref(false); const newPipelineName = ref(""); const newPipelineType = ref(useCameraSettingsStore().currentWebsocketPipelineType); +const validNewPipelineTypes = computed(() => { + const pipelineTypes = [ + { name: "Reflective", value: WebsocketPipelineType.Reflective }, + { name: "Colored Shape", value: WebsocketPipelineType.ColoredShape }, + { name: "AprilTag", value: WebsocketPipelineType.AprilTag }, + { name: "Aruco", value: WebsocketPipelineType.Aruco } + ]; + if (useSettingsStore().general.rknnSupported) { + pipelineTypes.push({ name: "Object Detection", value: WebsocketPipelineType.ObjectDetection }); + } + return pipelineTypes; +}); const showCreatePipelineDialog = () => { newPipelineName.value = ""; newPipelineType.value = useCameraSettingsStore().currentWebsocketPipelineType; @@ -359,13 +372,7 @@ useCameraSettingsStore().$subscribe((mutation, state) => { :select-cols="12 - 3" label="Tracking Type" tooltip="Pipeline type, which changes the type of processing that will happen on input frames" - :items="[ - { name: 'Reflective', value: WebsocketPipelineType.Reflective }, - { name: 'Colored Shape', value: WebsocketPipelineType.ColoredShape }, - { name: 'AprilTag', value: WebsocketPipelineType.AprilTag }, - { name: 'Aruco', value: WebsocketPipelineType.Aruco }, - { name: 'Object Detection', value: WebsocketPipelineType.ObjectDetection } - ]" + :items="validNewPipelineTypes" /> diff --git a/photon-client/src/components/dashboard/tabs/AprilTagTab.vue b/photon-client/src/components/dashboard/tabs/AprilTagTab.vue index 359c54f0f..a7b017d38 100644 --- a/photon-client/src/components/dashboard/tabs/AprilTagTab.vue +++ b/photon-client/src/components/dashboard/tabs/AprilTagTab.vue @@ -14,13 +14,12 @@ const currentPipelineSettings = computed( () => useCameraSettingsStore().currentPipelineSettings ); -const interactiveCols = computed( - () => - (getCurrentInstance()?.proxy.$vuetify.breakpoint.mdAndDown || false) && - (!useStateStore().sidebarFolded || useCameraSettingsStore().isDriverMode) -) - ? 9 - : 8; +const interactiveCols = computed(() => + (getCurrentInstance()?.proxy.$vuetify.breakpoint.mdAndDown || false) && + (!useStateStore().sidebarFolded || useCameraSettingsStore().isDriverMode) + ? 9 + : 8 +);