Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion src/app/dashboard/page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Layout from '@/components/Layout';
import { Toaster } from "react-hot-toast";
import type { Metadata } from "next";
import MosaicDashboardClient from "./MosaicDashboardClient";

Expand All @@ -11,6 +12,7 @@ export default function Dashboard() {
return (
<Layout>
<MosaicDashboardClient />
<Toaster />
</Layout>
);
}
}
1 change: 0 additions & 1 deletion src/components/VideoCustomPresetForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ const VideoCustomPresetForm: React.FC<CustomPresetFormProps> = ({ onSubmit }) =>
const handleSubmit = (e: React.FormEvent) => {
e.preventDefault();
const preset: VideoOutRequest = {
num_sources: sources.length,
sources,
};
onSubmit(preset);
Expand Down
90 changes: 31 additions & 59 deletions src/components/VideoPresetsPanel.tsx
Original file line number Diff line number Diff line change
@@ -1,70 +1,24 @@
"use client";

import React from "react";
import { VideoOutRequest } from "./panels/VideoControls";
import React, { useEffect, useState } from "react";
import { VideoOutRequest, VideoSource } from "./panels/VideoControls";
import ROSLIB from "roslib";
import { useROS } from "@/ros/ROSContext";

interface VideoPresetsPanelProps {
onPresetSelect: (presetName: string, preset: VideoOutRequest) => void;
}

type VideoPreset = {
name: string;
sources: VideoSource[];
}

const VideoPresetsPanel: React.FC<VideoPresetsPanelProps> = ({
onPresetSelect,
}) => {
const presets: { name: string; preset: VideoOutRequest }[] = [
{
name: "Drive",
preset: {
num_sources: 1,
sources: [{ name: "Drive", width: 100, height: 100, origin_x: 0, origin_y: 0 }],
},
},
{
name: "EEF",
preset: {
num_sources: 1,
sources: [{ name: "EndEffector", width: 100, height: 100, origin_x: 0, origin_y: 0 }],
},
},
{
name: "Science",
preset: {
num_sources: 4,
sources: [
{ name: "Microscope", width: 50, height: 50, origin_x: 0, origin_y: 0 },
{ name: "Strip", width: 50, height: 50, origin_x: 50, origin_y: 0 },
{ name: "Benedict", width: 50, height: 50, origin_x: 0, origin_y: 50 },
{ name: "HCL", width: 50, height: 50, origin_x: 50, origin_y: 50 },
],
},
},
{
name: "Belly",
preset: {
num_sources: 1,
sources: [{ name: "Bottom", width: 100, height: 100, origin_x: 0, origin_y: 0 }],
},
},
{
name: "Drive + EEF",
preset: {
num_sources: 2,
sources: [
{ name: "Drive", width: 100, height: 100, origin_x: 0, origin_y: 0 },
{ name: "EndEffector", width: 30, height: 30, origin_x: 70, origin_y: 0 },
],
},
},
{
name: "EEF + Drive",
preset: {
num_sources: 2,
sources: [
{ name: "EndEffector", width: 100, height: 100, origin_x: 0, origin_y: 0 },
{ name: "Drive", width: 30, height: 30, origin_x: 70, origin_y: 0 },
],
},
},
];
const { ros, connectionStatus: rosStatus } = useROS();
const [presets, setPresets] = useState<VideoPreset[]>([]);

const buttonStyle = (): React.CSSProperties => ({
border: "1px solid #444",
Expand All @@ -76,6 +30,24 @@ const VideoPresetsPanel: React.FC<VideoPresetsPanelProps> = ({
whiteSpace: "nowrap",
});

useEffect(() => {
if (!ros) {
console.error("ROS connection is not established.");
return;
}
const getPresetsClient = new ROSLIB.Service({
ros: ros,
name: "/list_presets",
serviceType: "interfaces/srv/GetPresets",
});

const request = new ROSLIB.ServiceRequest({});
getPresetsClient.callService(request, (response) => {
if (response) {
setPresets(response.presets);
}
});
}, [ros]);
return (
<div
style={{
Expand All @@ -85,11 +57,11 @@ const VideoPresetsPanel: React.FC<VideoPresetsPanelProps> = ({
gap: "0.5rem",
}}
>
{presets.map(({ name, preset }) => (
{presets.map(({ name, sources }) => (
<button
key={name}
style={buttonStyle()}
onClick={() => onPresetSelect(name, preset)}
onClick={() => onPresetSelect(name, { sources: sources })}
>
{name}
</button>
Expand Down
12 changes: 6 additions & 6 deletions src/components/panels/VideoControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import ROSLIB from "roslib";
import { useROS } from "@/ros/ROSContext";
import VideoPresetsPanel from "../VideoPresetsPanel";
import RtpStats from "../RtpStats";
import toast from "react-hot-toast";

export interface VideoSource {
name: string;
Expand All @@ -15,17 +16,13 @@ export interface VideoSource {
}

export interface VideoOutRequest {
num_sources: number;
sources: VideoSource[];
}

interface VideoOutResponse {
success: boolean;
}

interface VideoOutResponse {
success: boolean;
}
const VideoControls: React.FC = () => {
const { ros, connectionStatus: rosStatus } = useROS();

Expand Down Expand Up @@ -63,7 +60,9 @@ const VideoControls: React.FC = () => {
startVideoSrv.callService(
new ROSLIB.ServiceRequest(camRequest),
(response: VideoOutResponse) => {
console.log(response.success ? "Success" : "Failed");
if (!response.success) {
toast.error("Failed to select preset: " + presetName)
}
},
);
};
Expand All @@ -78,6 +77,7 @@ const VideoControls: React.FC = () => {
topic.publish(new ROSLIB.Message({}));
console.log("Stream restart triggered");
};

const callVideoCaptureService = (serviceName: string, filename: string = "") => {
if (!ros || rosStatus !== "connected") return;

Expand Down Expand Up @@ -288,4 +288,4 @@ const VideoControls: React.FC = () => {
);
};

export default VideoControls;
export default VideoControls;
Loading