@wandelbots/wandelbots-js-react-components 2.24.2 → 2.25.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/jogging/JoggingCartesianTab.d.ts.map +1 -1
- package/dist/components/jogging/JoggingJointTab.d.ts.map +1 -1
- package/dist/components/jogging/JoggingStore.d.ts +2 -0
- package/dist/components/jogging/JoggingStore.d.ts.map +1 -1
- package/dist/index.cjs +22 -22
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +1018 -993
- package/dist/index.js.map +1 -1
- package/dist/themes/themeTypes.d.ts +1 -0
- package/dist/themes/themeTypes.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/components/jogging/JoggingCartesianTab.tsx +21 -3
- package/src/components/jogging/JoggingJointTab.tsx +42 -21
- package/src/components/jogging/JoggingStore.ts +3 -0
- package/src/themes/themeTypes.ts +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"themeTypes.d.ts","sourceRoot":"","sources":["../../src/themes/themeTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAE3C,KAAK,yBAAyB,GAAG;IAC/B,UAAU,CAAC,EAAE;QACX,OAAO,CAAC,EAAE;YACR,KAAK,CAAC,EAAE,MAAM,CAAA;YACd,QAAQ,CAAC,EAAE,MAAM,CAAA;YACjB,KAAK,CAAC,EAAE,MAAM,CAAA;YACd,YAAY,CAAC,EAAE,MAAM,CAAA;YACrB,aAAa,CAAC,EAAE,MAAM,CAAA;SACvB,CAAA;QACD,SAAS,CAAC,EAAE;YACV,KAAK,CAAC,EAAE,MAAM,CAAA;SACf,CAAA;KACF,CAAA;CACF,CAAA;AAED,MAAM,WAAW,0BAA0B;IACzC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,qBAAqB,CAAC,EAAE;QACtB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,OAAO,CAAC,EAAE,MAAM,CAAA;KACjB,CAAA;IACD,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,UAAU,uBAAuB;IAC/B,aAAa,CAAC,EAAE;QACd,YAAY,CAAC,EAAE;YACb,gBAAgB,CAAC,EAAE;gBACjB,IAAI,CAAC,EAAE;oBACL,CAAC,CAAC,EAAE,0BAA0B,CAAA;oBAC9B,CAAC,CAAC,EAAE,0BAA0B,CAAA;oBAC9B,CAAC,CAAC,EAAE,0BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"themeTypes.d.ts","sourceRoot":"","sources":["../../src/themes/themeTypes.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
ToggleButton,
|
|
5
5
|
Typography,
|
|
6
6
|
useTheme,
|
|
7
|
+
type Theme,
|
|
7
8
|
} from "@mui/material"
|
|
8
9
|
import { degreesToRadians, radiansToDegrees } from "@wandelbots/nova-js"
|
|
9
10
|
import { observer } from "mobx-react-lite"
|
|
@@ -140,21 +141,38 @@ export const JoggingCartesianTab = observer(
|
|
|
140
141
|
await store.deactivate()
|
|
141
142
|
}
|
|
142
143
|
|
|
144
|
+
function getAxisColors(
|
|
145
|
+
axisId: "X" | "Y" | "Z",
|
|
146
|
+
motionType: "translate" | "rotate",
|
|
147
|
+
theme: Theme,
|
|
148
|
+
) {
|
|
149
|
+
const axisColors =
|
|
150
|
+
theme.componentsExt?.JoggingPanel?.JoggingCartesian?.Axis
|
|
151
|
+
|
|
152
|
+
if (!axisColors) return undefined
|
|
153
|
+
|
|
154
|
+
if (motionType === "translate") {
|
|
155
|
+
return axisColors[axisId]
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
return axisColors.CustomRotation ?? axisColors[axisId]
|
|
159
|
+
}
|
|
160
|
+
|
|
143
161
|
const axisList = [
|
|
144
162
|
{
|
|
145
163
|
id: "x",
|
|
146
|
-
colors: theme.componentsExt?.JoggingPanel?.JoggingCartesian?.Axis?.X,
|
|
147
164
|
icon: <XAxisIcon />,
|
|
165
|
+
colors: getAxisColors("X", store.selectedCartesianMotionType, theme),
|
|
148
166
|
},
|
|
149
167
|
{
|
|
150
168
|
id: "y",
|
|
151
|
-
colors: theme.componentsExt?.JoggingPanel?.JoggingCartesian?.Axis?.Y,
|
|
152
169
|
icon: <YAxisIcon />,
|
|
170
|
+
colors: getAxisColors("Y", store.selectedCartesianMotionType, theme),
|
|
153
171
|
},
|
|
154
172
|
{
|
|
155
173
|
id: "z",
|
|
156
|
-
colors: theme.componentsExt?.JoggingPanel?.JoggingCartesian?.Axis?.Z,
|
|
157
174
|
icon: <ZAxisIcon />,
|
|
175
|
+
colors: getAxisColors("Z", store.selectedCartesianMotionType, theme),
|
|
158
176
|
},
|
|
159
177
|
] as const
|
|
160
178
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Divider, Stack } from "@mui/material"
|
|
1
|
+
import { Divider, Stack, Typography, useTheme } from "@mui/material"
|
|
2
2
|
import { radiansToDegrees } from "@wandelbots/nova-js"
|
|
3
3
|
import { observer } from "mobx-react-lite"
|
|
4
4
|
import type { ReactNode } from "react"
|
|
@@ -9,6 +9,7 @@ import { JoggingVelocitySlider } from "./JoggingVelocitySlider"
|
|
|
9
9
|
|
|
10
10
|
export const JoggingJointTab = observer(
|
|
11
11
|
({ store, children }: { store: JoggingStore; children: ReactNode }) => {
|
|
12
|
+
const theme = useTheme()
|
|
12
13
|
async function startJointJogging(opts: {
|
|
13
14
|
joint: number
|
|
14
15
|
direction: "-" | "+"
|
|
@@ -52,27 +53,47 @@ export const JoggingJointTab = observer(
|
|
|
52
53
|
: undefined
|
|
53
54
|
|
|
54
55
|
return (
|
|
55
|
-
<
|
|
56
|
+
<Stack
|
|
56
57
|
key={`joint-${joint.index}`}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
|
|
58
|
+
direction="row"
|
|
59
|
+
alignItems="center"
|
|
60
|
+
justifyContent={"center"}
|
|
61
|
+
spacing={1.5}
|
|
62
|
+
width={"100%"}
|
|
63
|
+
>
|
|
64
|
+
{store.showJointsLegend && (
|
|
65
|
+
<Typography
|
|
66
|
+
color={
|
|
67
|
+
store.isLocked
|
|
68
|
+
? theme.palette.text.disabled
|
|
69
|
+
: theme.palette.text.secondary
|
|
70
|
+
}
|
|
71
|
+
>
|
|
72
|
+
{`G${joint.index + 1}`}
|
|
73
|
+
</Typography>
|
|
74
|
+
)}
|
|
75
|
+
|
|
76
|
+
<JoggingJointRotationControl
|
|
77
|
+
disabled={store.isLocked}
|
|
78
|
+
lowerLimitDegs={lowerLimitDegs}
|
|
79
|
+
upperLimitDegs={upperLimitDegs}
|
|
80
|
+
getValueDegs={() => {
|
|
81
|
+
const value =
|
|
82
|
+
store.jogger.motionStream.rapidlyChangingMotionState
|
|
83
|
+
.state.joint_position.joints[joint.index]
|
|
84
|
+
return value !== undefined
|
|
85
|
+
? radiansToDegrees(value)
|
|
86
|
+
: undefined
|
|
87
|
+
}}
|
|
88
|
+
startJogging={(direction: "-" | "+") =>
|
|
89
|
+
startJointJogging({
|
|
90
|
+
joint: joint.index,
|
|
91
|
+
direction,
|
|
92
|
+
})
|
|
93
|
+
}
|
|
94
|
+
stopJogging={stopJointJogging}
|
|
95
|
+
/>
|
|
96
|
+
</Stack>
|
|
76
97
|
)
|
|
77
98
|
})}
|
|
78
99
|
</Stack>
|
|
@@ -125,6 +125,9 @@ export class JoggingStore {
|
|
|
125
125
|
/** Whether to show the legend before the slider */
|
|
126
126
|
showVelocityLegend: boolean = false
|
|
127
127
|
|
|
128
|
+
/** Whether to show the legend before the joints */
|
|
129
|
+
showJointsLegend: boolean = false
|
|
130
|
+
|
|
128
131
|
disposers: IReactionDisposer[] = []
|
|
129
132
|
|
|
130
133
|
/**
|