Skip to content

removed obstacles from gui #227

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

Merged
shueja merged 5 commits into from
Jan 8, 2024
Merged

removed obstacles from gui #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08266a6
removed obstacles from gui
LewisSeiden Jan 8, 2024
3138c38
ran formatter
LewisSeiden Jan 8, 2024
757b175
added global flag for obstacle disable
LewisSeiden Jan 8, 2024
636d445
disabled obstacles in rust call
LewisSeiden Jan 8, 2024
fea393b
commented out whole rust loop
LewisSeiden Jan 8, 2024
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
14 changes: 8 additions & 6 deletions src-tauri/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,13 +342,15 @@ async fn generate_trajectory(

path_builder.set_bumpers(config.bumperLength, config.bumperWidth);

for o in circleObstacles {
path_builder.sgmt_circle_obstacle(0, wpt_cnt - 1, o.x, o.y, o.radius);
}
// Skip obstacles for now while we figure out whats wrong with them
// for o in circleObstacles {
// path_builder.sgmt_circle_obstacle(0, wpt_cnt - 1, o.x, o.y, o.radius);
// }

for o in polygonObstacles {
path_builder.sgmt_polygon_obstacle(0, wpt_cnt - 1, o.x, o.y, o.radius);
}
// Skip obstacles for now while we figure out whats wrong with them
// for o in polygonObstacles {
// path_builder.sgmt_polygon_obstacle(0, wpt_cnt - 1, o.x, o.y, o.radius);
// }
path_builder.set_drivetrain(&drivetrain);
path_builder.generate()
}
Expand Down
7 changes: 6 additions & 1 deletion src/components/navbar/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
NavbarItemData,
NavbarItemSectionLengths,
NavbarItemSplitPoints,
ObstaclesEnabled,
} from "../../document/UIStateStore";

type Props = {};
Expand All @@ -25,7 +26,11 @@ class Navbar extends Component<Props, State> {
this.context.model.uiState;
return (
<div className={styles.Container}>
{NavbarItemSectionLengths.map((endSplit, sectionIdx) => (
{NavbarItemSectionLengths.filter(
(endSplit, sectionIdx) =>
sectionIdx != NavbarItemSectionLengths.length - 1 ||
ObstaclesEnabled
).map((endSplit, sectionIdx) => (
<ToggleButtonGroup
className={styles.ToggleGroup}
exclusive
Expand Down
61 changes: 36 additions & 25 deletions src/components/sidebar/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import Add from "@mui/icons-material/Add";
import SidebarConstraint from "./SidebarConstraint";
import SidebarObstacle from "./SidebarObstacle";
import { ICircularObstacleStore } from "../../document/CircularObstacleStore";
import { ObstaclesEnabled, UIStateStore } from "../../document/UIStateStore";

type Props = {};
type State = {};
Expand Down Expand Up @@ -139,32 +140,42 @@ class Sidebar extends Component<Props, State> {
</span>
</div>
)}
<Divider className={styles.SidebarDivider} textAlign="left" flexItem>
<span>OBSTACLES</span>
</Divider>
<div className={styles.WaypointList}>
{this.context.model.document.pathlist.activePath.obstacles.map(
(obstacle: ICircularObstacleStore, index: number) => {
return (
<SidebarObstacle
obstacle={obstacle}
index={index}
context={this.context}
></SidebarObstacle>
);
}
)}
</div>
{this.context.model.document.pathlist.activePath.obstacles.length ==
0 && (
<div className={styles.SidebarItem + " " + styles.Noninteractible}>
<span></span>
<span style={{ color: "gray", fontStyle: "italic" }}>
No Obstacles
</span>
</div>
{ObstaclesEnabled && (
<>
<Divider
className={styles.SidebarDivider}
textAlign="left"
flexItem
>
<span>OBSTACLES</span>
</Divider>
<div className={styles.WaypointList}>
{this.context.model.document.pathlist.activePath.obstacles.map(
(obstacle: ICircularObstacleStore, index: number) => {
return (
<SidebarObstacle
obstacle={obstacle}
index={index}
context={this.context}
></SidebarObstacle>
);
}
)}
</div>
{this.context.model.document.pathlist.activePath.obstacles
.length == 0 && (
<div
className={styles.SidebarItem + " " + styles.Noninteractible}
>
<span></span>
<span style={{ color: "gray", fontStyle: "italic" }}>
No Obstacles
</span>
</div>
)}
<Divider></Divider>
</>
)}
<Divider></Divider>
</div>
</div>
);
Expand Down
2 changes: 2 additions & 0 deletions src/document/UIStateStore.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ export const SelectableItem = types.union(
...Object.values(ConstraintStores)
);

export const ObstaclesEnabled = false;

/* Navbar stuff */
export let WaypointData: {
[key: string]: {
Expand Down