couple hotfixes:
raised the idle flow constant (could be something entered by the user in the future when hitting the button to retrieve flow events) to be 3.5, also fixed the gate visual to be up at the topp rather than centered as that was causing it to move down the page when flipping to the sensor view
This commit is contained in:
parent
8238c4df58
commit
59aae7a8a1
2 changed files with 6 additions and 54 deletions
|
|
@ -56,55 +56,6 @@ export default function GateDevice(props: Props) {
|
||||||
const [lastTemps, setLastTemps] = useState({ t1: 0, t2: 0 });
|
const [lastTemps, setLastTemps] = useState({ t1: 0, t2: 0 });
|
||||||
const [lastPressures, setLastPressures] = useState({ p1: 0, p2: 0 });
|
const [lastPressures, setLastPressures] = useState({ p1: 0, p2: 0 });
|
||||||
|
|
||||||
// const StyledToggleButtonGroup = withStyles(theme => ({
|
|
||||||
// grouped: {
|
|
||||||
// margin: theme.spacing(-0.5),
|
|
||||||
// border: "none",
|
|
||||||
// padding: theme.spacing(1),
|
|
||||||
// "&:not(:first-child):not(:last-child)": {
|
|
||||||
// borderRadius: 24,
|
|
||||||
// marginRight: theme.spacing(0.5),
|
|
||||||
// marginLeft: theme.spacing(0.5)
|
|
||||||
// },
|
|
||||||
// "&:first-child": {
|
|
||||||
// borderRadius: 24,
|
|
||||||
// marginLeft: theme.spacing(0.25)
|
|
||||||
// },
|
|
||||||
// "&:last-child": {
|
|
||||||
// borderRadius: 24,
|
|
||||||
// marginRight: theme.spacing(0.25)
|
|
||||||
// }
|
|
||||||
// },
|
|
||||||
// root: {
|
|
||||||
// backgroundColor: darken(
|
|
||||||
// theme.palette.background.paper,
|
|
||||||
// getThemeType() === "light" ? 0.05 : 0.25
|
|
||||||
// ),
|
|
||||||
// borderRadius: 24,
|
|
||||||
// content: "border-box"
|
|
||||||
// }
|
|
||||||
// }))(ToggleButtonGroup);
|
|
||||||
|
|
||||||
// const StyledToggle = withStyles({
|
|
||||||
// root: {
|
|
||||||
// backgroundColor: "transparent",
|
|
||||||
// overflow: "visible",
|
|
||||||
// content: "content-box",
|
|
||||||
// "&$selected": {
|
|
||||||
// backgroundColor: "gold",
|
|
||||||
// color: "black",
|
|
||||||
// borderRadius: 24,
|
|
||||||
// fontWeight: "bold"
|
|
||||||
// },
|
|
||||||
// "&$selected:hover": {
|
|
||||||
// backgroundColor: "rgb(255, 255, 0)",
|
|
||||||
// color: "black",
|
|
||||||
// borderRadius: 24
|
|
||||||
// }
|
|
||||||
// },
|
|
||||||
// selected: {}
|
|
||||||
// })(ToggleButton);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (comprehensiveDevice.device) {
|
if (comprehensiveDevice.device) {
|
||||||
setDevice(Device.any(comprehensiveDevice.device));
|
setDevice(Device.any(comprehensiveDevice.device));
|
||||||
|
|
@ -340,7 +291,8 @@ export default function GateDevice(props: Props) {
|
||||||
container
|
container
|
||||||
direction={(isMobile) ? "column" : "row"}
|
direction={(isMobile) ? "column" : "row"}
|
||||||
width="100%"
|
width="100%"
|
||||||
alignItems="center"
|
spacing={(isMobile) ? 7 : 0}
|
||||||
|
//alignItems="center"
|
||||||
>
|
>
|
||||||
<Grid size={{ sm: 12, lg: isMobile || drawerView ? 12 : 4}} style={{ padding: 10 }}>
|
<Grid size={{ sm: 12, lg: isMobile || drawerView ? 12 : 4}} style={{ padding: 10 }}>
|
||||||
<Box
|
<Box
|
||||||
|
|
@ -363,7 +315,7 @@ export default function GateDevice(props: Props) {
|
||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
<Card raised>
|
<Card>
|
||||||
<GateSVG
|
<GateSVG
|
||||||
finalTemp={
|
finalTemp={
|
||||||
gate.gateMutations[device.id().toString()] &&
|
gate.gateMutations[device.id().toString()] &&
|
||||||
|
|
|
||||||
|
|
@ -70,8 +70,9 @@ export default function GateFlowGraph(props: Props) {
|
||||||
const classes = useStyles();
|
const classes = useStyles();
|
||||||
const [flowEvents, setFlowEvents] = useState<pond.AirFlowEvent[]>([]);
|
const [flowEvents, setFlowEvents] = useState<pond.AirFlowEvent[]>([]);
|
||||||
const [eventsLoading, setEventsLoading] = useState(false);
|
const [eventsLoading, setEventsLoading] = useState(false);
|
||||||
const eventThreshold = 5;
|
//these two constants could be entered by the user at time of retrieval
|
||||||
const idleFlow = 2.44;
|
const eventThreshold = 5; //the threshold that if crossed from one measurement to the next during a flow event will end the current flow event and start a new one
|
||||||
|
const idleFlow = 3.5; //the mass air flow that must be crossed in order to start a flow event, anything below this will not start an event but must go below this to end an event
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (loadingChartData) return;
|
if (loadingChartData) return;
|
||||||
|
|
@ -102,7 +103,6 @@ export default function GateFlowGraph(props: Props) {
|
||||||
timestamp: time.valueOf(),
|
timestamp: time.valueOf(),
|
||||||
value: val.airFlow ?? 0
|
value: val.airFlow ?? 0
|
||||||
};
|
};
|
||||||
|
|
||||||
data.push(newPoint);
|
data.push(newPoint);
|
||||||
if (!recent || recent.timestamp < newPoint.timestamp) {
|
if (!recent || recent.timestamp < newPoint.timestamp) {
|
||||||
recent = newPoint;
|
recent = newPoint;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue