administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-09 04:35:25 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Get working

Browse Source
This commit is contained in:
Nicolas Mowen 2024-03-04 14:25:53 -07:00
parent 6c400e6717
commit 40baad4a4f
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/src/components/timeline/MotionSegment.tsx
View File

@ -1,6 +1,6 @@
import { useEventUtils } from "@/hooks/use-event-utils"; import { useEventUtils } from "@/hooks/use-event-utils";
import { useEventSegmentUtils } from "@/hooks/use-event-segment-utils"; import { useEventSegmentUtils } from "@/hooks/use-event-segment-utils";
import { ReviewSegment } from "@/types/review"; import { MotionData, ReviewSegment } from "@/types/review";
import React, { import React, {
RefObject, RefObject,
useCallback, useCallback,
@ -10,13 +10,12 @@ import React, {
} from "react"; } from "react";
import scrollIntoView from "scroll-into-view-if-needed"; import scrollIntoView from "scroll-into-view-if-needed";
import { MinimapBounds, Tick, Timestamp } from "./segment-metadata"; import { MinimapBounds, Tick, Timestamp } from "./segment-metadata";
import { MockMotionData } from "@/pages/UIPlayground";
import { useMotionSegmentUtils } from "@/hooks/use-motion-segment-utils"; import { useMotionSegmentUtils } from "@/hooks/use-motion-segment-utils";
import { isMobile } from "react-device-detect"; import { isMobile } from "react-device-detect";
type MotionSegmentProps = { type MotionSegmentProps = {
events: ReviewSegment[]; events: ReviewSegment[];
motion_events: MockMotionData[]; motion_events: MotionData[];
segmentTime: number; segmentTime: number;
segmentDuration: number; segmentDuration: number;
timestampSpread: number; timestampSpread: number;

16
web/src/hooks/use-motion-segment-utils.ts
View File

@ -1,9 +1,9 @@
import { useCallback, useMemo } from "react"; import { useCallback, useMemo } from "react";
import { MockMotionData } from "@/pages/UIPlayground"; import { MotionData } from "@/types/review";
export const useMotionSegmentUtils = ( export const useMotionSegmentUtils = (
segmentDuration: number, segmentDuration: number,
motion_events: MockMotionData[], motion_events: MotionData[],
) => { ) => {
const halfSegmentDuration = useMemo( const halfSegmentDuration = useMemo(
() => segmentDuration / 2, () => segmentDuration / 2,
@ -42,12 +42,12 @@ export const useMotionSegmentUtils = (
(time: number): number => { (time: number): number => {
const matchingEvent = motion_events.find((event) => { const matchingEvent = motion_events.find((event) => {
return ( return (
time >= getSegmentStart(event.start_time) && time > getSegmentStart(event.start_time) &&
time < getSegmentEnd(event.start_time) time <= getSegmentEnd(event.start_time)
); );
}); });
return matchingEvent?.motionValue ?? 0; return matchingEvent?.motion ?? 0;
}, },
[motion_events, getSegmentStart, getSegmentEnd], [motion_events, getSegmentStart, getSegmentEnd],
); );
@ -56,12 +56,12 @@ export const useMotionSegmentUtils = (
(time: number): number => { (time: number): number => {
const matchingEvent = motion_events.find((event) => { const matchingEvent = motion_events.find((event) => {
return ( return (
time >= getSegmentStart(event.start_time) && time > getSegmentStart(event.start_time) &&
time < getSegmentEnd(event.start_time) time <= getSegmentEnd(event.start_time)
); );
}); });
return matchingEvent?.audioValue ?? 0; return matchingEvent?.audio ?? 0;
}, },
[motion_events, getSegmentStart, getSegmentEnd], [motion_events, getSegmentStart, getSegmentEnd],
); );

6
web/src/views/events/EventView.tsx
View File

@ -567,7 +567,11 @@ function MotionReview({
const { data: motionData } = useSWR<MotionData[]>([ const { data: motionData } = useSWR<MotionData[]>([
"review/activity", "review/activity",
{ before: timeRange.before, after: timeRange.after }, {
before: timeRange.before,
after: timeRange.after,
scale: segmentDuration / 2,
},
]); ]);
// timeline time // timeline time