Skip to content

added rover state info tab with ros bridge integration #10

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

Open
ShivamAmin05 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

added rover state info tab with ros bridge integration #10

Show file tree
Hide file tree
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
Binary file modified umdloop_gui_web/__pycache__/ros_bridge.cpython-310.pyc
View file
Open in desktop
Binary file not shown.
112 changes: 32 additions & 80 deletions umdloop_gui_web/app/GUI functions/Navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"use client";

import React, { useEffect, useState } from "react";
import RoverStateDashboard from "./RoverStateDashboard";

export default function Navigation({ selectedNavItem }) {
const [running, setRunning] = useState(false);
Expand Down Expand Up @@ -79,7 +80,6 @@ export default function Navigation({ selectedNavItem }) {

useEffect(() => {
if (selectedNavItem !== "Object Detection") return undefined;

fetchStatus();
const id = setInterval(fetchStatus, 1000);
return () => clearInterval(id);
Expand All @@ -92,51 +92,27 @@ export default function Navigation({ selectedNavItem }) {

return (
<div>
<h1>{selectedNavItem} - Navigation Mode</h1>

{/* ── Object Detection ── */}
{selectedNavItem === "Object Detection" && (
<div style={{ display: "flex", flexDirection: "column", alignItems: "center", gap: "16px" }}>
<div
style={{
display: "flex",
gap: "12px",
alignItems: "center",
padding: "12px 16px",
borderRadius: "14px",
border: "2px solid #1f1e1eff",
background: "#2b2b2b",
color: "white",
width: "fit-content",
display: "flex", gap: "12px", alignItems: "center",
padding: "12px 16px", borderRadius: "14px",
border: "2px solid #1f1e1eff", background: "#2b2b2b", color: "white", width: "fit-content",
}}
>
<div
style={{
padding: "6px 12px",
borderRadius: "9999px",
fontWeight: 800,
background: running ? "#1f7a1f" : "#8a1f1f",
}}
>
<div style={{ padding: "6px 12px", borderRadius: "9999px", fontWeight: 800, background: running ? "#1f7a1f" : "#8a1f1f" }}>
{running ? "RUNNING ✅" : "STOPPED ❌"}
</div>

<div style={{ opacity: 0.9 }}>
PID: <span style={{ fontWeight: 700 }}>{pid ?? "—"}</span>
</div>

<div style={{ opacity: 0.9 }}>PID: <span style={{ fontWeight: 700 }}>{pid ?? "—"}</span></div>
{error && <div style={{ color: "#ffb3b3", fontWeight: 700 }}>{error}</div>}
</div>

<div style={{ display: "flex", gap: "10px" }}>
<button onClick={startDetection} style={{ cursor: "pointer", padding: "10px 16px", borderRadius: "9999px", border: "2px solid #1f1e1eff", background: "#3d3d3d", color: "white", fontWeight: 800 }}>
Start
</button>
<button onClick={stopDetection} style={{ cursor: "pointer", padding: "10px 16px", borderRadius: "9999px", border: "2px solid #1f1e1eff", background: "#3d3d3d", color: "white", fontWeight: 800 }}>
Stop
</button>
<button onClick={fetchStatus} style={{ cursor: "pointer", padding: "10px 16px", borderRadius: "9999px", border: "2px solid #1f1e1eff", background: "#3d3d3d", color: "white", fontWeight: 800 }}>
Refresh
</button>
<button onClick={startDetection} style={{ cursor: "pointer", padding: "10px 16px", borderRadius: "9999px", border: "2px solid #1f1e1eff", background: "#3d3d3d", color: "white", fontWeight: 800 }}>Start</button>
<button onClick={stopDetection} style={{ cursor: "pointer", padding: "10px 16px", borderRadius: "9999px", border: "2px solid #1f1e1eff", background: "#3d3d3d", color: "white", fontWeight: 800 }}>Stop</button>
<button onClick={fetchStatus} style={{ cursor: "pointer", padding: "10px 16px", borderRadius: "9999px", border: "2px solid #1f1e1eff", background: "#3d3d3d", color: "white", fontWeight: 800 }}>Refresh</button>
</div>

<div style={{ textAlign: "center" }}>
Expand All @@ -146,81 +122,57 @@ export default function Navigation({ selectedNavItem }) {
</div>
)}

{/* ── Control Panel ── */}
{selectedNavItem === "Control Panel" && (
<div style={{ display: "flex", flexDirection: "column", alignItems: "center", gap: "16px" }}>
<div
style={{
padding: "18px 20px",
borderRadius: "14px",
border: "2px solid #1f1e1eff",
background: "#2b2b2b",
color: "white",
width: "520px",
textAlign: "left",
}}
>
<div style={{ padding: "18px 20px", borderRadius: "14px", border: "2px solid #1f1e1eff", background: "#2b2b2b", color: "white", width: "520px", textAlign: "left" }}>
<h2 style={{ marginTop: 0 }}>Control Panel</h2>

<div style={{ display: "flex", gap: "12px" }}>
<div style={{ flex: 1 }}>
<label style={{ fontWeight: 800, display: "block", marginBottom: 6 }}>Latitude</label>
<input value={latitude} onChange={(e) => setLatitude(e.target.value)} placeholder="e.g. 38.4239116" style={{ width: "100%", padding: "10px 12px", borderRadius: "10px", border: "2px solid #1f1e1eff", background: "#3d3d3d", color: "white", outline: "none" }} />
<input value={latitude} onChange={(e) => setLatitude(e.target.value)} placeholder="e.g. 38.4239116"
style={{ width: "100%", padding: "10px 12px", borderRadius: "10px", border: "2px solid #1f1e1eff", background: "#3d3d3d", color: "white", outline: "none" }} />
</div>

<div style={{ flex: 1 }}>
<label style={{ fontWeight: 800, display: "block", marginBottom: 6 }}>Longitude</label>
<input value={longitude} onChange={(e) => setLongitude(e.target.value)} placeholder="e.g. -110.7849055" style={{ width: "100%", padding: "10px 12px", borderRadius: "10px", border: "2px solid #1f1e1eff", background: "#3d3d3d", color: "white", outline: "none" }} />
<input value={longitude} onChange={(e) => setLongitude(e.target.value)} placeholder="e.g. -110.7849055"
style={{ width: "100%", padding: "10px 12px", borderRadius: "10px", border: "2px solid #1f1e1eff", background: "#3d3d3d", color: "white", outline: "none" }} />
</div>
</div>

<div style={{ marginTop: 16 }}>
<div style={{ fontWeight: 800, marginBottom: 8 }}>Mode</div>

{["GNSS", "Object Detection", "Aruco Tag"].map((opt) => (
<label
key={opt}
style={{
display: "flex",
alignItems: "center",
gap: "10px",
padding: "8px 10px",
borderRadius: "12px",
border: "2px solid #1f1e1eff",
background: navMode === opt ? "#262626ff" : "#3d3d3d",
cursor: "pointer",
marginBottom: 10,
}}
>
<label key={opt} style={{
display: "flex", alignItems: "center", gap: "10px",
padding: "8px 10px", borderRadius: "12px",
border: "2px solid #1f1e1eff", background: navMode === opt ? "#262626ff" : "#3d3d3d",
cursor: "pointer", marginBottom: 10,
}}>
<input type="radio" name="navMode" value={opt} checked={navMode === opt} onChange={() => setNavMode(opt)} style={{ transform: "scale(1.2)" }} />
<span style={{ fontWeight: 800 }}>{opt}</span>
</label>
))}
</div>

<div style={{ marginTop: 6, opacity: 0.9 }}>
<button
onClick={onPathPlan}
style={{
marginTop: "18px",
width: "100%",
padding: "12px 16px",
borderRadius: "9999px",
border: "2px solid #1f1e1eff",
background: "#530000ff",
color: "white",
fontWeight: 900,
fontSize: "16px",
cursor: "pointer",
}}
>
<button onClick={onPathPlan} style={{
marginTop: "18px", width: "100%", padding: "12px 16px",
borderRadius: "9999px", border: "2px solid #1f1e1eff",
background: "#530000ff", color: "white", fontWeight: 900, fontSize: "16px", cursor: "pointer",
}}>
Path Plan
</button>
{pathPlanStatus ? <div style={{ marginTop: "10px", color: "#d8d8d8", fontWeight: 700 }}>{pathPlanStatus}</div> : null}
{error ? <div style={{ marginTop: "6px", color: "#ffb3b3", fontWeight: 700 }}>{error}</div> : null}
{pathPlanStatus && <div style={{ marginTop: "10px", color: "#d8d8d8", fontWeight: 700 }}>{pathPlanStatus}</div>}
{error && <div style={{ marginTop: "6px", color: "#ffb3b3", fontWeight: 700 }}>{error}</div>}
</div>
</div>
</div>
)}

{/* ── Rover State */}
{selectedNavItem === "Rover State" && <RoverStateDashboard />}
</div>
);
}
Loading