+
+
+ } />
+ } />
+ } />
+ } />
+
+
+
+
);
}
diff --git a/frontend/src/LandingPage.jsx b/frontend/src/LandingPage.jsx
new file mode 100644
index 000000000..aaa61cb82
--- /dev/null
+++ b/frontend/src/LandingPage.jsx
@@ -0,0 +1,198 @@
+import React, { useEffect } from 'react';
+import { useState } from 'react';
+import { Link } from 'react-router-dom';
+import { makeStyles } from '@mui/styles';
+import Box from '@mui/material/Box';
+import Button from '@mui/material/Button';
+import Modal from '@mui/material/Modal';
+import Typography from '@mui/material/Typography';
+import ReportDashboard from './components/ReportDashboard';
+
+const useStyles = makeStyles((theme) => ({
+ landingPage: {
+ fontFamily: 'Roboto, sans-serif',
+ color: '#fff',
+ display: 'flex',
+ flexDirection: 'column',
+ alignItems: 'center',
+ minHeight: '100vh',
+ },
+ nav: {
+ display: 'flex',
+ justifyContent: 'space-between',
+ alignItems: 'center',
+ padding: '1.5rem',
+ //backgroundColor: '#0000CD',
+ fontFamily: 'Arial, sans-serif',
+ width: '100%',
+ },
+ siteTitle: {
+ color: '#fff',
+ textDecoration: 'none',
+ fontSize: '1.5rem',
+ fontWeight: 'bold',
+ fontFamily: 'Arial, sans-serif',
+ },
+ mainContent: {
+ padding: '1rem',
+ // marginTop: '3rem',
+ },
+ buttonContainer: {
+ position: 'absolute',
+ top: '6rem',
+ right: '2rem',
+ display: 'flex',
+ justifyContent: 'flex-end',
+ marginTop: '1rem',
+ },
+ navList: {
+ listStyleType: 'none',
+ margin: 0,
+ padding: 0,
+ fontFamily: 'Arial, sans-serif',
+ },
+ navListItem: {
+ display: 'inline-block',
+ marginLeft: '1rem',
+ },
+ aboutLink: {
+ textDecoration: 'none',
+ color: '#fff',
+ padding: '0.5rem 1rem',
+ borderRadius: '30px',
+ cursor: 'pointer',
+ },
+ acceptanceReportLink: {
+ textDecoration: 'underline',
+ color: '#800080',
+ cursor: 'pointer',
+ fontWeight: 'bold',
+ display: 'block',
+ marginBottom: '1rem',
+ },
+ reportDashboardTitle: {
+ textDecoration: 'underline',
+ color: '#800080',
+ fontWeight: 'bold',
+ fontSize: '1.5rem',
+ marginBottom: '1rem',
+ cursor: 'pointer',
+ textAlign: 'center',
+ },
+ createSimulationLink: {
+ textDecoration: 'none',
+ display: 'block',
+ width: 'fit-content',
+ },
+}));
+
+const modalStyle = {
+ position: 'absolute',
+ top: '50%',
+ left: '50%',
+ transform: 'translate(-50%, -50%)',
+ width: 800,
+ height: 400,
+ bgcolor: 'background.paper',
+ border: '2px solid #000',
+ boxShadow: 24,
+ padding: '4',
+};
+
+export default function LandingPage() {
+ const classes = useStyles();
+ const [filesPresent, setFilesPresent] = useState(false);
+ const [open, setOpen] = useState(false);
+
+
+ useEffect(() => {
+ const fetchData = async () => {
+ try {
+ const response = await fetch('http://localhost:5000/list-reports', { method: 'GET' })
+ const data = await response.json();
+ const batchFiles = data.reports.filter(file => file.filename.includes('Batch'));
+ setFilesPresent(batchFiles.length > 0);
+ } catch (error) {
+ console.error('Error fetching report data:', error);
+ }
+ };
+
+ fetchData();
+ }, []);
+
+ const handleAccordionToggle = () => {
+ console.log('Accordion toggled');
+ };
+
+ return (
+
+
+
+
+ );
+}
\ No newline at end of file
diff --git a/frontend/src/components/AboutUs.jsx b/frontend/src/components/AboutUs.jsx
new file mode 100644
index 000000000..4938289da
--- /dev/null
+++ b/frontend/src/components/AboutUs.jsx
@@ -0,0 +1,16 @@
+import CardMedia from '@mui/material/CardMedia'
+import Box from '@mui/material/Box';
+import ListItem from '@mui/material/ListItem';
+import ListItemText from '@mui/material/ListItemText';
+import Paper from '@mui/material/Paper';
+import CheckIcon from '@mui/icons-material/Check';
+import List from '@mui/material/List'
+import ClearIcon from '@mui/icons-material/Clear';
+import InfoIcon from '@mui/icons-material/Info';
+import { useLocation } from "react-router-dom";
+import { Container } from '@mui/material';
+import Grid from '@mui/material/Grid';
+import Button from '@mui/material/Button';
+
+export default function AboutUs(parameter) {
+}
\ No newline at end of file
diff --git a/frontend/src/components/Configuration/DroneConfiguration.jsx b/frontend/src/components/Configuration/DroneConfiguration.jsx
index 03ca9e532..826ff08ec 100644
--- a/frontend/src/components/Configuration/DroneConfiguration.jsx
+++ b/frontend/src/components/Configuration/DroneConfiguration.jsx
@@ -24,16 +24,6 @@ const droneTypes = [
{value:'MultiRotor', label:'Multi Rotor'}
]
-{/* Old stuff from draft PR
-
-const droneModels = [
- {value: 'ParrotANAFI', label: 'Parrot ANAFI'},
- {value: 'DJI', label: 'DJI'},
- {value: 'StreamLineDesignX189', label: 'StreamLineDesign X189'}
-]
-
-*/}
-
//{/*
const droneModels = {
FixedWing: [
@@ -65,7 +55,6 @@ export default function DroneConfiguration (droneData) {
// != null ? droneData.droneObject : {
// VehicleType: "SimpleFlight",
// DefaultVehicleState: "Armed",
- // PawnPath: "",
// EnableCollisionPassthrogh: false,
// EnableCollisions: true,
// AllowAPIAlways: true,
@@ -152,15 +141,19 @@ export default function DroneConfiguration (droneData) {
const handleDroneTypeChange = (event) => {
handleSnackBarVisibility(true)
setselectedDroneType(event.target.value)
- // setDrone(prevState => ({
- // ...prevState,
- // droneType: event.target.value
- // }));
+ setDrone(prevState => ({
+ ...prevState,
+ droneType: event.target.value
+ }));
};
const handleDroneModelChange = (event) => {
handleSnackBarVisibility(true)
setSelectedModel(event.target.value);
+ setDrone(prevState => ({
+ ...prevState,
+ droneModel: event.target.value
+ }));
};
@@ -310,7 +303,7 @@ export default function DroneConfiguration (droneData) {
+
+
+
+
+ {filesPresent ? (
+
+
+
+
+
+
+
+ ) : (
+
+
+
+ {/* Content here */}
+
+
+
+
+
+ )}
+ Welcome to DRV!
+
+
+
+
+
+
+
+
-
-
- {barometer.Key}
-
-
-
-
-
-
-
- {/*
-
- */}
- {/*
-
-
-
-
-
-
-
-
-
-
- */}
-
-
+ // const setDefaultBarometer = () => {
+ // setBarometer(prevState => ({
+ // ...prevState,
+ // ...sensor.barometerObj,
+ // PressureFactorSigma: '0.001825',
+ // PressureFactorTau: '3600',
+ // UncorrelatedNoiseSigma: '2.7',
+ // UpdateLatency: '0',
+ /// UpdateFrequency: '50',
+ // StartupDelay: '0'
+// }))
+ // }
+
+
+ return(
+
+
+
+
+
+
+
+)
}
\ No newline at end of file
diff --git a/frontend/src/components/Configuration/SensorsConfiguration/GPS.jsx b/frontend/src/components/Configuration/SensorsConfiguration/GPS.jsx
index a92185469..6f59d231a 100644
--- a/frontend/src/components/Configuration/SensorsConfiguration/GPS.jsx
+++ b/frontend/src/components/Configuration/SensorsConfiguration/GPS.jsx
@@ -10,44 +10,173 @@ import Switch from '@mui/material/Switch';
import Tooltip from '@mui/material/Tooltip';
+//const defaultGps = {
+ // EphTimeConstant: 0.9,
+ //EpvTimeConstant: 0.9,
+ // EphInitial: 25,
+ // EpvInitial: 25,
+ // EphFinal: 0.1,
+ // EpvFinal: 0.1,
+ // EphMin3d: 3,
+// EphMin2d: 4,
+ // UpdateLatency: 0.2,
+ // UpdateFrequency: 50,
+ // StartupDelay: 1
+ // };
+
export default function GPS (sensor) {
- const[gps, setGps] = React.useState(sensor.gPSObj)
+ const[gps, setGps] = React.useState(sensor.gPSObj || {})
+
React.useEffect(() => {
- sensor.updateJson(gps, sensor.name)
- }, [gps])
+ sensor.updateJson(gps, sensor.name)
+ }, [gps]);
+
+ //React.useEffect(() => {
+ // setGps({
+ // ...gps,
+ // ...defaultGps
+ // });
+ // }, []);
const closeModal = () => {
sensor.closeModal(gps, sensor.name)
}
- const handleChangeSwitch = (val) => {
- setGps(prevState => ({
- ...prevState,
- Enabled: val.target.checked
- }))
- }
+ //const handleChangeSwitch = (val) => {
+ // setGps(prevState => ({
+ // ...prevState,
+ // Enabled: val.target.checked
+ // }))
+ //}
+
+ const tooltips = {
+ EphTimeConstant: "Tooltip text...",
+ EpvTimeConstant: "Tooltip text...",
+ }
+
+ const handleChange = (event) => {
+ const { id, value } = event.target;
+ const parsedValue = event.target.type === 'number' ? parseFloat(value) : value;
+
+ setGps((prevGps) => ({
+ ...prevGps,
+ [id]: parsedValue,
+ }));
+ };
- const handleChange = (val) => {
- setGps(prevState => ({
- ...prevState,
- [val.target.id]: val.target.type === "number" ? parseInt(val.target.value, 10) : val.target.value
- }))
- }
+
+ const handleReset = () => {
+ setGps(sensor.gPSObj);
+ };
+
+ // });
return(
-
+
+
+ {barometer.Key || ""}
+
+
+
+
+
+
+
+
+
-
-
-
- {/*
-
- */}
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
- )
+
-
-
- {gps.Key}
-
-
-
-
+
+
+
+
)
-}
\ No newline at end of file
+}
diff --git a/frontend/src/components/Configuration/SensorsConfiguration/Magnetometer.jsx b/frontend/src/components/Configuration/SensorsConfiguration/Magnetometer.jsx
index 62e8c2627..e9db2df3b 100644
--- a/frontend/src/components/Configuration/SensorsConfiguration/Magnetometer.jsx
+++ b/frontend/src/components/Configuration/SensorsConfiguration/Magnetometer.jsx
@@ -7,17 +7,20 @@ import Button from '@mui/material/Button';
import FormGroup from '@mui/material/FormGroup';
import FormControlLabel from '@mui/material/FormControlLabel';
import Switch from '@mui/material/Switch';
-import Tooltip from '@mui/material/Tooltip';
+import Tooltip from '@mui/material/Tooltip';
+import Snackbar from '@mui/material/Snackbar';
+import Alert from '@mui/material/Alert';
+
export default function Magnetometer (sensor) {
- const [magnetometer, setMagnetometer] = React.useState(sensor.magnetometerObj)
+ const [magnetometer, setMagnetometer] = React.useState(sensor.magnetometerObj || {})
- const handleChangeSwitch = (val) => {
- setMagnetometer(prevState => ({
- ...prevState,
- Enabled: val.target.checked
- }))
- }
+ //const handleChangeSwitch = (val) => {
+ // setMagnetometer(prevState => ({
+ // ...prevState,
+ // Enabled: val.target.checked
+ // }))
+ // }
React.useEffect(() => {
sensor.updateJson(magnetometer, sensor.name)
@@ -28,19 +31,45 @@ export default function Magnetometer (sensor) {
sensor.closeModal(magnetometer, sensor.name)
}
- const handleChange = (val) => {
- setMagnetometer(prevState => ({
+ const handleChange = (event) => {
+ const { id, value } = event.target;
+ const parsedValue = event.target.type === 'number' ? parseFloat(value) : value;
+ setMagnetometer((prevMagnetometer) => ({
+ ...prevMagnetometer,
+ [id]: parsedValue,
+ }));
+ };
+
+ const handleReset = () => {
+ setMagnetometer(sensor.magnetometerObj);
+ };
+ const [snackBarState, setSnackBarState] = React.useState({
+ open: true,
+ });
+
+ const handleSnackBarVisibility = (val) => {
+ setSnackBarState(prevState => ({
...prevState,
- [val.target.id]: val.target.type === "number" ? parseInt(val.target.value, 10) : val.target.value
+ open: val
}))
}
return(
+
+ {gps.Key || ""}
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{/*
*/}
@@ -77,23 +206,55 @@ export default function GPS (sensor) {
- */}
+ */}
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{/*
*/}
-
+
+
-
+
-
-
-
+
+ {/* handleSnackBarVisibility(false)}>
+ handleSnackBarVisibility(false)} severity="info" sx={{ width: '100%' }}>
+ {"Magnetometer Changes is under Developement !"}
+
+ */}
- {magnetometer.Key}
-
+ {magnetometer.Key || ""}
+
@@ -48,34 +77,78 @@ export default function Magnetometer (sensor) {
- {/*
-
- */}
- {/*
-
-
-
-
-
-
+
+
+
+
+
+
+
-
- */}
-
+
-
+
+
+
-
- {/*
-
- */}
-
+
-
+
-
+
)
diff --git a/frontend/src/components/EnvironmentConfiguration.jsx b/frontend/src/components/EnvironmentConfiguration.jsx
index 30322b1a5..a1375a8a8 100644
--- a/frontend/src/components/EnvironmentConfiguration.jsx
+++ b/frontend/src/components/EnvironmentConfiguration.jsx
@@ -1,4 +1,5 @@
-import * as React from 'react'
+//import * as React from 'react'
+import React, { useState, useEffect } from 'react';
import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import Grid from '@mui/material/Grid';
@@ -26,16 +27,34 @@ import IconButton from '@mui/material/IconButton';
import CloseIcon from '@mui/icons-material/Close';
import AddIcon from '@mui/icons-material/Add';
import DialogTitle from '@mui/material/DialogTitle';
+import Checkbox from '@mui/material/Checkbox';
import { DeleteOutline } from '@mui/icons-material';
import Snackbar from '@mui/material/Snackbar';
import Alert from '@mui/material/Alert';
-
-export default function EnvironmentConfiguration (env) {
+export default function EnvironmentConfiguration (env) {
+ const [backendInfo, setBackendInfo] = useState({
+ numQueuedTasks: 0,
+ backendStatus: 'idle'
+ });
const [currentPosition, setCurrentPosition] = React.useState({
lat: 41.980381,
lng: -87.934524
- });
+ });
+ const getStatusStyle = () => {
+ switch (backendInfo.backendStatus) {
+ case 'idle':
+ return { color: 'green' }; // Green color and a checkmark icon
+ case 'running':
+ return { color: 'blue'}; // Blue color and a rotating arrow icon
+ case 'error':
+ return { color: 'red' }; // Red color and a cross icon
+ default:
+ return { color: 'gray' }; // Gray color and an information
+ }
+ };
+ const statusStyle = getStatusStyle();
+
const YOUR_API_KEY="AIzaSyAh_7ie16ikloOrjqURycdAan3INZ1qgiQ"
const onMapClick = (e) => {
setCurrentPosition({ lat: e.latLng.lat(), lng: e.latLng.lng() });
@@ -48,40 +67,44 @@ export default function EnvironmentConfiguration (env) {
}
}))
- }
+ }
const [envConf, setEnvConf] = React.useState(env.mainJsonValue.environment != null ? env.mainJsonValue.environment : {
enableFuzzy: false,
+ timeOfDayFuzzy: false,
+ positionFuzzy: false,
+ windFuzzy: false,
Wind: {
- Distance: "NE",
- Force: 1,
+ Direction: "NE",
+ Velocity: 1,
//Type: "None",
//WindOrigin: "None",
},
Origin: {
Latitude: 41.980381,
Longitude: -87.934524,
+ Height: 2,
},
TimeOfDay: "10:00:00",
UseGeo: true,
+ UseCFD: true,
time:dayjs('2020-01-01 10:00')
- });
-
+ });
+
const handleChangeSwitch = (val) => {
setEnvConf(prevState => ({
...prevState,
enableFuzzy: val.target.checked
}))
- }
-
+ }
const environmentJson = (event) => {
env.environmentJson(event, env.id);
- }
-
+ }
+ //new added
React.useEffect(() => {
environmentJson(envConf)
}, [envConf])
- const Distance = [
+ const Direction = [
{value:'N', id:5},
{value:'S', id:6},
{value:'E', id:7},
@@ -124,13 +147,19 @@ export default function EnvironmentConfiguration (env) {
);
// Fluctuation Percentage
- const [selectedFluctuationValue, setSelectedFluctuationValue] = React.useState(0.0);
+ const [fluctuationPercentage, setSelectedFluctuationValue] = React.useState(0.0);
+
+ // Check Box Status for Fuzzy Testing
+ const [windBoxStatus , setWindBox] = React.useState(true);
+ const [timeBoxStatus, setTimeBox] = React.useState(true);
+ const [positionBoxStatus, setPositionBox] = React.useState(true);
+ const [fuzzyAlert, setFuzzyAlert] = React.useState(false);
const Origin = [
{value:"Chicago O’Hare Airport", id:20},
// {value:"Michigan Lake Beach", id:10},
{value:"Specify Region", id:30}
- ]
+ ]
const OriginValues = [
{value: "Michigan Lake Beach", Latitude:42.211223, Longitude:-86.390394, Height:170},
@@ -144,6 +173,7 @@ export default function EnvironmentConfiguration (env) {
TimeOfDay: val.$H + ':' + val.$m + ':' + val.$s
}))
}
+ /*
const handleWindChange = (val) => {
setEnvConf(prevState => ({
...prevState,
@@ -152,8 +182,18 @@ export default function EnvironmentConfiguration (env) {
[val.target.id]: val.target.type === "number" ? parseFloat(val.target.value) : 0
}
}))
- }
-
+ }
+ */
+ const handleWindChange = (val) => {
+ setEnvConf((prevState) => ({
+ ...prevState,
+ Wind: {
+ ...prevState.Wind,
+ Velocity: val.target.type === "number" ? parseFloat(val.target.value) : 0,
+ },
+ // UseCFD: true,
+ }));
+ };
const handleOriginChange = (val) => {
setEnvConf(prevState => ({
...prevState,
@@ -163,7 +203,36 @@ export default function EnvironmentConfiguration (env) {
}
}))
}
+ const handleCheckboxChange = (checkboxName) => {
+ setFuzzyAlert(true);
+ handleSnackBarVisibility(true);
+ // Used to determine the status of the checkbox
+ let newStatus;
+
+ // Calculate the number of checkboxes that are currently checked
+ const currentWindStatus = checkboxName === 'wind' ? !windBoxStatus : windBoxStatus;
+ const currentTimeStatus = checkboxName === 'time' ? !timeBoxStatus : timeBoxStatus;
+ const currentPositionStatus = checkboxName === 'position' ? !positionBoxStatus : positionBoxStatus;
+
+ // Count the number of checkboxes that are currently checked
+ const checkedCount = [currentWindStatus, currentTimeStatus, currentPositionStatus].filter(Boolean).length;
+
+ if (checkedCount >= 1 ) {
+ // allows toggling if there is more then one true value
+ newStatus = !eval(checkboxName + 'BoxStatus');
+ } else {
+ // Do not allow toggling when only one checkbox is checked
+ newStatus = eval(checkboxName + 'BoxStatus');
+ }
+ // Toggle the checkbox based on its name
+ if (checkboxName === 'wind') {
+ setWindBox(newStatus);
+ } else if (checkboxName === 'time') {
+ setTimeBox(newStatus);
+ } else if (checkboxName === 'position') {
+ setPositionBox(newStatus);
+ }};
// HANDLE WIND ORIGIN
{/*
@@ -181,12 +250,43 @@ export default function EnvironmentConfiguration (env) {
};
*/}
+ const handleWindTypeChange = (event) => {
+ setFuzzyAlert(false);
+ handleSnackBarVisibility(true);
+ const newWindType = event.target.value;
+ setSelectedWindType(newWindType);
+
+ setEnvConf((prevState) => ({
+ ...prevState,
+ Wind: {
+ ...prevState.Wind,
+ Type: newWindType,
+ Fluctuation: newWindType === "Turbulent Wind" ? fluctuationPercentage : 0,
+ },
+ }));
+ };
+
+ const handleFLuctuationChange = (event) => {
+ const newFlucValue = event.target.value;
+ setSelectedFluctuationValue(newFlucValue);
+
+ setEnvConf((prevState) => ({
+ ...prevState,
+ Wind: {
+ ...prevState.Wind,
+ Fluctuation: newFlucValue,
+ },
+ }));
+ };
+
+ /*
const handleFLuctuationChange = (event) => {
const newFlucValue = event.target.value;
setSelectedFluctuationValue(newFlucValue);
}
const handleWindTypeChange = (event) => {
+ setFuzzyAlert(false)
handleSnackBarVisibility(true)
const newWindType = event.target.value;
setSelectedWindType(newWindType);
@@ -198,19 +298,20 @@ export default function EnvironmentConfiguration (env) {
Type: newWindType,
},
}));
- */}
+ }
};
-
- const handleDistance = (val) => {
+
+ */
+ const handleDirection = (val) => {
setEnvConf(prevState => ({
...prevState,
Wind: {
...prevState.Wind,
- Distance: val.target.value
+ Direction: val.target.value
}
}))
}
-
+
const handleOrigin = (val) => {
if(val.target.value != "Specify Region") {
let originValue
@@ -241,8 +342,48 @@ export default function EnvironmentConfiguration (env) {
}
}))
}
-
- }
+ }
+ //new added
+ // useEffect(() => {
+ // const interval = setInterval(() => {
+ // fetch('http://localhost:5000/currentRunning')
+ // .then((res) => {
+ // if (!res.ok) {
+ // throw new Error('No response from server/something went wrong');
+ // }
+ // return res.text();
+ // })
+ // .then((data) => {
+ // const [status, queueSize] = data.split(', ');
+ // console.log('Simulation Status,', status, 'Queue Size:', queueSize);
+ // if (status === "None") {
+ // setBackendInfo({ numQueuedTasks: 0, backendStatus: 'idle' });
+ // } else if (status === "Running") {
+ // setBackendInfo({ numQueuedTasks: parseInt(queueSize), backendStatus: 'running' });
+ // }
+ // })
+ // .catch((error) => {
+ // console.error('Error fetching data:', error);
+ // setBackendInfo({ numQueuedTasks: -1, backendStatus: 'error' });
+ // });
+ // }, 2000);
+
+ // return () => clearInterval(interval);
+ // }, []);
+
+
+// return (
+//
+//
+// {/* */}
+//
+//
+// {/*
+// Wind
+// */}
+//
+
+// }
//WIND SHEAR WINDOW FUNCTIONS
const [windShears, setwindShears] = React.useState([]);
@@ -286,16 +427,168 @@ export default function EnvironmentConfiguration (env) {
fluctuationPercentage: 0,
});
};
+/*
+ const handleShearWindDirection = (e, id) => {
+ console.log(id)
+ const newArry = windShears.map((shear, index) => {
+
+ console.log('direction-----', shear)
+ if(id == index) {
+ return {
+ ...shear,
+ windDirection: e
+ }
+ } else {
+ return shear
+ }
+ })
+ setwindShears(newArry)
+}
+
+const handleShearWindChange = (e, id) => {
+ const newArry = windShears.map((shear, index) => {
+ if(id == index) {
+ return {
+ ...shear,
+ windVelocity: e
+ }
+ } else {
+ return shear
+ }
+ })
+ setwindShears(newArry)
+}
+
+const handleShearfluctuationPercentageChange = (e, id) => {
+ const newArry = windShears.map((shear, index) => {
+ if(id == index) {
+ return {
+ ...shear,
+ fluctuationPercentage: e
+ }
+ } else {
+ return shear
+ }
+ })
+ setwindShears(newArry)
+} */
+const handleShearWindDirection = (e, index) => {
+ const newArry = windShears.map((shear, i) => {
+ if (i === index) {
+ return {
+ ...shear,
+ windDirection: e,
+ };
+ }
+ return shear;
+ });
+ setwindShears(newArry);
+
+ setEnvConf((prevState) => ({
+ ...prevState,
+ Wind: {
+ ...prevState.Wind,
+ [`Wind${index + 1}`]: {
+ ...prevState.Wind[`Wind${index + 1}`],
+ Direction: e,
+ },
+ },
+ }));
+ };
+
+ const handleShearWindChange = (e, index) => {
+ const newArry = windShears.map((shear, i) => {
+ if (i === index) {
+ return {
+ ...shear,
+ windVelocity: e,
+ };
+ }
+ return shear;
+ });
+ setwindShears(newArry);
+
+ setEnvConf((prevState) => ({
+ ...prevState,
+ Wind: {
+ ...prevState.Wind,
+ [`Wind${index + 1}`]: {
+ ...prevState.Wind[`Wind${index + 1}`],
+ Force: e,
+ },
+ },
+ }));
+ };
+
+ const handleShearfluctuationPercentageChange = (e, index) => {
+ const newArry = windShears.map((shear, i) => {
+ if (i === index) {
+ return {
+ ...shear,
+ fluctuationPercentage: e,
+ };
+ }
+ return shear;
+ });
+ setwindShears(newArry);
+
+ setEnvConf((prevState) => ({
+ ...prevState,
+ Wind: {
+ ...prevState.Wind,
+ [`Wind${index + 1}`]: {
+ ...prevState.Wind[`Wind${index + 1}`],
+ Fluctuation: e,
+ },
+ },
+ }));
+ };
+
+ const handleUseCFDChange = (event) => {
+ setEnvConf(prevState => ({
+ ...prevState,
+ UseCFD: event.target.checked
+ }));
+}
+
// Function to add a new wind shear entry for window
+ /*
const addNewWindShear = () => {
- const newWindShearEntry = { ...windShearData };
+ const newWindShearEntry = {
+ windDirection: "",
+ windVelocity: 0,
+ fluctuationPercentage: 0,
+ };
setwindShears([...windShears, newWindShearEntry]);
};
-
+*/
const [snackBarState, setSnackBarState] = React.useState({
open: false,
});
+
+ const addNewWindShear = () => {
+ const newWindShearEntry = {
+ windDirection: "",
+ windVelocity: 0,
+ fluctuationPercentage: 0,
+ };
+ setwindShears([...windShears, newWindShearEntry]);
+
+ setEnvConf((prevState) => ({
+ ...prevState,
+ Wind: {
+ ...prevState.Wind,
+ [`Wind${windShears.length + 1}`]: {
+ Type: "Wind Shear",
+ Direction: "",
+ Force: 0,
+ Fluctuation: 0,
+ },
+ },
+ }));
+ };
+
const handleSnackBarVisibility = (val) => {
setSnackBarState(prevState => ({
@@ -304,338 +597,413 @@ const handleSnackBarVisibility = (val) => {
}))
}
return (
-
- {info.get(mapKey).map((val, id) => {
+ {info[mapKey].map((val, id) => {
return (
- {/* )
}
}
- const handleDirectorySelectFuzzy = () => {
- wait(1000);
- console.log('fuzztTestNames----- in handleDirectorySelectFuzzy', names)
+ // const handleDirectorySelectFuzzy = () => {
+ // wait(1000);
+ // console.log('fuzztTestNames----- in handleDirectorySelectFuzzy', names)
- setFuzzyTest([]);
- names.map(id=> {
- let unordered=[];
- let circular = [];
- let collision = [];
- let landscape = [];
- let orderWay = [];
- let pointDev = [];
- let minSep = [];
- let nonFly = [];
- UnorderedWaypointMonitor.map(unorder => {
- console.log('UnorderedWaypointMonitor---', UnorderedWaypointMonitor)
- console.log('un unorder.fuzzyValue', unorder.fuzzyValue)
- if(id.name == unorder.fuzzyValue) {
- console.log('inside unod')
- unordered.push(unorder)
- }
- console.log('unordered----', unordered)
- })
- CircularDeviationMonitor.map(circularDev => {
- if(id.name == circularDev.fuzzyValue) {
- circular.push(circularDev);
- }
- })
- CollisionMonitor.map(coll => {
- console.log('CollisionMonitor---', CollisionMonitor)
- if(id.name == coll.fuzzyValue) {
- collision.push(coll);
- }
- })
- LandspaceMonitor.map(land => {
- if(id.name == land.fuzzyValue) {
- landscape.push(land);
- }
- })
- OrderedWaypointMonitor.map( order => {
- if(id.name == order.fuzzyValue) {
- orderWay.push(order);
- }
- })
- PointDeviationMonitor.map(point => {
- if(id.name == point.fuzzyValue) {
- pointDev.push(point);
- }
- })
- MinSepDistMonitor.map(min => {
- if(id.name == min.fuzzyValue) {
- minSep.push(min);
- }
- })
- NoFlyZoneMonitor.map(zone => {
- if(id.name == zone.fuzzyVale) {
- nonFly.push(zone)
- }
- })
- setFuzzyTest(prevState => [
- ...prevState,
- {
- "name":id.name,
- "UnorderedWaypointMonitor": unordered,
- "CircularDeviationMonitor": circular,
- "CollisionMonitor" : collision,
- "LandspaceMonitor": landscape,
- "OrderedWaypointMonitor": orderWay,
- "PointDeviationMonitor": pointDev,
- "MinSepDistMonitor": minSep,
- "NoFlyZoneMonitor":nonFly
- }
- ])
- })
- }
+ // setFuzzyTest([]);
+ // names.map(id=> {
+ // let unordered=[];
+ // let circular = [];
+ // let collision = [];
+ // let landscape = [];
+ // let orderWay = [];
+ // let pointDev = [];
+ // let minSep = [];
+ // let nonFly = [];
+ // UnorderedWaypointMonitor.map(unorder => {
+ // console.log('UnorderedWaypointMonitor---', UnorderedWaypointMonitor)
+ // console.log('un unorder.fuzzyValue', unorder.fuzzyValue)
+ // if(id.name == unorder.fuzzyValue) {
+ // console.log('inside unod')
+ // unordered.push(unorder)
+ // }
+ // console.log('unordered----', unordered)
+ // })
+ // CircularDeviationMonitor.map(circularDev => {
+ // if(id.name == circularDev.fuzzyValue) {
+ // circular.push(circularDev);
+ // }
+ // })
+ // CollisionMonitor.map(coll => {
+ // console.log('CollisionMonitor---', CollisionMonitor)
+ // if(id.name == coll.fuzzyValue) {
+ // collision.push(coll);
+ // }
+ // })
+ // LandspaceMonitor.map(land => {
+ // if(id.name == land.fuzzyValue) {
+ // landscape.push(land);
+ // }
+ // })
+ // OrderedWaypointMonitor.map( order => {
+ // if(id.name == order.fuzzyValue) {
+ // orderWay.push(order);
+ // }
+ // })
+ // PointDeviationMonitor.map(point => {
+ // if(id.name == point.fuzzyValue) {
+ // pointDev.push(point);
+ // }
+ // })
+ // MinSepDistMonitor.map(min => {
+ // if(id.name == min.fuzzyValue) {
+ // minSep.push(min);
+ // }
+ // })
+ // NoFlyZoneMonitor.map(zone => {
+ // if(id.name == zone.fuzzyVale) {
+ // nonFly.push(zone)
+ // }
+ // })
+ // setFuzzyTest(prevState => [
+ // ...prevState,
+ // {
+ // "name":id.name,
+ // "UnorderedWaypointMonitor": unordered,
+ // "CircularDeviationMonitor": circular,
+ // "CollisionMonitor" : collision,
+ // "LandspaceMonitor": landscape,
+ // "OrderedWaypointMonitor": orderWay,
+ // "PointDeviationMonitor": pointDev,
+ // "MinSepDistMonitor": minSep,
+ // "NoFlyZoneMonitor":nonFly
+ // }
+ // ])
+ // })
+ // }
+
useEffect(() => {
- handleDirectorySelectFuzzy()
- },
- [UnorderedWaypointMonitor, CollisionMonitor, CircularDeviationMonitor, LandspaceMonitor, OrderedWaypointMonitor, PointDeviationMonitor, MinSepDistMonitor]
- )
-
- React.useEffect(() => {}, [fileArray])
- const handleDirectorySelect = (event) => {
- const files = event.target.files;
- let name = [];
- for (let i = 0; i < files.length; i++) {
- const fileReader = new FileReader();
- const file = files[i];
- console.log('file----', file)
- const data = [...fileArray]
- let path = file.webkitRelativePath
- let fuzzyPathValue = null
- let paths = path.split("/")
- console.log('paths----', paths)
- if(paths.length > 1) {
- fuzzyPathValue = paths[1]
- setIsFuzzyList(fuzzyPathValue.includes('Fuzzy')? true : false);
- }
- let fuzzyValueArray = fuzzyPathValue.split("_")
- let exist = false
- name.map(testName => {
- if(testName.name == fuzzyValueArray[2]) {
- exist = true;
- }
- })
- if(!exist) {
- name.push({name:fuzzyValueArray[2]})
- }
- console.log('fuzzyPathValue---', fuzzyPathValue)
- if (file.type === 'text/plain') {
- fileReader.onload = () => {
- const fileContents = fileReader.result;
- if(file.webkitRelativePath.includes("UnorderedWaypointMonitor")) {
- setUnorderedWaypointMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- content:fileContents,
- infoContent:getInfoContents(fileContents, "INFO", new Map()),
- passContent:getInfoContents(fileContents, "PASS", new Map()),
- failContent:getInfoContents(fileContents, "FAIL", new Map()),
- fuzzyPath:fuzzyPathValue,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
- }
- if(file.webkitRelativePath.includes("CircularDeviationMonitor")) {
- let info = getInfoContents(fileContents);
- console.log('info----', info)
- setCircularDeviationMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- content:fileContents,
- infoContent:getInfoContents(fileContents, "INFO", new Map()),
- passContent:getInfoContents(fileContents, "PASS", new Map()),
- failContent:getInfoContents(fileContents, "FAIL", new Map()),
- fuzzyPath:fuzzyPathValue,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
- }
- if(file.webkitRelativePath.includes("CollisionMonitor")) {
- setCollisionMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- content:fileContents,
- infoContent:getInfoContents(fileContents, "INFO", new Map()),
- passContent:getInfoContents(fileContents, "PASS", new Map()),
- failContent:getInfoContents(fileContents, "FAIL", new Map()),
- fuzzyPath:fuzzyPathValue,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
- }
- if(file.webkitRelativePath.includes("LandspaceMonitor")) {
- setLandspaceMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- content:fileContents,
- infoContent:getInfoContents(fileContents, "INFO", new Map()),
- passContent:getInfoContents(fileContents, "PASS", new Map()),
- failContent:getInfoContents(fileContents, "FAIL", new Map()),
- fuzzyPath:fuzzyPathValue,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
- }
- if(file.webkitRelativePath.includes("OrderedWaypointMonitor")) {
- setOrderedWaypointMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- content:fileContents,
- infoContent:getInfoContents(fileContents, "INFO", new Map()),
- passContent:getInfoContents(fileContents, "PASS", new Map()),
- failContent:getInfoContents(fileContents, "FAIL", new Map()),
- fuzzyPath:fuzzyPathValue,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
- }
- if(file.webkitRelativePath.includes("PointDeviationMonitor")) {
- setPointDeviationMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- content:fileContents,
- infoContent:getInfoContents(fileContents, "INFO", new Map()),
- passContent:getInfoContents(fileContents, "PASS", new Map()),
- failContent:getInfoContents(fileContents, "FAIL", new Map()),
- fuzzyPath:fuzzyPathValue,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
- }
- if(file.webkitRelativePath.includes("MinSepDistMonitor")) {
- setMinSepDistMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- content:fileContents,
- infoContent:getInfoContents(fileContents, "INFO", new Map()),
- passContent:getInfoContents(fileContents, "PASS", new Map()),
- failContent:getInfoContents(fileContents, "FAIL", new Map()),
- fuzzyPath:fuzzyPathValue,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
+ if(isFuzzyList) {
+ names.map(id=> {
+ let unordered=[];
+ let circular = [];
+ let collision = [];
+ let landscape = [];
+ let orderWay = [];
+ let pointDev = [];
+ let minSep = [];
+ let nonFly = [];
+ resp.UnorderedWaypointMonitor.map(unorder => {
+ if(id.name == unorder.fuzzyValue) {
+ unordered.push(unorder)
}
- if(file.webkitRelativePath.includes("NoFlyZoneMonitor")) {
- setNoFlyZoneMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- content:fileContents,
- infoContent:getInfoContents(fileContents, "INFO", new Map()),
- passContent:getInfoContents(fileContents, "PASS", new Map()),
- failContent:getInfoContents(fileContents, "FAIL", new Map()),
- fuzzyPath:fuzzyPathValue,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
+ })
+ resp.CircularDeviationMonitor.map(circularDev => {
+ if(id.name == circularDev.fuzzyValue) {
+ circular.push(circularDev);
}
-
- };
- fileReader.readAsText(file);
- } else if (file.type === 'image/png') {
- console.log("its image")
- fileReader.onload = () => {
- const fileContents = fileReader.result;
- if(file.webkitRelativePath.includes("UnorderedWaypointMonitor")) {
- let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
- setUnorderedWaypointMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- imgContent:URL.createObjectURL(file),
- path:htmlfile,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
- }
- if(file.webkitRelativePath.includes("CircularDeviationMonitor")) {
- let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
- setCircularDeviationMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- imgContent:URL.createObjectURL(file),
- path:htmlfile,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
+ })
+ resp.CollisionMonitor.map(coll => {
+ if(id.name == coll.fuzzyValue) {
+ collision.push(coll);
}
- if(file.webkitRelativePath.includes("CollisionMonitor")) {
- let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
- setCollisionMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- imgContent:URL.createObjectURL(file),
- path:htmlfile,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
+ })
+ resp.LandspaceMonitor.map(land => {
+ if(id.name == land.fuzzyValue) {
+ landscape.push(land);
}
- if(file.webkitRelativePath.includes("LandspaceMonitor")) {
- let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
- setLandspaceMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- imgContent:URL.createObjectURL(file),
- path:htmlfile,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
+ })
+ resp.OrderedWaypointMonitor.map( order => {
+ if(id.name == order.fuzzyValue) {
+ orderWay.push(order);
}
- if(file.webkitRelativePath.includes("OrderedWaypointMonitor")) {
- let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
- setOrderedWaypointMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- imgContent:URL.createObjectURL(file),
- path:htmlfile,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
+ })
+ resp.PointDeviationMonitor.map(point => {
+ if(id.name == point.fuzzyValue) {
+ pointDev.push(point);
}
- if(file.webkitRelativePath.includes("PointDeviationMonitor")) {
- let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
- setPointDeviationMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- imgContent:URL.createObjectURL(file),
- path:htmlfile,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
+ })
+ resp.MinSepDistMonitor.map(min => {
+ if(id.name == min.fuzzyValue) {
+ minSep.push(min);
}
- if(file.webkitRelativePath.includes("MinSepDistMonitor")) {
- let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
- setMinSepDistMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- imgContent:URL.createObjectURL(file),
- path:htmlfile,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
+ })
+ resp.NoFlyZoneMonitor.map(zone => {
+ if(id.name == zone.fuzzyVale) {
+ nonFly.push(zone)
}
- if(file.webkitRelativePath.includes("NoFlyZoneMonitor")) {
- let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
- setNoFlyZoneMonitor(prevState => [
- ...prevState,
- {
- name:file.name,
- type:file.type,
- imgContent:URL.createObjectURL(file),
- path:htmlfile,
- fuzzyValue: fuzzyValueArray[2]
- }
- ])
+ })
+ setFuzzyTest(prevState => [
+ ...prevState,
+ {
+ "name":id.name,
+ "UnorderedWaypointMonitor": unordered,
+ "CircularDeviationMonitor": circular,
+ "CollisionMonitor" : collision,
+ "LandspaceMonitor": landscape,
+ "OrderedWaypointMonitor": orderWay,
+ "PointDeviationMonitor": pointDev,
+ "MinSepDistMonitor": minSep,
+ "NoFlyZoneMonitor":nonFly
}
- }
- fileReader.readAsText(file);
- } else if (file.type === '') {
- const directoryReader = new FileReader();
- directoryReader.onload = () => {
- handleDirectorySelect({target: {files: directoryReader.result}});
- };
- directoryReader.readAsArrayBuffer(file);
- }
+ ])
+ })
+ }
+ if(!isFuzzyList) {
+ setCircularDeviationMonitor(resp.CircularDeviationMonitor)
+ setCollisionMonitor(resp.CollisionMonitor)
+ setLandspaceMonitor(resp.LandspaceMonitor)
+ setMinSepDistMonitor(resp.MinSepDistMonitor)
+ setNoFlyZoneMonitor(resp.NoFlyZoneMonitor)
+ setOrderedWaypointMonitor(resp.OrderedWaypointMonitor)
+ setPointDeviationMonitor(resp.PointDeviationMonitor)
+ setUnorderedWaypointMonitor(resp.UnorderedWaypointMonitor)
}
- // setTestNames([name]);
- console.log('name----', name)
- // handleDirectorySelectFuzzy(name);
- }
+ // handleDirectorySelectFuzzy()
+ },
+ //[UnorderedWaypointMonitor, CollisionMonitor, CircularDeviationMonitor, LandspaceMonitor, OrderedWaypointMonitor, PointDeviationMonitor, MinSepDistMonitor]
+ [isFuzzyList])
+
+ // React.useEffect(() => {}, [fileArray])
+ // const handleDirectorySelect = (event) => {
+ // const files = event.target.files;
+ // let name = [];
+ // for (let i = 0; i < files.length; i++) {
+ // const fileReader = new FileReader();
+ // const file = files[i];
+ // console.log('file----', file)
+ // const data = [...fileArray]
+ // let path = file.webkitRelativePath
+ // let fuzzyPathValue = null
+ // let paths = path.split("/")
+ // console.log('paths----', paths)
+ // if(paths.length > 1) {
+ // fuzzyPathValue = paths[1]
+ // setIsFuzzyList(fuzzyPathValue.includes('Fuzzy')? true : false);
+ // }
+ // let fuzzyValueArray = fuzzyPathValue.split("_")
+ // let exist = false
+ // name.map(testName => {
+ // if(testName.name == fuzzyValueArray[2]) {
+ // exist = true;
+ // }
+ // })
+ // if(!exist) {
+ // name.push({name:fuzzyValueArray[2]})
+ // }
+ // console.log('fuzzyPathValue---', fuzzyPathValue)
+ // if (file.type === 'text/plain') {
+ // fileReader.onload = () => {
+ // const fileContents = fileReader.result;
+ // if(file.webkitRelativePath.includes("UnorderedWaypointMonitor")) {
+ // setUnorderedWaypointMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // content:fileContents,
+ // infoContent:getInfoContents(fileContents, "INFO", new Map()),
+ // passContent:getInfoContents(fileContents, "PASS", new Map()),
+ // failContent:getInfoContents(fileContents, "FAIL", new Map()),
+ // fuzzyPath:fuzzyPathValue,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+ // if(file.webkitRelativePath.includes("CircularDeviationMonitor")) {
+ // let info = getInfoContents(fileContents);
+ // console.log('info----', info)
+ // setCircularDeviationMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // content:fileContents,
+ // infoContent:getInfoContents(fileContents, "INFO", new Map()),
+ // passContent:getInfoContents(fileContents, "PASS", new Map()),
+ // failContent:getInfoContents(fileContents, "FAIL", new Map()),
+ // fuzzyPath:fuzzyPathValue,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+ // if(file.webkitRelativePath.includes("CollisionMonitor")) {
+ // setCollisionMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // content:fileContents,
+ // infoContent:getInfoContents(fileContents, "INFO", new Map()),
+ // passContent:getInfoContents(fileContents, "PASS", new Map()),
+ // failContent:getInfoContents(fileContents, "FAIL", new Map()),
+ // fuzzyPath:fuzzyPathValue,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+ // if(file.webkitRelativePath.includes("LandspaceMonitor")) {
+ // setLandspaceMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // content:fileContents,
+ // infoContent:getInfoContents(fileContents, "INFO", new Map()),
+ // passContent:getInfoContents(fileContents, "PASS", new Map()),
+ // failContent:getInfoContents(fileContents, "FAIL", new Map()),
+ // fuzzyPath:fuzzyPathValue,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+ // if(file.webkitRelativePath.includes("OrderedWaypointMonitor")) {
+ // setOrderedWaypointMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // content:fileContents,
+ // infoContent:getInfoContents(fileContents, "INFO", new Map()),
+ // passContent:getInfoContents(fileContents, "PASS", new Map()),
+ // failContent:getInfoContents(fileContents, "FAIL", new Map()),
+ // fuzzyPath:fuzzyPathValue,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+ // if(file.webkitRelativePath.includes("PointDeviationMonitor")) {
+ // setPointDeviationMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // content:fileContents,
+ // infoContent:getInfoContents(fileContents, "INFO", new Map()),
+ // passContent:getInfoContents(fileContents, "PASS", new Map()),
+ // failContent:getInfoContents(fileContents, "FAIL", new Map()),
+ // fuzzyPath:fuzzyPathValue,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+ // if(file.webkitRelativePath.includes("MinSepDistMonitor")) {
+ // setMinSepDistMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // content:fileContents,
+ // infoContent:getInfoContents(fileContents, "INFO", new Map()),
+ // passContent:getInfoContents(fileContents, "PASS", new Map()),
+ // failContent:getInfoContents(fileContents, "FAIL", new Map()),
+ // fuzzyPath:fuzzyPathValue,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+ // if(file.webkitRelativePath.includes("NoFlyZoneMonitor")) {
+ // setNoFlyZoneMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // content:fileContents,
+ // infoContent:getInfoContents(fileContents, "INFO", new Map()),
+ // passContent:getInfoContents(fileContents, "PASS", new Map()),
+ // failContent:getInfoContents(fileContents, "FAIL", new Map()),
+ // fuzzyPath:fuzzyPathValue,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+
+ // };
+ // fileReader.readAsText(file);
+ // } else if (file.type === 'image/png') {
+ // console.log("its image")
+ // fileReader.onload = () => {
+ // const fileContents = fileReader.result;
+ // if(file.webkitRelativePath.includes("UnorderedWaypointMonitor")) {
+ // let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
+ // setUnorderedWaypointMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // imgContent:URL.createObjectURL(file),
+ // path:htmlfile,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+ // if(file.webkitRelativePath.includes("CircularDeviationMonitor")) {
+ // let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
+ // setCircularDeviationMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // imgContent:URL.createObjectURL(file),
+ // path:htmlfile,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+ // if(file.webkitRelativePath.includes("CollisionMonitor")) {
+ // let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
+ // setCollisionMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // imgContent:URL.createObjectURL(file),
+ // path:htmlfile,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+ // if(file.webkitRelativePath.includes("LandspaceMonitor")) {
+ // let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
+ // setLandspaceMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // imgContent:URL.createObjectURL(file),
+ // path:htmlfile,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+ // if(file.webkitRelativePath.includes("OrderedWaypointMonitor")) {
+ // let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
+ // setOrderedWaypointMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // imgContent:URL.createObjectURL(file),
+ // path:htmlfile,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+ // if(file.webkitRelativePath.includes("PointDeviationMonitor")) {
+ // let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
+ // setPointDeviationMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // imgContent:URL.createObjectURL(file),
+ // path:htmlfile,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+ // if(file.webkitRelativePath.includes("MinSepDistMonitor")) {
+ // let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
+ // setMinSepDistMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // imgContent:URL.createObjectURL(file),
+ // path:htmlfile,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+ // if(file.webkitRelativePath.includes("NoFlyZoneMonitor")) {
+ // let htmlfile = file.webkitRelativePath.replace("_plot.png", "_interactive.html")
+ // setNoFlyZoneMonitor(prevState => [
+ // ...prevState,
+ // {
+ // name:file.name,
+ // type:file.type,
+ // imgContent:URL.createObjectURL(file),
+ // path:htmlfile,
+ // fuzzyValue: fuzzyValueArray[2]
+ // }
+ // ])
+ // }
+ // }
+ // fileReader.readAsText(file);
+ // } else if (file.type === '') {
+ // const directoryReader = new FileReader();
+ // directoryReader.onload = () => {
+ // handleDirectorySelect({target: {files: directoryReader.result}});
+ // };
+ // directoryReader.readAsArrayBuffer(file);
+ // }
+ // }
+ // // setTestNames([name]);
+ // console.log('name----', name)
+ // // handleDirectorySelectFuzzy(name);
+ // }
+ const [folderDirectories, setFolderDirectories] = useState([]);
+ // const componenet = () => {
+ // const handleDirectorySelect = (selectedFiles) => {
+ // console.log('Selected Files:', selectedFiles);
+ // }
+ // };
+
+
+ // const [snackBarState, setSnackBarState] = React.useState({
+ // open: false,
+ // });
+
+ // const handleSnackBarVisibility = (val) => {
+ // setSnackBarState(prevState => ({
+ // ...prevState,
+ // open: val
+ // }))
+ // }
+ // const handleClickAway = () => {
+ // // Prevent closing when clicking outside the box
+ // handleSnackBarVisibility(true);
+ // };
+ // useEffect(() => {
+ // // Trigger the Snackbar to be open when the component mounts
+ // handleSnackBarVisibility(true);
+ // }, []);
return (
- )
+ );
}
\ No newline at end of file
diff --git a/frontend/src/components/HorizontalLinearStepper.jsx b/frontend/src/components/HorizontalLinearStepper.jsx
index 9f63db798..432f10b6e 100644
--- a/frontend/src/components/HorizontalLinearStepper.jsx
+++ b/frontend/src/components/HorizontalLinearStepper.jsx
@@ -77,9 +77,8 @@ export default function HorizontalLinearStepper(data) {
setActiveStep((prevActiveStep) => prevActiveStep - 1);
};
- const invokePostAPI = () => {
- console.log('mainJson-----', mainJson)
- if(mainJson.environment != null && mainJson.environment.enableFuzzy == true) {
+ React.useEffect(() => {
+ if( mainJson.environment != null && mainJson.environment.enableFuzzy == true && mainJson.environment.enableFuzzy != null) {
setJson(prevState => ({
...prevState,
FuzzyTest: {
@@ -87,18 +86,40 @@ export default function HorizontalLinearStepper(data) {
precision: 5
}
}))
+ delete mainJson.environment["enableFuzzy"]
+ }
+ if (mainJson.environment != null && mainJson.environment.enableFuzzy == false && mainJson.FuzzyTest != null) {
+ delete mainJson.FuzzyTest
}
+ }, [mainJson])
+
+
+
+ const invokePostAPI = () => {
+ console.log("mainJson-----", mainJson)
if(activeStep === steps.length -1) {
mainJson.Drones.map(drone => {
+
delete drone["id"]
delete drone["droneName"]
delete drone.Sensors.Barometer["Key"]
delete drone.Sensors.Magnetometer["Key"]
delete drone.Sensors.GPS["Key"]
+ // delete drone.Sensors.GPS["EphTimeConstant"]
+ // drone.Sensors.GPS["EpvTimeConstant"] ? delete drone.Sensors.GPS["EpvTimeConstant"]: null
+ // drone.Sensors.GPS["EphInitial"] ? delete drone.Sensors.GPS["EphInitial"]: null
+ // drone.Sensors.GPS["EpvInitial"] ? delete drone.Sensors.GPS["EpvInitial"]: null
+ // drone.Sensors.GPS["EphFinal"] ? delete drone.Sensors.GPS["EphFinal"]: null
+ // drone.Sensors.GPS["EpvFinal"] ? delete drone.Sensors.GPS["EpvFinal"]: null
+ // drone.Sensors.GPS["EphMin3d"] ? delete drone.Sensors.GPS["EphMin3d"]: null
+ // drone.Sensors.GPS["EphMin2d"] ? delete drone.Sensors.GPS["EphMin2d"]: null
+ // drone.Sensors.GPS["UpdateLatency"] ? delete drone.Sensors.GPS["UpdateLatency"]: null
+ // drone.Sensors.GPS["StartupDelay"] ? delete drone.Sensors.GPS["StartupDelay"]: null
// delete drone.Cameras.CaptureSettings.map(capt => {
// delete capt["key"]
// })
})
+
delete mainJson.environment["time"]
mainJson.monitors.circular_deviation_monitor["enable"] == true ? delete mainJson.monitors.circular_deviation_monitor["enable"] : delete mainJson.monitors.circular_deviation_monitor
mainJson.monitors.collision_monitor["enable"] == true ? delete mainJson.monitors.collision_monitor["enable"] : delete mainJson.monitors.collision_monitor
@@ -111,8 +132,11 @@ export default function HorizontalLinearStepper(data) {
mainJson.monitors.drift_monitor["enable"] == true ? delete mainJson.monitors.drift_monitor["enable"] : delete mainJson.monitors.drift_monitor
mainJson.monitors.battery_monitor["enable"] == true ? delete mainJson.monitors.battery_monitor["enable"] : delete mainJson.monitors.battery_monitor
delete mainJson.environment["enableFuzzy"]
+ delete mainJson.environment["timeOfDayFuzzy"]
+ delete mainJson.environment["windFuzzy"]
+ delete mainJson.environment["positionFuzzy"]
console.log('mainJson-----', JSON.stringify(mainJson))
- navigate('/dashboard', {
+ navigate('/report-dashboard', {
state: {mainJson: mainJson}
})
fetch('http://127.0.0.1:5000/addTask', {
@@ -126,7 +150,6 @@ export default function HorizontalLinearStepper(data) {
.then(res => console.log(res));
}
}
-
const stepsComponent = [
{
name:'Environment Configuration',
diff --git a/frontend/src/components/MonitorControl.jsx b/frontend/src/components/MonitorControl.jsx
index a6695349a..ee92f80f0 100644
--- a/frontend/src/components/MonitorControl.jsx
+++ b/frontend/src/components/MonitorControl.jsx
@@ -17,6 +17,8 @@ import MonitorTabels from './MonitorTabels';
import ButtonGroup from '@mui/material/ButtonGroup';
import Button from '@mui/material/Button';
import Alert from '@mui/material/Alert';
+import EnvironmentConfiguration from './EnvironmentConfiguration';
+import dayjs from 'dayjs';
export default function MonitorControl (monJson) {
const [value, setValue] = React.useState('2');
@@ -93,6 +95,34 @@ export default function MonitorControl (monJson) {
}
})
+ const [envConf, setEnvConf] = React.useState(monJson.mainJsonValue.environment != null ? monJson.mainJsonValue.environment : {
+ enableFuzzy: false,
+ timeOfDayFuzzy: false,
+ positionFuzzy: false,
+ windFuzzy: false,
+ Wind: {
+ Direction: "NE",
+ Velocity: 1,
+ //Type: "None",
+ //WindOrigin: "None",
+ },
+ Origin: {
+ Latitude: 41.980381,
+ Longitude: -87.934524,
+ },
+ TimeOfDay: "10:00:00",
+ UseGeo: true,
+ UseCFD: true,
+ time:dayjs('2020-01-01 10:00')
+ });
+
+ const environmentJson = (event) => {
+ monJson.monitorJson(event, "environment");
+ }
+ //new added
+ React.useEffect(() => {
+ environmentJson(envConf)
+ }, [envConf])
const handleBatteruMonitor = (val) => {
setMonitor(prevState => ({
...prevState,
@@ -368,7 +398,6 @@ export default function MonitorControl (monJson) {
}
}))
}
-
const singleMonitors = [
{
name: "Collision",
@@ -488,119 +517,6 @@ export default function MonitorControl (monJson) {
isMultipleTable: false
},
- // {
- // name: "Waypoints",
- // value: '2.2',
- // description: "Test whether the drones reach their assigned waypoints precisely",
- // colorText:monitor.unordered_waypoint_monitor.enable == true ? 'green': null,
- // btns:
- handleSnackBarVisibility(false)}>
- handleSnackBarVisibility(false)} severity="info" sx={{ width: '100%' }}>
- Wind Type Changes is under Developement !
-
-
-
- {/* */}
-
-
- {/*
- Wind
- */}
-
-
- Wind Type
-
-
-
+
+)
}
\ No newline at end of file
diff --git a/frontend/src/components/FuzzyDashboard.jsx b/frontend/src/components/FuzzyDashboard.jsx
index 390f2bf16..6136ff256 100644
--- a/frontend/src/components/FuzzyDashboard.jsx
+++ b/frontend/src/components/FuzzyDashboard.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import ListItem from '@mui/material/ListItem';
@@ -22,7 +22,9 @@ import HomeIcon from '@mui/icons-material/Home';
import Tooltip from '@mui/material/Tooltip';
import AlertTitle from '@mui/material/AlertTitle';
import { wait } from '@testing-library/user-event/dist/utils';
-
+import Snackbar from '@mui/material/Snackbar';
+import ClickAwayListener from '@mui/material/ClickAwayListener';
+import Link from '@mui/material/Link'
const style = {
position: 'absolute',
@@ -36,15 +38,16 @@ const style = {
p: 4,
};
-export default function FuzzyDashboard(parameter) {
+export default function FuzzyDashboard() {
const navigate = useNavigate();
const location = useLocation();
- const deviation = location.state != null ? location.state.mainJson.monitors != null ?
- location.state.mainJson.monitors.circular_deviation_monitor != null ? location.state.mainJson.monitors.circular_deviation_monitor.param[0] : null : null : null
- const horizontal = location.state != null ? location.state.mainJson.monitors != null ?
- location.state.mainJson.monitors.min_sep_dist_monitor != null ? location.state.mainJson.monitors.min_sep_dist_monitor.param[0] : null : null : null
- const lateral = location.state != null ? location.state.mainJson.monitors != null ?
- location.state.mainJson.monitors.min_sep_dist_monitor != null ? location.state.mainJson.monitors.min_sep_dist_monitor.param[1] : null : null : null
+ const resp = location.state.data
+ const deviation = location.state != null ? location.state.mainJson != null ? location.state.mainJson.monitors != null ?
+ location.state.mainJson.monitors.circular_deviation_monitor != null ? location.state.mainJson.monitors.circular_deviation_monitor.param[0] : null : null : null : null
+ const horizontal = location.state != null ? location.state.mainJson != null ? location.state.mainJson.monitors != null ?
+ location.state.mainJson.monitors.min_sep_dist_monitor != null ? location.state.mainJson.monitors.min_sep_dist_monitor.param[0] : null : null : null : null
+ const lateral = location.state != null ? location.state.mainJson != null ? location.state.mainJson.monitors != null ?
+ location.state.mainJson.monitors.min_sep_dist_monitor != null ? location.state.mainJson.monitors.min_sep_dist_monitor.param[1] : null : null : null : null
const [fileArray, setFileArray] = React.useState([])
const [CircularDeviationMonitor, setCircularDeviationMonitor] = React.useState([])
const [CollisionMonitor, setCollisionMonitor] = React.useState([])
@@ -57,11 +60,12 @@ export default function FuzzyDashboard(parameter) {
const [open, setOpen] = React.useState(false);
const [selectedImage, setSelectedImage] = React.useState();
const [htmlLink, setHtmlLink] = React.useState();
- const [voilation, setVoilation] = React.useState(false)
- const [isFuzzyList, setIsFuzzyList] = React.useState(false);
+ const [voilation, setVoilation] = React.useState(location.state.file.fail > 0 ? true : false)
+ const [isFuzzyList, setIsFuzzyList] = React.useState(location.state.file.fuzzy);
const [fuzzyTest, setFuzzyTest] = React.useState([]);
+ const [fileName, setFileName] = React.useState(location.state.file.fileName)
- const names = [{name:0},{name:5},{name:10}]
+ const names = [{name:0},{name:7},{name:14}]
const handleOpen = (img) => {
setOpen(true);
@@ -72,48 +76,45 @@ export default function FuzzyDashboard(parameter) {
setOpen(false)
};
- const redirectToHome = () => {
- navigate('/')
+ const redirectToReportDashboard = () => {
+ navigate('/report-dashboard')
}
-
- const getInfoContents = (fileContents, keyMatch, droneMap) => {
- const content_array = fileContents.split("\n");
- let infoContent = [];
- content_array.map(content => {
- let content_split = content.split(";");
- if(content.includes(keyMatch) && content_split.length == 4) {
- if(keyMatch == "FAIL") {
- setVoilation(true)
- }
- if(droneMap.get(content_split[2]) == null) {
- droneMap.set(content_split[2], [content_split[3]])
- } else {
- let val = []
- val = droneMap.get(content_split[2])
- val = val.concat([content_split[3]])
- droneMap.set(content_split[2], val)
- }
+ // const getInfoContents = (fileContents, keyMatch, droneMap) => {
+ // const content_array = fileContents.split("\n");
+ // let infoContent = [];
+ // content_array.map(content => {
+ // let content_split = content.split(";");
+ // if(content.includes(keyMatch) && content_split.length == 4) {
+ // if(keyMatch == "FAIL") {
+ // setVoilation(true)
+ // }
+ // if(droneMap.get(content_split[2]) == null) {
+ // droneMap.set(content_split[2], [content_split[3]])
+ // } else {
+ // let val = []
+ // val = droneMap.get(content_split[2])
+ // val = val.concat([content_split[3]])
+ // droneMap.set(content_split[2], val)
+ // }
- infoContent.push(content_split[2] + ": " + content_split[3])
- }
- })
- return droneMap;
- }
+ // infoContent.push(content_split[2] + ": " + content_split[3])
+ // }
+ // })
+ // return droneMap;
+ // }
const returnContentsItem = (colorCode, keyValue, info, icon, fuzzyValue, severity_val) => {
- for (const mapKey of info.keys()) {
+ for (const mapKey of Object.keys(info)) {
console.log(mapKey);
- console.log(info.get(mapKey))
+ console.log(info[mapKey])
let fuzzyValueArray = fuzzyValue.split("_")
return (
+ handleSnackBarVisibility(false)}>
+ handleSnackBarVisibility(false)} severity="info" sx={{ width: '100%' }}>
+ {fuzzyAlert ? "Fuzzy Testing Changes is under development !" : "Wind Type Changes is under Developement !"}
+
+
+
+ {/* */}
+
+
+ {/*
+ Wind
+ */}
+
+
+ Toggle this to enable or disable CFD
+
+
+
+
+ Wind Type
+
+
+
+
+ {/* {selectedWindType !== "Wind Shear" && ( */}
+
+
+ Wind Direction
+
+
+
+ {/* )} */}
+
+ {/* WIND ORIGIN DROP DOWN */}
+ {/* */}
+ {/**/}
+ {/*Wind Origin */}
+ {/**/}
+ {/*{WindOrigin.map(function (val) {*/}
+ {/*return (*/}
+ {/* )*/}
+ {/* })}*/}
+ {/* */}
+ {/* */}
+ {/* */}
+
+
+ {/* WIND TYPE DROP DOWN */}
+
+ {/* {selectedWindType !== "Wind Shear" && ( */}
+
+
+
+
+ {/* )} */}
+
- {/* {selectedWindType !== "Wind Shear" && ( */}
+ {(selectedWindType === "Turbulent Wind" || selectedWindType === "Wind Shear") && (
-
- Wind Direction
-
-
+
+
+ {(windShears.length<2 && selectedWindType === "Wind Shear") ? (
+ ) : null}
- {/* )} */}
-
- {/* WIND ORIGIN DROP DOWN */}
- {/* */}
- {/**/}
- {/*Wind Origin */}
- {/**/}
- {/*{WindOrigin.map(function (val) {*/}
- {/*return (*/}
- {/* )*/}
- {/* })}*/}
- {/* */}
- {/* */}
- {/* */}
-
-
- {/* WIND TYPE DROP DOWN */}
-
- {/* {selectedWindType !== "Wind Shear" && ( */}
-
-
-
-
- {/* )} */}
-
+ )}
- {(selectedWindType === "Turbulent Wind" || selectedWindType === "Wind Shear") && (
-
-
-
- {(windShears.length<2 && selectedWindType === "Wind Shear") ? (
- ) : null}
-
- )}
-
-
- {/* WIND SHEAR WINDOW */}
- {/* */}
-
- {selectedWindType === "Wind Shear" && windShears.map((shear, index) => ((
-
-
- Wind Direction
-
-
-
+
+
+
+
+ setWindShearData({
+ ...windShearData,
+ windVelocity: e.target.value,
+ })
+ }
+ inputProps = {{min:0}}
+ fullWidth
+ size="large"
+ style={{ width: '120%' }}/>
+
+
-
-
-
+ setWindShearData({
+ ...windShearData,
+ fluctuationPercentage: e.target.value,
+ })
+ }
+ fullWidth
+ inputProps={{ min: 0, max: 100, step: 0.1 }}
+ size="medium"
+ style={{ width: '120%' }}/>
+
+
+
+
+
+
+ {/* Display wind shear instances in the dialog */}
+ {/* {windShears.map((shear, index) => (
+
+
-
-
-
-
-
- deleteWindShear(index)}>
-
-
+ ))}
+
+
+
-
- //
- //
- )))}
-
-
-
-
-
- Region
-
+
+ */}
+
+ {selectedWindType === "Wind Shear" && windShears.map((shear, index) => ((
+
+
+ Wind Direction
+
+
+
+
+ handleShearWindChange(e.target.value, index)}
+ value={shear.windVelocity}
+ inputProps={{ min: 0 }}/>
+
+
-
-
-
-
+ handleShearfluctuationPercentageChange(e.target.value, index)}
+ value={shear.fluctuationPercentage}
+ inputProps={{ min: 5, max: 100, step: 0.1 }}
+ sx={{ width: '150px' }} />
+
+
+ deleteWindShear(index)}>
+
-
- {/**/}
- {/* */}
- {/*
- Time of Day
- */}
-
-
-
-
-
-
-
-
-
-
-
-
- Please enable this feature if you would like the system to automatically run tests at various wind velocities
-
-
+
+ //
+ //
+ )))}
+
+
+
+
+
+ Region
+
+
+
+
+
+
+
+
+
+
+
+
+ {/**/}
+ {/* */}
+ {/*
+ Time of Day
+ */}
+
+
+
+
+
+
+
+
+
-
- {envConf.Origin.Name == "Specify Region" ?
+ {/*
+
+ Please enable this feature if you would like the system to automatically run tests at various wind velocities
+
+ */}
+ {/* {envConf.enableFuzzy && (
+ <>
+
+ handleCheckboxChange('wind')} />}
+ label="Wind"
+ />
+
+
+ handleCheckboxChange('time')}/>}
+ label="Time of Day"
+ />
+
+
+ handleCheckboxChange('position')}/>}
+ label="Initial Position"
+ />
+
+
+ )} */}
+
+
+ {envConf.Origin.Name == "Specify Region" ? Status:
+
+ Show spinner if status is running
+
+ Backend Status: {backendInfo.backendStatus}
+
+
+
+ {/* */}
+
+
+
+
+
+ {backendInfo.backendStatus}
- {/* */}
-
-
- )
+
+ deleteWindShear(index)} color="blue">
+
+
-
+
- + Direction: {shear.windDirection}, Velocity: {shear.windVelocity}, Fluctuation %: {shear.fluctuationPercentage} + +
-
-
- {currentPosition.lat && currentPosition.lng && (
-
-
-
:null}
+
+
+
+ {currentPosition.lat && currentPosition.lng && (
+
+
+
:null}
+
+ {/*
+
*/}
+
+
+ Queued Tasks: {backendInfo.numQueuedTasks}
+
+
+ {mapKey}
- {/*( Fuzzed Parameter : Wind Velocity = {fuzzyValueArray[2]} meters/s)
*/}- */}
+ {/* handleSnackBarVisibility(false)}
+ >
+ handleSnackBarVisibility(false)}
+ severity="info"
+ sx={{ maxHeight: '150px', maxWidth: '40%' }}
+ >
+ {"Enhancements to the view test report details are in progress! As we are implementing new features, please use the “SELECT SIMULATION DATA DIRECTORY” button to select the files you wish to upload. These files should be located within the ‘Airsim’ folder under your Documents folder on your local machine. You can either upload the entire ‘reports’ folder to access all results or choose specific folders for each test you want to upload."}
+
+ */}
-
- Acceptance Test Report
-
+ {fileName} Detailed Report
{/* */}
{/*
*/} - */}
+
+
+
+ Back
+
+ {/* Back */}
+ {/* */}
+
+
{voilation ?
Warning
Violation Detected
@@ -548,7 +686,6 @@ export default function FuzzyDashboard(parameter) {
{fuzzy.CollisionMonitor.map(function(file, index) {
return (file.type=== 'text/plain' ?
-
{(returnContentsItem('darkgreen', index, file.passContent, 
*/}
+ image={`data:image/png;base64 , ${file.imgContent}`}/>
}
)
@@ -609,7 +746,7 @@ export default function FuzzyDashboard(parameter) {
{/* */}
+ image={`data:image/png;base64 , ${file.imgContent}`}/>
}
)
@@ -655,7 +792,7 @@ export default function FuzzyDashboard(parameter) {
{/* */}
+ image={`data:image/png;base64 , ${file.imgContent}`}/>
}
)
@@ -730,7 +867,7 @@ export default function FuzzyDashboard(parameter) {
{/* */}
+ image={`data:image/png;base64 , ${file.imgContent}`}/>
}
@@ -759,7 +896,7 @@ export default function FuzzyDashboard(parameter) {
{/* */}
+ image={`data:image/png;base64 , ${file.imgContent}`}/>
}
)
@@ -813,7 +950,7 @@ export default function FuzzyDashboard(parameter) {
{/* */}
+ image={`data:image/png;base64 , ${file.imgContent}`}/>
}
)
@@ -843,7 +980,7 @@ export default function FuzzyDashboard(parameter) {
{/* */}
+ image={`data:image/png;base64 , ${file.imgContent}`}/>
}
)
@@ -899,7 +1036,7 @@ export default function FuzzyDashboard(parameter) {
{/* */}
+ image={`data:image/png;base64 , ${file.imgContent}`}/>
}
)
@@ -951,7 +1088,7 @@ export default function FuzzyDashboard(parameter) {
{/* */}
+ image={`data:image/png;base64 , ${file.imgContent}`}/>
}
)
@@ -997,7 +1134,7 @@ export default function FuzzyDashboard(parameter) {
{/* */}
+ image={`data:image/png;base64 , ${file.imgContent}`}/>
}
)
@@ -1081,7 +1218,7 @@ export default function FuzzyDashboard(parameter) {
{/* */}
+ image={`data:image/png;base64 , ${file.imgContent}`}/>
}
@@ -1123,7 +1260,7 @@ export default function FuzzyDashboard(parameter) {
{/* */}
+ image={`data:image/png;base64 , ${file.imgContent}`}/>
}
)
@@ -1177,7 +1314,7 @@ export default function FuzzyDashboard(parameter) {
{/* */}
+ image={`data:image/png;base64 , ${file.imgContent}`}/>
}
)
@@ -1207,7 +1344,7 @@ export default function FuzzyDashboard(parameter) {
{/* */}
+ image={`data:image/png;base64 , ${file.imgContent}`}/>
}
)
@@ -1227,11 +1364,11 @@ export default function FuzzyDashboard(parameter) {
aria-describedby="modal-modal-description"
>
- 
+ 
{/* Redirect to Html page */}
UPLOAD FILE CONTENTS
*/} - */}
- // // 
- // //
,
- // enableBtn:
- //
- // //
- //
- //
,
- // enableBtn:
- //
- //
- //
- //
,
- // enableBtn:
- //
- //
- // // 
- // //
,
- // enableBtn:
- //
- // //
- // //
- // //
,
- // enableBtn:
- //
- // // 
,
- // enableBtn:
- //
+
+ );
+ };
+
return(
+
+
+
+
+ Check the box if you would like there to be a Fuzzy Test for the time of day.
+
+
+
+
+ Check the box if you would like there to be a Fuzzy Test for the drone position.
+
+
+
+
+ Check the box if you would like there to be a Fuzzy Test for the wind.
+-
+
+
+
+ )}
+
+ {reportFiles.length > 0 && (
+ <>
+
+
+ {file.fail > 0 && (
+
+
+
+
+
+ )}
+ {passed && (
+
+
+
+
+ )}
+
+
+
+ handleButtonClick(file)}>
+ Simulation Data
+
+
+
-
- {selectedvalue == '' ? {text} : null}
-
-
- {/* {text}
*/} -
-
- {selectedvalue != '' ? Title: {title} : null}
-
-
-
-
- {selectedvalue != '' ? Description: {text} : null}
-
-
-
-
+
+
+
+ Queued Tasks: {backendInfo.numQueuedTasks}
+
+
+ +About DRV +
++DRV is revolutionizing sUAS (small Uncrewed Aerial Systems) testing. In the dynamic world +of sUAS, safety and reliability are paramount. Traditional field testing across diverse environments is costly +and challenging. +
++DRV offers an innovative sUAV simulation ecosystem that generates high-fidelity, realistic environments +mimicking real-world complexities like adverse weather and wireless interference. Our automated solution allows +developers to specify constraints and generate tailored test environments. +
++The program monitors sUAV activities against predefined safety parameters and generates detailed acceptance test +reports. This approach provides actionable insights for effective debugging and analysis, enhancing the safety, +reliability, and efficiency of sUAS applications. +
+
+
+ {/* About Us Modal */}
+ setOpen(false)}
+ aria-labelledby="modal-modal-title"
+ aria-describedby="modal-modal-description"
+ >
+
+ {/* Close Button */}
+
+
+ {/* Title Content */}
+
+
+
+
+
+
+ );
+}
+
+export default NavigationBar;
\ No newline at end of file
diff --git a/frontend/src/styles.css b/frontend/src/styles.css
new file mode 100644
index 000000000..c3ebbd110
--- /dev/null
+++ b/frontend/src/styles.css
@@ -0,0 +1,52 @@
+* {
+ box-sizing: border-box;
+}
+
+body {
+ margin: 0;
+}
+
+.nav {
+ background-color: #1c34d4;
+ color: rgb(245, 245, 245);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ gap: 2rem;
+ padding: 0 1rem;
+}
+
+.site-title {
+ font-size: 4rem;
+}
+
+.nav ul {
+ padding: 0;
+ margin: 0;
+ list-style: none;
+ display: flex;
+ gap: 1rem;
+}
+
+.nav a {
+ color: inherit;
+ text-decoration: none;
+}
+
+.nav li.active {
+ background-color: #e7e7e7;
+}
+
+.nav li:hover {
+ background-color: #2929d4;
+}
+
+
+.main-content {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ height: 100vh;
+}
+
diff --git a/macinstallation.md b/macinstallation.md
new file mode 100644
index 000000000..2e46cc691
--- /dev/null
+++ b/macinstallation.md
@@ -0,0 +1,71 @@
+# DroneWorld Installation for macOS
+
+## Unreal Engine Application
+
+Unfortuantely, Unreal Engine is not compatable with macOS.
+
+## Backend
+
+To prepare the environment and start the backend, follow these steps:
+
+1. Open the terminal and navigate to the project repository.
+```powershell
+cd backend
+```
+
+2. Create a virtual environment by running the following command:
+
+```powershell
+python -m venv venv
+```
+
+3. Activate the virtual environment by running the following command:
+
+```powershell
+source venv/bin/activate
+```
+
+4. Install the necessary dependencies by running the following command:
+
+```powershell
+pip3 install -r requirements.txt
+```
+
+5. Start the server by running the following command:
+
+```powershell
+python ./PythonClient/server/simulation_server.py
+```
+
+This will start the backend server and allow it to communicate with the Unreal application.
+
+## Frontend
+
+1. Open the terminal and navigate to the "frontend" folder in the project repository by running the following command:
+``` powershell
+cd frontend
+```
+2. Install the necessary dependencies by running the following command:
+
+``` powershell
+npm install
+```
+3. Start the frontend server by running the following command:
+
+```powershell
+npm run start
+```
+This will start the frontend server and allow you to access the user interface in your web browser.
+
+## Manual AirSim Folder Input
+
+Follow these steps to manually create an AirSim folder in your Documents folder, which is required for testing the report-dashboard and landing page:
+
+1. **Open Finder (macOS):** Navigate to your file management application.
+
+2. **Locate Your Documents Folder:** Navigate to your Documents folder.
+
+3. **Create the AirSim Folder:** Once you are in the Documents folder, right-click on an empty space and select "New" > "Folder." Name the folder "AirSim."
+
+
+
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..1339b1259
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+ "name": "DroneWorld",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {}
+}
diff --git a/readme.md b/readme.md
index 12ea79d67..66eb46979 100644
--- a/readme.md
+++ b/readme.md
@@ -2,6 +2,18 @@
DroneReqValidator (DRV) is a complete Drone simulation ecosystem that automatically generates realistic environments, monitors Drone activities against predefined safety parameters, and generates detailed acceptance test reports for effective debugging and analysis of Drone software applications.
+# DroneWis
+
+DroneWis is a CFD-based wind simulation component that is integrated with DroneReqValidator. It is used to automatically simulate the wind flow in the environment.
+
+## DRV + DroneWis
+
+use the docker compose.yaml file to run the complete system.
+```bash
+docker-compose up
+```
+
+
## Demo
- [Demo Video Available Here](https://www.youtube.com/watch?v=Fd9ft55gbO8)
@@ -22,95 +34,9 @@ DroneReqValidator has 3 main components:
2. Python backend
3. React frontend
-To use the DroneReqValidator, follow these steps:
-
-
-## 1. Unreal application
-There are two ways to open the unreal application, editor mode and executable mode,
-editor mode allows real time adjustment to the environment but requires unreal engine.
-The executable mode does not require unreal engine.
-### Editor mode
-
-you need to download the content and extract it to the game folder.
-
-1. Download the "Content.rar" from
-https://sluedu-my.sharepoint.com/:f:/g/personal/ankit_agrawal_1_slu_edu/ElbD1q-O8fBFgGDqov6Mh5EBsJ90YyPj2fzsIznTP6AX-w?e=XZaPiX
-
-using password: DroneWorld
-
-2. Extract it to the project folder in `unreal_app/editor_mode`.
-
-
-it contains all the large files that are not allowed to be uploaded to github.
-
-If you do not download the patch, the unreal editor will not be able to load the project.
-
-### Executable mode
-1. Download the "0.4.0.rar" from
-https://sluedu-my.sharepoint.com/:f:/g/personal/ankit_agrawal_1_slu_edu/ElbD1q-O8fBFgGDqov6Mh5EBsJ90YyPj2fzsIznTP6AX-w?e=XZaPiX
-2. Extract it to `unreal_app\executable_mode`
-3. Run the "Blocks.exe" file
-
-
-## 2. Python backend
-
-To prepare the environment and start the Python backend, follow these steps:
-
-1. Open the terminal and navigate to the project repository.
-```powershell
-cd backend
-```
-
-2. Create a virtual environment by running the following command:
-
-```powershell
-python -m venv venv
-```
-
-3. Activate the virtual environment by running the following command:
-
-```powershell
-source venv/bin/activate
-```
-
-4. Install the necessary dependencies by running the following command:
-
-```powershell
-pip install -r requirements.txt
-```
-
-5. Start the server by running the following command:
-
-```powershell
-python ./PythonClient/server/simulation_server.py
-```
-
-
-
-This will start the Python backend server and allow it to communicate with the Unreal application.
-
-Note that the server is running on port 5000, however, in order for simulation to work, you need to start the Unreal application first.
-
-
-
-
-## 3. React frontend
-
-1. Open the terminal and navigate to the "frontend" folder in the project repository by running the following command:
-``` powershell
-cd frontend
-```
-2. Install the necessary dependencies by running the following command:
-
-``` powershell
-npm install
-```
-3. Start the frontend server by running the following command:
-
-```powershell
-npm run start
-```
-This will start the frontend server and allow you to access the user interface in your web browser.
+To use the DroneReqValidator, follow the steps based on which OS you are working with:
+#### [Windows](windowsinstallation.md)
+#### [macOS](macinstallation.md)
## Contributing
@@ -123,8 +49,5 @@ We welcome contributions to this project. To contribute, please follow these ste
5. Submit a pull request to the main repository.
6. We will review your changes and merge them if they align with the project's goals.
-
-
-
## License
This project is licensed under the MIT license. See the LICENSE file for more information.
diff --git a/windowsinstallation.md b/windowsinstallation.md
new file mode 100644
index 000000000..875904a41
--- /dev/null
+++ b/windowsinstallation.md
@@ -0,0 +1,79 @@
+# DroneWorld Installation for Windows
+
+## Unreal Engine Application
+There are two ways to open the unreal application, editor mode and executable mode,
+editor mode allows real time adjustment to the environment but requires unreal engine.
+The executable mode does not require unreal engine.
+### Editor mode
+
+you need to download the content and extract it to the game folder.
+
+1. Download the "Content.rar" from
+https://sluedu-my.sharepoint.com/:f:/g/personal/ankit_agrawal_1_slu_edu/ElbD1q-O8fBFgGDqov6Mh5EBsJ90YyPj2fzsIznTP6AX-w?e=XZaPiX
+
+using password: DroneWorld
+
+2. Extract it to the project folder in `unreal_app/editor_mode`.
+
+
+it contains all the large files that are not allowed to be uploaded to github.
+
+If you do not download the patch, the unreal editor will not be able to load the project.
+
+### Executable mode
+1. Download the "0.4.0.rar" from
+https://sluedu-my.sharepoint.com/:f:/g/personal/ankit_agrawal_1_slu_edu/ElbD1q-O8fBFgGDqov6Mh5EBsJ90YyPj2fzsIznTP6AX-w?e=XZaPiX
+2. Run the "Blocks.exe" file
+
+## Backend
+
+To prepare the environment and start the backend, follow these steps:
+
+1. Open the terminal and navigate to the project repository.
+```powershell
+cd backend
+```
+
+2. Create a virtual environment by running the following command:
+
+```powershell
+python -m venv venv
+```
+
+3. Activate the virtual environment by running the following command:
+
+```powershell
+source venv/Scripts/activate
+```
+
+4. Install the necessary dependencies by running the following command:
+
+```powershell
+pip install -r requirements.txt
+```
+
+5. Start the server by running the following command:
+
+```powershell
+python ./PythonClient/server/simulation_server.py
+```
+
+This will start the backend server and allow it to communicate with the Unreal application.
+
+## Frontend
+
+1. Open the terminal and navigate to the "frontend" folder in the project repository by running the following command:
+``` powershell
+cd frontend
+```
+2. Install the necessary dependencies by running the following command:
+
+``` powershell
+npm install
+```
+3. Start the frontend server by running the following command:
+
+```powershell
+npm run start
+```
+This will start the frontend server and allow you to access the user interface in your web browser.
+ About Drone World +
++ Drone World is revolutionizing sUAS (small Uncrewed Aerial Systems) testing. In the dynamic world of sUAS, safety and reliability are paramount. Traditional field testing across diverse environments is costly and challenging. +
++ Drone World offers an innovative sUAV simulation ecosystem that generates high-fidelity, realistic environments mimicking real-world complexities like adverse weather and wireless interference. Our automated solution allows developers to specify constraints and generate tailored test environments. +
++ The program monitors sUAV activities against predefined safety parameters and generates detailed acceptance test reports. This approach provides actionable insights for effective debugging and analysis, enhancing the safety, reliability, and efficiency of sUAS applications. +
+