@wandelbots/wandelbots-js-react-components 1.24.2 → 1.24.5

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.
Files changed (18) hide show
  1. package/dist/components/jogging/JoggingOptions.d.ts.map +1 -1
  2. package/dist/components/jogging/JoggingStore.d.ts +1 -0
  3. package/dist/components/jogging/JoggingStore.d.ts.map +1 -1
  4. package/dist/components/robots/ABB_1200_07_7.d.ts.map +1 -1
  5. package/dist/components/robots/FANUC_LR_MATE_200ID.d.ts +3 -0
  6. package/dist/components/robots/FANUC_LR_MATE_200ID.d.ts.map +1 -0
  7. package/dist/index.cjs +24 -24
  8. package/dist/index.cjs.map +1 -1
  9. package/dist/index.js +1702 -1595
  10. package/dist/index.js.map +1 -1
  11. package/package.json +1 -1
  12. package/src/components/jogging/JoggingOptions.tsx +4 -1
  13. package/src/components/jogging/JoggingStore.ts +5 -1
  14. package/src/components/robots/ABB_1200_07_7.tsx +138 -67
  15. package/src/components/robots/{FANUC_LRMATE_200ID.tsx → FANUC_LR_MATE_200ID.tsx} +1 -1
  16. package/src/components/robots/SupportedRobot.tsx +3 -3
  17. package/dist/components/robots/FANUC_LRMATE_200ID.d.ts +0 -3
  18. package/dist/components/robots/FANUC_LRMATE_200ID.d.ts.map +0 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@wandelbots/wandelbots-js-react-components",
3
- "version": "1.24.2",
3
+ "version": "1.24.5",
4
4
  "description": "React UI toolkit for building applications on top of the Wandelbots platform",
5
5
  "type": "module",
6
6
  "sideEffects": false,
