Skip to content

Hide Incomplete Exporter Features [AARD-2099] #1288

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
BrandonPacewic merged 4 commits into from
Aug 21, 2025
Merged

Hide Incomplete Exporter Features [AARD-2099] #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a303710
feat: hide material tagging UI and mix and match toggle
rutmanz Aug 20, 2025
b950612
feat: hide unused wheeltypes
rutmanz Aug 20, 2025
a864e7e
Merge branch 'dev' into zachr/2099/exporter-ui-cleanup
rutmanz Aug 21, 2025
3e8af48
Merge branch 'dev' into zachr/2099/exporter-ui-cleanup
rutmanz Aug 21, 2025
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
26 changes: 15 additions & 11 deletions exporter/SynthesisFusionAddin/web/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useState } from "react"

import "./App.css"
import { RestartAlt, Settings, SportsFootball, Texture } from "@mui/icons-material"
import { RestartAlt, Settings, SportsFootball } from "@mui/icons-material"
import DownloadIcon from "@mui/icons-material/Download"
import PrecisionManufacturingIcon from "@mui/icons-material/PrecisionManufacturing"
import SaveIcon from "@mui/icons-material/Save"
Expand Down Expand Up @@ -36,7 +36,7 @@ import GamepiecesConfigTab from "./ui/GamepiecesConfigTab.tsx"
import GeneralConfigTab from "./ui/GeneralConfigTab.tsx"
import GlobalAlert from "./ui/GlobalAlert.tsx"
import JointsConfigTab from "./ui/JointsConfigTab.tsx"
import MaterialTaggingTab, { type TaggedBody } from "./ui/MaterialTaggingTab.tsx"
import type { TaggedBody } from "./ui/MaterialTaggingTab.tsx"

function TabPanel(props: { children?: React.ReactNode; value: number; index: number }) {
const { children, value, index, ...other } = props
Expand Down Expand Up @@ -179,7 +179,11 @@ function App() {
return (
<ThemeProvider theme={theme}>
<Backdrop
sx={theme => ({ color: "#fff", zIndex: theme.zIndex.drawer + 1, backdropFilter: "blur(0px)" })}
sx={theme => ({
color: "#fff",
zIndex: theme.zIndex.drawer + 1,
backdropFilter: "blur(0px)",
})}
open={isSelecting}
onClick={() => {
Global_SetAlert(
Expand Down Expand Up @@ -227,7 +231,7 @@ function App() {
disabled={generalConfig.exportMode === ExportMode.ROBOT}
/>

<Tab icon={<Texture />} iconPosition={"start"} label="Materials" />
{/*<Tab icon={<Texture />} iconPosition={"start"} label="Materials" />*/}

{/*<Tab label="APS" />*/}
</Tabs>
Expand All @@ -252,13 +256,13 @@ function App() {
selection={{ isSelecting, setIsSelecting }}
/>
</TabPanel>
<TabPanel value={activeTab} index={3}>
<MaterialTaggingTab
tags={taggedBodies}
updateTags={updateTaggedBodies}
selection={{ isSelecting, setIsSelecting }}
/>
</TabPanel>
{/*<TabPanel value={activeTab} index={3}>*/}
{/* <MaterialTaggingTab*/}
{/* tags={taggedBodies}*/}
{/* updateTags={updateTaggedBodies}*/}
{/* selection={{ isSelecting, setIsSelecting }}*/}
{/* />*/}
{/*</TabPanel>*/}
<Container
sx={{
position: "sticky",
Expand Down
16 changes: 8 additions & 8 deletions exporter/SynthesisFusionAddin/web/src/ui/GeneralConfigTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import AnimationIcon from "@mui/icons-material/Animation"
import ArchiveIcon from "@mui/icons-material/Archive"
import BalanceIcon from "@mui/icons-material/Balance"
import LaunchIcon from "@mui/icons-material/Launch"
import PrecisionManufacturingIcon from "@mui/icons-material/PrecisionManufacturing"
import SaveIcon from "@mui/icons-material/Save"
import TuneIcon from "@mui/icons-material/Tune"
import {
Expand Down Expand Up @@ -135,13 +134,14 @@ function GeneralConfigTab({ config, updateConfigItem }: ConfigTabProps): React.R
<Switch edge="end" onChange={updateLiteral("compressOutput")} checked={config.compressOutput} />
</ListItem>
<Collapse in={config.exportMode === ExportMode.ROBOT}>
<ListItem>
<ListItemIcon>
<PrecisionManufacturingIcon />
</ListItemIcon>
<ListItemText primary="Export as Part" secondary="Use to export as a part for Mix And Match" />
<Switch edge="end" onChange={updateLiteral("exportAsPart")} checked={config.exportAsPart} />
</ListItem>
{/* TODO: enable when mix and match is created */}
{/*<ListItem>*/}
{/* <ListItemIcon>*/}
{/* <PrecisionManufacturingIcon />*/}
{/* </ListItemIcon>*/}
{/* <ListItemText primary="Export as Part" secondary="Use to export as a part for Mix And Match" />*/}
{/* <Switch edge="end" onChange={updateLiteral("exportAsPart")} checked={config.exportAsPart} />*/}
{/*</ListItem>*/}
<ListItem>
<ListItemIcon>
<TuneIcon />
Expand Down
7 changes: 4 additions & 3 deletions exporter/SynthesisFusionAddin/web/src/ui/JointsConfigTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,8 @@ function JointsConfigTab({ joints, updateJoints, selection }: JointsConfigTabPro
/>

<h4>
{joints.filter(j => j.isWheel).length} Wheel{joints.filter(j => j.isWheel).length !== 1 ? "s" : ""}
{joints.filter(j => j.isWheel).length} Wheel
{joints.filter(j => j.isWheel).length !== 1 ? "s" : ""}
</h4>
<TableContainer component={Paper} elevation={6}>
<Table sx={{ minWidth: 650 }} aria-label="simple table">
Expand Down Expand Up @@ -241,8 +242,8 @@ function JointsConfigTab({ joints, updateJoints, selection }: JointsConfigTabPro
fullWidth
>
<MenuItem value={WheelType.STANDARD}>Standard</MenuItem>
<MenuItem value={WheelType.MECANUM}>Mecanum</MenuItem>
<MenuItem value={WheelType.OMNI}>Omni</MenuItem>
{/*<MenuItem value={WheelType.MECANUM}>Mecanum</MenuItem>*/}
{/*<MenuItem value={WheelType.OMNI}>Omni</MenuItem>*/}
</Select>
</TableCell>
</TableRow>
Expand Down
Loading