Skip to content

Changed canvas height sizing to auto instead of fixed value. #56

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

Merged
merged 1 commit into from
Jul 22, 2025
Merged

Changed canvas height sizing to auto instead of fixed value. #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 20 additions & 6 deletions src/components/OavVideoStream.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
import { Box } from "@mui/material";
import { PvComponent, PvItem, PvDescription, useParsedPvConnection } from "../pv/PvComponent";
import {
PvComponent,
PvItem,
PvDescription,
useParsedPvConnection,
} from "../pv/PvComponent";
import { parseNumericPv, pvIntArrayToString } from "../pv/util";
import React from "react";

export const useContainerDimensions = (ref: React.MutableRefObject<HTMLHeadingElement | null>) => {
export const useContainerDimensions = (
ref: React.MutableRefObject<HTMLHeadingElement | null>
) => {
const [dimensions, setDimensions] = React.useState({ width: 0, height: 0 });
React.useEffect(() => {
const getDimensions = () => ({
Expand Down Expand Up @@ -62,7 +69,10 @@ export function OavVideoStream(
label: props.label,
render: (props: PvItem) => {
const value = props.value ? props.value : "undefined";
if (!streamUrl.startsWith("http") && value.toString().startsWith("http")) {
if (
!streamUrl.startsWith("http") &&
value.toString().startsWith("http")
) {
setStreamUrl(value.toString());
}
return (
Expand Down Expand Up @@ -130,7 +140,7 @@ function VideoBoxWithOverlay(props: {
/>
<canvas
width={width}
height={height}
height="auto"
ref={canvasRef}
style={{
top: 0,
Expand All @@ -148,8 +158,12 @@ function VideoBoxWithOverlay(props: {
// x and y relative to the crosshair
const [relX, relY] = [x - props.crosshairX, y - props.crosshairY];
// fraction of the image in x/y * original dimension in pixels
const scaledX = props.originalDims ? (relX / width) * props.originalDims.width : x;
const scaledY = props.originalDims ? (relY / height) * props.originalDims.height : y;
const scaledX = props.originalDims
? (relX / width) * props.originalDims.width
: x;
const scaledY = props.originalDims
? (relY / height) * props.originalDims.height
: y;
props.onCoordClick(scaledX, scaledY);
}
}
Expand Down