package/src/components/jogging/JoggingOptions.tsx CHANGED
@@ -54,7 +54,10 @@ export const JoggingOptions = observer(({ store }: { store: JoggingStore }) => {
54
54
  >
55
55
  {store.coordSystems.map((cs) => (
56
56
  <MenuItem key={cs.coordinate_system} value={cs.coordinate_system}>
57
- {cs.name || cs.coordinate_system}
57
+ {/* Distinguish coordinate systems with the same name */}
58
+ {cs.name && store.coordSystemCountByName[cs.name] > 1
59
+ ? `${cs.name} / ${cs.coordinate_system}`
60
+ : cs.name || cs.coordinate_system}
58
61
  </MenuItem>
59
62
  ))}
60
63
  </Select>
package/src/components/jogging/JoggingStore.ts CHANGED
@@ -5,6 +5,7 @@ import type {
5
5
  RobotTcp,
6
6
  } from "@wandelbots/wandelbots-js"
7
7
  import { tryParseJson } from "@wandelbots/wandelbots-js"
8
+ import { countBy } from "lodash-es"
8
9
  import keyBy from "lodash-es/keyBy"
9
10
  import uniqueId from "lodash-es/uniqueId"
10
11
  import {
@@ -169,6 +170,10 @@ export class JoggingStore {
169
170
  this.jogger.dispose()
170
171
  }
171
172
 
173
+ get coordSystemCountByName() {
174
+ return countBy(this.coordSystems, (cs) => cs.name)
175
+ }
176
+
172
177
  async deactivate(opts: { requireManualReactivation?: boolean } = {}) {
173
178
  if (this.activationState === "inactive") return
174
179
  const websocket = this.jogger.activeWebsocket
@@ -198,7 +203,6 @@ export class JoggingStore {
198
203
 
199
204
  /** Activate the jogger with current settings */
200
205
  async activate(opts: { manual?: boolean } = {}) {
201
- console.log("activate!!")
202
206
  if (this.manualActivationRequired && !opts.manual) return
203
207
 
204
208
  runInAction(() => {
package/src/components/robots/ABB_1200_07_7.tsx CHANGED
@@ -12,101 +12,172 @@ export function ABB_1200_07_7({ modelURL, ...props }: RobotModelProps) {
12
12
  const materials = gltf.materials
13
13
 
14
14
  return (
15
- <>
16
- <group {...props} dispose={null}>
17
- <group name="Scene">
18
- <group name="IRB1200_7_70_IRC5" rotation={[Math.PI / 2, 0, 0]}>
19
- <animated.group
20
- name="IRB1200_7_70_IRC5_J01"
21
- rotation={[-Math.PI / 2, 0, 0]}
22
- >
15
+ <group {...props} dispose={null}>
16
+ <group name="Empty">
17
+ <group name="visuals">
18
+ <mesh
19
+ name="visuals_1"
20
+ castShadow
21
+ receiveShadow
22
+ geometry={nodes.visuals_1.geometry}
23
+ material={materials.abb_metal_polished}
24
+ />
25
+ <mesh
26
+ name="visuals_2"
27
+ castShadow
28
+ receiveShadow
29
+ geometry={nodes.visuals_2.geometry}
30
+ material={materials.abb_white}
31
+ />
32
+ </group>
33
+ <animated.group name="ABB_IRB1200_J00">
34
+ <animated.group
35
+ name="ABB_IRB1200_J01"
36
+ position={[0, 0.399, 0]}
37
+ rotation={[-Math.PI / 2, -Math.PI / 2, 0]}
38
+ >
39
+ <animated.group name="ABB_IRB1200_J02" position={[0.35, 0, 0]}>
23
40
  <animated.group
24
- name="IRB1200_7_70_IRC5_J02"
25
- position={[0, 0.399, 0]}
26
- rotation={[-Math.PI / 2, -Math.PI / 2, 0]}
41
+ name="ABB_IRB1200_J03"
42
+ position={[0.042, 0, 0]}
43
+ rotation={[-Math.PI / 2, 0, 0]}
27
44
  >
28
45
  <animated.group
29
- name="IRB1200_7_70_IRC5_J03"
30
- position={[0.35, 0, 0]}
46
+ name="ABB_IRB1200_J04"
47
+ position={[0, 0.351, 0]}
48
+ rotation={[Math.PI / 2, 0, 0]}
31
49
  >
32
50
  <animated.group
33
- name="IRB1200_7_70_IRC5_J04"
34
- position={[0.042, 0, 0]}
35
- rotation={[-Math.PI / 2, 0, 0]}
51
+ name="ABB_IRB1200_J05"
52
+ rotation={[Math.PI / 2, 0, -Math.PI]}
36
53
  >
37
- <animated.group
38
- name="IRB1200_7_70_IRC5_J05"
39
- position={[0, 0.351, 0]}
40
- rotation={[Math.PI / 2, 0, 0]}
41
- >
42
- <animated.group
43
- name="IRB1200_7_70_IRC5_J06"
44
- rotation={[Math.PI / 2, 0, -Math.PI]}
45
- >
46
- <group
47
- name="IRB1200_7_70_IRC5_FLG"
48
- position={[0, 0.082, 0]}
49
- />
50
- <mesh
51
- name="IRB1200_7_70_IRC5_L06"
52
- castShadow
53
- receiveShadow
54
- geometry={nodes.IRB1200_7_70_IRC5_L06.geometry}
55
- material={materials["IRB1200_7-70_IRC5.003_Bake"]}
56
- />
57
- </animated.group>
58
- <mesh
59
- name="IRB1200_7_70_IRC5_L05"
60
- castShadow
61
- receiveShadow
62
- geometry={nodes.IRB1200_7_70_IRC5_L05.geometry}
63
- material={materials["IRB1200_7-70_IRC5.003_Bake"]}
64
- />
65
- </animated.group>
54
+ <group name="ABB_IRB1200_FLG" position={[0, 0.082, 0]} />
66
55
  <mesh
67
- name="IRB1200_7_70_IRC5_L04"
56
+ name="visuals006"
68
57
  castShadow
69
58
  receiveShadow
70
- geometry={nodes.IRB1200_7_70_IRC5_L04.geometry}
71
- material={materials["IRB1200_7-70_IRC5.003_Bake"]}
59
+ geometry={nodes.visuals006.geometry}
60
+ material={materials.abb_metal_black}
61
+ position={[0.791, -0.351, 0]}
62
+ rotation={[0, 0, Math.PI / 2]}
72
63
  />
73
64
  </animated.group>
65
+ <group
66
+ name="visuals005"
67
+ position={[-0.791, 0, 0.351]}
68
+ rotation={[Math.PI / 2, 0, -Math.PI / 2]}
69
+ >
70
+ <mesh
71
+ name="visuals005_1"
72
+ castShadow
73
+ receiveShadow
74
+ geometry={nodes.visuals005_1.geometry}
75
+ material={materials.abb_metal_polished}
76
+ />
77
+ <mesh
78
+ name="visuals005_2"
79
+ castShadow
80
+ receiveShadow
81
+ geometry={nodes.visuals005_2.geometry}
82
+ material={materials.abb_white}
83
+ />
84
+ </group>
85
+ </animated.group>
86
+ <group
87
+ name="visuals004"
88
+ position={[-0.791, 0, 0]}
89
+ rotation={[-Math.PI, 0, -Math.PI / 2]}
90
+ >
74
91
  <mesh
75
- name="IRB1200_7_70_IRC5_L03"
92
+ name="visuals004_1"
76
93
  castShadow
77
94
  receiveShadow
78
- geometry={nodes.IRB1200_7_70_IRC5_L03.geometry}
79
- material={materials["IRB1200_7-70_IRC5.003_Bake"]}
95
+ geometry={nodes.visuals004_1.geometry}
96
+ material={materials.abb_metal_polished}
80
97
  />
81
- </animated.group>
98
+ <mesh
99
+ name="visuals004_2"
100
+ castShadow
101
+ receiveShadow
102
+ geometry={nodes.visuals004_2.geometry}
103
+ material={materials.abb_white}
104
+ />
105
+ <mesh
106
+ name="visuals004_3"
107
+ castShadow
108
+ receiveShadow
109
+ geometry={nodes.visuals004_3.geometry}
110
+ material={materials.abb_red}
111
+ />
112
+ </group>
113
+ </animated.group>
114
+ <group
115
+ name="visuals003"
116
+ position={[-0.749, 0, 0]}
117
+ rotation={[Math.PI / 2, 0, -Math.PI / 2]}
118
+ >
82
119
  <mesh
83
- name="IRB1200_7_70_IRC5_L02"
120
+ name="visuals003_1"
84
121
  castShadow
85
122
  receiveShadow
86
- geometry={nodes.IRB1200_7_70_IRC5_L02.geometry}
87
- material={materials["IRB1200_7-70_IRC5.003_Bake"]}
123
+ geometry={nodes.visuals003_1.geometry}
124
+ material={materials.abb_white}
88
125
  />
89
- </animated.group>
126
+ <mesh
127
+ name="visuals003_2"
128
+ castShadow
129
+ receiveShadow
130
+ geometry={nodes.visuals003_2.geometry}
131
+ material={materials.abb_red}
132
+ />
133
+ <mesh
134
+ name="visuals003_3"
135
+ castShadow
136
+ receiveShadow
137
+ geometry={nodes.visuals003_3.geometry}
138
+ material={materials.abb_metal_polished}
139
+ />
140
+ </group>
141
+ </animated.group>
142
+ <group
143
+ name="visuals002"
144
+ position={[-0.399, 0, 0]}
145
+ rotation={[Math.PI / 2, 0, -Math.PI / 2]}
146
+ >
90
147
  <mesh
91
- name="IRB1200_7_70_IRC5_L01"
148
+ name="visuals002_1"
92
149
  castShadow
93
150
  receiveShadow
94
- geometry={nodes.IRB1200_7_70_IRC5_L01.geometry}
95
- material={materials["IRB1200_7-70_IRC5.003_Bake"]}
96
- rotation={[Math.PI / 2, 0, 0]}
151
+ geometry={nodes.visuals002_1.geometry}
152
+ material={materials.abb_white}
97
153
  />
98
- </animated.group>
154
+ <mesh
155
+ name="visuals002_2"
156
+ castShadow
157
+ receiveShadow
158
+ geometry={nodes.visuals002_2.geometry}
159
+ material={materials.abb_metal_polished}
160
+ />
161
+ </group>
162
+ </animated.group>
163
+ <group name="visuals001">
99
164
  <mesh
100
- name="IRB1200_7_70_IRC5_L00"
165
+ name="visuals001_1"
101
166
  castShadow
102
167
  receiveShadow
103
- geometry={nodes.IRB1200_7_70_IRC5_L00.geometry}
104
- material={materials["IRB1200_7-70_IRC5.003_Bake"]}
105
- rotation={[-Math.PI / 2, 0, 0]}
168
+ geometry={nodes.visuals001_1.geometry}
169
+ material={materials.abb_white}
170
+ />
171
+ <mesh
172
+ name="visuals001_2"
173
+ castShadow
174
+ receiveShadow
175
+ geometry={nodes.visuals001_2.geometry}
176
+ material={materials.abb_metal_polished}
106
177
  />
107
178
  </group>
108
- </group>
179
+ </animated.group>
109
180
  </group>
110
- </>
181
+ </group>
111
182
  )
112
183
  }
package/src/components/robots/{FANUC_LRMATE_200ID.tsx → FANUC_LR_MATE_200ID.tsx} RENAMED
@@ -28,7 +28,7 @@ type GLTFResult = GLTF & {
28
28
  }
29
29
  }
30
30
 
31
- export function FANUC_LRMATE_200ID({ modelURL, ...props }: RobotModelProps) {
31
+ export function FANUC_LR_MATE_200ID({ modelURL, ...props }: RobotModelProps) {
32
32
  const { nodes, materials } = useGLTF(modelURL) as GLTFResult
33
33
  return (
34
34
  <group {...props} dispose={null}>
package/src/components/robots/SupportedRobot.tsx CHANGED
@@ -8,7 +8,7 @@ import { FANUC_CRX10iA } from "./FANUC_CRX10iA"
8
8
  import { FANUC_CRX20iAL } from "./FANUC_CRX20iAL"
9
9
  import { FANUC_CRX25iA } from "./FANUC_CRX25iA"
10
10
  import { FANUC_CRX25iAL } from "./FANUC_CRX25iAL"
11
- import { FANUC_LRMATE_200ID } from "./FANUC_LRMATE_200ID"
11
+ import { FANUC_LR_MATE_200ID } from "./FANUC_LR_MATE_200ID"
12
12
  import { KUKA_KR16_R2010_2 } from "./KUKA_KR16_R2010_2"
13
13
  import { KUKA_KR210_R2700 } from "./KUKA_KR210_R2700"
14
14
  import { KUKA_KR270_R2700 } from "./KUKA_KR270_R2700"
@@ -208,8 +208,8 @@ export const SupportedRobot = externalizeComponent(
208
208
  case "FANUC_CRX25iAL":
209
209
  Robot = FANUC_CRX25iAL
210
210
  break
211
- case "FANUC_LRMATE_200ID":
212
- Robot = FANUC_LRMATE_200ID
211
+ case "FANUC_LR_MATE_200ID":
212
+ Robot = FANUC_LR_MATE_200ID
213
213
  break
214
214
  case "FANUC_ARC_Mate_120iD":
215
215
  Robot = FANUC_ARC_Mate_120iD
package/dist/components/robots/FANUC_LRMATE_200ID.d.ts DELETED
@@ -1,3 +0,0 @@
1
- import type { RobotModelProps } from "./types";
2
- export declare function FANUC_LRMATE_200ID({ modelURL, ...props }: RobotModelProps): import("react/jsx-runtime").JSX.Element;
3
- //# sourceMappingURL=FANUC_LRMATE_200ID.d.ts.map
package/dist/components/robots/FANUC_LRMATE_200ID.d.ts.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"FANUC_LRMATE_200ID.d.ts","sourceRoot":"","sources":["../../../src/components/robots/FANUC_LRMATE_200ID.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAsB9C,wBAAgB,kBAAkB,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,eAAe,2CA0HzE"}