-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathfoxglove.patch
644 lines (620 loc) · 24.4 KB
/
foxglove.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
diff --git a/packages/studio-base/src/Workspace.tsx b/packages/studio-base/src/Workspace.tsx
index 590543523..f3b7c9cec 100644
--- a/packages/studio-base/src/Workspace.tsx
+++ b/packages/studio-base/src/Workspace.tsx
@@ -10,7 +10,8 @@
// found at http://www.apache.org/licenses/LICENSE-2.0
// You may not use this file except in compliance with the License.
-import { Link, Typography } from "@mui/material";
+import { Link, Typography, IconButton } from "@mui/material";
+import CloudDownloadOutlinedIcon from '@mui/icons-material/CloudDownloadOutlined';
import { useSnackbar } from "notistack";
import { extname } from "path";
import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
@@ -141,14 +142,6 @@ function AddPanel() {
);
}
-function ExtensionsSidebar() {
- return (
- <SidebarContent title="Extensions" disablePadding>
- <ExtensionsSettings />
- </SidebarContent>
- );
-}
-
type WorkspaceProps = CustomWindowControlsProps & {
deepLinks?: string[];
appBarLeftInset?: number;
@@ -360,6 +353,46 @@ function WorkspaceContent(props: WorkspaceProps): JSX.Element {
const { enqueueSnackbar } = useSnackbar();
const installExtension = useExtensionCatalog((state) => state.installExtension);
+ const downloadExtension = useExtensionCatalog((state) => state.downloadExtension);
+
+ const reloadServerExtensions = async () => {
+ let res = await fetch("/extensions.list");
+ if (!res.ok) return log.error("Failed to fetch server extensions");
+ for (let name of (await res.text()).split("\n")) {
+ if (!name) continue;
+ console.log("[injector] Loading extension:", name);
+ try {
+ let data = await downloadExtension(`/${name}`);
+ let extension = await installExtension("local", data);
+ enqueueSnackbar(`Installed extension ${extension.id}`, { variant: "success" });
+ } catch (e) {
+ enqueueSnackbar(`Failed to install ${name}: ${e.message}`, {variant: "error"});
+ }
+ }
+ };
+
+ const ExtensionsSidebar = useMemo(() => {
+ return function() {
+ return (
+ <SidebarContent
+ title="Extensions"
+ disablePadding
+ trailingItems={[
+ <IconButton
+ color="primary"
+ onClick={reloadServerExtensions}
+ aria-label="Reload extensions from server"
+ title="Reload extensions from server"
+ >
+ <CloudDownloadOutlinedIcon />
+ </IconButton>,
+ ]}
+ >
+ <ExtensionsSettings />
+ </SidebarContent>
+ );
+ }
+ }, []);
const openHandle = useCallback(
async (
diff --git a/packages/studio-base/src/components/LayoutBrowser/index.tsx b/packages/studio-base/src/components/LayoutBrowser/index.tsx
index f426dae89..3986b48b2 100644
--- a/packages/studio-base/src/components/LayoutBrowser/index.tsx
+++ b/packages/studio-base/src/components/LayoutBrowser/index.tsx
@@ -5,6 +5,7 @@
import AddIcon from "@mui/icons-material/Add";
import CloudOffIcon from "@mui/icons-material/CloudOff";
import FileOpenOutlinedIcon from "@mui/icons-material/FileOpenOutlined";
+import CloudDownloadOutlinedIcon from "@mui/icons-material/CloudDownloadOutlined";
import {
Button,
IconButton,
@@ -461,6 +462,43 @@ export default function LayoutBrowser({
[analytics, layoutManager, onSelectLayout],
);
+ const tryInstallLayout = async (layoutName: string, content: string) => {
+ if (!isMounted()) {
+ return;
+ }
+
+ let parsedState: unknown;
+ try {
+ parsedState = JSON.parse(content);
+ } catch (err) {
+ enqueueSnackbar(`${layoutName} is not a valid layout: ${err.message}`, {
+ variant: "error",
+ });
+ return;
+ }
+
+ if (typeof parsedState !== "object" || !parsedState) {
+ enqueueSnackbar(`${layoutName} is not a valid layout`, { variant: "error" });
+ return;
+ }
+
+ const data = parsedState as LayoutData;
+ const oldLayout = (await layoutManager.getLayouts()).find(
+ (layout) => layout.name === layoutName
+ );
+ if (oldLayout) {
+ await layoutManager.updateLayout({id: oldLayout.id, data});
+ return oldLayout;
+ } else {
+ const newLayout = await layoutManager.saveNewLayout({
+ name: layoutName,
+ data,
+ permission: "CREATOR_WRITE",
+ });
+ return newLayout;
+ }
+ };
+
const importLayout = useCallbackWithToast(async () => {
if (!(await promptForUnsavedChanges())) {
return;
@@ -486,33 +524,7 @@ export default function LayoutBrowser({
const file = await fileHandle.getFile();
const layoutName = path.basename(file.name, path.extname(file.name));
const content = await file.text();
-
- if (!isMounted()) {
- return;
- }
-
- let parsedState: unknown;
- try {
- parsedState = JSON.parse(content);
- } catch (err) {
- enqueueSnackbar(`${file.name} is not a valid layout: ${err.message}`, {
- variant: "error",
- });
- return;
- }
-
- if (typeof parsedState !== "object" || !parsedState) {
- enqueueSnackbar(`${file.name} is not a valid layout`, { variant: "error" });
- return;
- }
-
- const data = parsedState as LayoutData;
- const newLayout = await layoutManager.saveNewLayout({
- name: layoutName,
- data,
- permission: "CREATOR_WRITE",
- });
- return newLayout;
+ return await tryInstallLayout(layoutName, content);
}),
);
@@ -533,6 +545,19 @@ export default function LayoutBrowser({
promptForUnsavedChanges,
]);
+ const importServerLayouts = async () => {
+ let res = await fetch("/layouts.list");
+ if (!res.ok) return log.error("Failed to fetch server layouts");
+ for (let name of (await res.text()).split("\n")) {
+ if (!name) continue;
+ let layoutName = "[Server] " + path.basename(name, path.extname(name));
+ let res = await fetch(`/${name}`);
+ if (!res.ok) continue;
+ console.log("[injector] Loading layout:", layoutName);
+ await tryInstallLayout(layoutName, await res.text());
+ }
+ };
+
const layoutDebug = useContext(LayoutStorageDebuggingContext);
const [enableNewTopNav = false] = useAppConfigurationValue<boolean>(AppSetting.ENABLE_NEW_TOPNAV);
@@ -585,6 +610,15 @@ export default function LayoutBrowser({
>
<FileOpenOutlinedIcon />
</IconButton>,
+ <IconButton
+ color="primary"
+ key="import-server-layouts"
+ onClick={importServerLayouts}
+ aria-label="Import layouts from server"
+ title="Import layouts from server"
+ >
+ <CloudDownloadOutlinedIcon />
+ </IconButton>,
].filter(Boolean)}
>
{promptModal}
diff --git a/packages/studio-base/src/components/OpenDialog/useOpenFile.tsx b/packages/studio-base/src/components/OpenDialog/useOpenFile.tsx
index 71cd572a1..fd3d1920c 100644
--- a/packages/studio-base/src/components/OpenDialog/useOpenFile.tsx
+++ b/packages/studio-base/src/components/OpenDialog/useOpenFile.tsx
@@ -58,6 +58,37 @@ export function useOpenFile(sources: IDataSourceFactory[]): () => Promise<void>
throw new Error(`Cannot find source to handle ${file.name}`);
}
+ // const fileChanged = async (records: any, observer: any) => {
+ // const changedFileHandle = records[0].changedHandle;
+ // console.log("File changed", changedFileHandle)
+ // console.log(await changedFileHandle.queryPermission({mode: "read"}))
+ // selectSource(foundSource.id, { type: "file", handle: changedFileHandle });
+ // }
+ // const observer = new (window as any).FileSystemObserver(fileChanged);
+ // await observer.observe(fileHandle)
+ // console.log("observer created")
+
+ let intervalHandle = (window as any).__watch_interval__;
+ if (intervalHandle !== undefined) {
+ console.log("Cleared previous interval");
+ clearInterval(intervalHandle);
+ }
+
+ let lastKnownTimestamp = file.lastModified;
+ const watchForChanges = async () => {
+ const file = await fileHandle.getFile();
+ const timestamp = file.lastModified;
+ if (timestamp > lastKnownTimestamp) {
+ lastKnownTimestamp = timestamp;
+ console.log("File changed");
+ selectSource(foundSource.id, { type: "file", handle: fileHandle });
+ } else {
+ console.log("Not changed");
+ }
+ }
+
+ (window as any).__watch_interval__ = setInterval(watchForChanges, 300);
+
selectSource(foundSource.id, { type: "file", handle: fileHandle });
}, [allExtensions, selectSource, sources]);
}
diff --git a/packages/studio-base/src/components/Sidebars/index.tsx b/packages/studio-base/src/components/Sidebars/index.tsx
index b917517de..818589e15 100644
--- a/packages/studio-base/src/components/Sidebars/index.tsx
+++ b/packages/studio-base/src/components/Sidebars/index.tsx
@@ -2,11 +2,10 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/
-import HelpOutlineIcon from "@mui/icons-material/HelpOutline";
+import AspectRatioIcon from '@mui/icons-material/AspectRatio';
import { Badge, Paper, Tab, Tabs } from "@mui/material";
import {
ComponentProps,
- MouseEvent,
PropsWithChildren,
useCallback,
useEffect,
@@ -17,7 +16,6 @@ import { MosaicNode, MosaicWithoutDragDropContext } from "react-mosaic-component
import { makeStyles } from "tss-react/mui";
import { AppSetting } from "@foxglove/studio-base/AppSetting";
-import { HelpMenu } from "@foxglove/studio-base/components/AppBar/HelpMenu";
import { BuiltinIcon } from "@foxglove/studio-base/components/BuiltinIcon";
import ErrorBoundary from "@foxglove/studio-base/components/ErrorBoundary";
import { MemoryUseIndicator } from "@foxglove/studio-base/components/MemoryUseIndicator";
@@ -121,6 +119,14 @@ function mosiacRightSidebarSplitPercentage(node: MosaicNode<LayoutNode>): number
}
}
+function toggleFullScreen() {
+ if (!document.fullscreenElement) {
+ document.documentElement.requestFullscreen();
+ } else if (document.exitFullscreen) {
+ document.exitFullscreen();
+ }
+}
+
type SidebarProps<OldLeftKey, LeftKey, RightKey> = PropsWithChildren<{
items: Map<OldLeftKey, SidebarItem>;
bottomItems: Map<OldLeftKey, SidebarItem>;
@@ -180,17 +186,6 @@ export default function Sidebars<
return new Map([...items, ...bottomItems]);
}, [bottomItems, items]);
- const [helpAnchorEl, setHelpAnchorEl] = useState<undefined | HTMLElement>(undefined);
-
- const helpMenuOpen = Boolean(helpAnchorEl);
-
- const handleHelpClick = (event: MouseEvent<HTMLElement>) => {
- setHelpAnchorEl(event.currentTarget);
- };
- const handleHelpClose = () => {
- setHelpAnchorEl(undefined);
- };
-
const oldLeftSidebarOpen = !enableNewTopNav
? selectedKey != undefined && allOldLeftItems.has(selectedKey)
: false;
@@ -334,29 +329,13 @@ export default function Sidebars<
<Tab
className={classes.tab}
color="inherit"
- id="help-button"
- aria-label="Help menu button"
- aria-controls={helpMenuOpen ? "help-menu" : undefined}
- aria-haspopup="true"
- aria-expanded={helpMenuOpen ? "true" : undefined}
- onClick={(event) => handleHelpClick(event)}
- icon={<HelpOutlineIcon color={helpMenuOpen ? "primary" : "inherit"} />}
+ id="fullscreen-toggle"
+ aria-label="Toggle fullscreen"
+ onClick={() => toggleFullScreen()}
+ icon={<AspectRatioIcon />}
/>
{bottomTabs}
</Tabs>
- <HelpMenu
- anchorEl={helpAnchorEl}
- open={helpMenuOpen}
- handleClose={handleHelpClose}
- anchorOrigin={{
- horizontal: "right",
- vertical: "bottom",
- }}
- transformOrigin={{
- vertical: "bottom",
- horizontal: "left",
- }}
- />
</Stack>
)}
{
diff --git a/packages/studio-base/src/panels/ThreeDeeRender/Input.ts b/packages/studio-base/src/panels/ThreeDeeRender/Input.ts
index fb37b28ef..b536b9734 100644
--- a/packages/studio-base/src/panels/ThreeDeeRender/Input.ts
+++ b/packages/studio-base/src/panels/ThreeDeeRender/Input.ts
@@ -132,16 +132,29 @@ export class Input extends EventEmitter<InputEvents> {
this.emit("click", this.cursorCoords, this.worldSpaceCursorCoords, event);
};
+ private convertEvent = (event: TouchEvent): MouseEvent | null => {
+ // Helper function to convert TouchEvent to fake MouseEvent
+ let touch = event.touches[0];
+ if (!touch || !event.target) return null;
+ let rect = (event.target as Element).getBoundingClientRect();
+ // Other code only uses .offsetX/Y, so other attributes are not necessary
+ let ev = { offsetX: touch.pageX - rect.left, offsetY: touch.pageY - rect.top };
+ return ev as MouseEvent;
+ }
+
private onTouchStart = (event: TouchEvent): void => {
- const touch = event.touches[0];
- if (touch) {
- this.startClientPos = new THREE.Vector2(touch.clientX, touch.clientY);
- }
event.preventDefault();
+ let ev = this.convertEvent(event);
+ if (!ev) return;
+ this.startClientPos = new THREE.Vector2(ev.offsetX, ev.offsetY);
+ this.updateCursorCoords(ev);
};
private onTouchEnd = (event: TouchEvent): void => {
event.preventDefault();
+ // "touchend" doesn't have any touches, so we can't create a proper event
+ let ev = {} as MouseEvent;
+ this.emit("click", this.cursorCoords, this.worldSpaceCursorCoords, ev);
};
private onTouchMove = (event: TouchEvent): void => {
diff --git a/packages/studio-base/src/panels/ThreeDeeRender/ThreeDeeRender.tsx b/packages/studio-base/src/panels/ThreeDeeRender/ThreeDeeRender.tsx
index af28037e2..336426063 100644
--- a/packages/studio-base/src/panels/ThreeDeeRender/ThreeDeeRender.tsx
+++ b/packages/studio-base/src/panels/ThreeDeeRender/ThreeDeeRender.tsx
@@ -3,20 +3,12 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/
import { Ruler24Filled } from "@fluentui/react-icons";
-import {
- IconButton,
- ListItemIcon,
- ListItemText,
- Menu,
- MenuItem,
- Paper,
- useTheme,
-} from "@mui/material";
+import { IconButton, Paper } from "@mui/material";
import { Immutable } from "immer";
import { cloneDeep, isEqual, merge } from "lodash";
import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
import ReactDOM from "react-dom";
-import { useLatest, useLongPress } from "react-use";
+import { useLatest } from "react-use";
import { DeepPartial } from "ts-essentials";
import { makeStyles } from "tss-react/mui";
import { useDebouncedCallback } from "use-debounce";
@@ -199,22 +191,22 @@ function RendererOverlay(props: {
() =>
selectedRenderable
? {
- object: {
- pose: selectedRenderable.renderable.pose,
- interactionData: {
- topic: selectedRenderable.renderable.topic,
- highlighted: true,
- originalMessage: selectedRenderable.renderable.details(),
- instanceDetails:
- selectedRenderable.instanceIndex != undefined
- ? selectedRenderable.renderable.instanceDetails(
- selectedRenderable.instanceIndex,
- )
- : undefined,
- },
+ object: {
+ pose: selectedRenderable.renderable.pose,
+ interactionData: {
+ topic: selectedRenderable.renderable.topic,
+ highlighted: true,
+ originalMessage: selectedRenderable.renderable.details(),
+ instanceDetails:
+ selectedRenderable.instanceIndex != undefined
+ ? selectedRenderable.renderable.instanceDetails(
+ selectedRenderable.instanceIndex,
+ )
+ : undefined,
},
- instanceIndex: selectedRenderable.instanceIndex,
- }
+ },
+ instanceIndex: selectedRenderable.instanceIndex,
+ }
: undefined,
[selectedRenderable],
);
@@ -225,15 +217,6 @@ function RendererOverlay(props: {
}, [renderer, selectedRenderable]);
const publickClickButtonRef = useRef<HTMLButtonElement>(ReactNull);
- const [publishMenuExpanded, setPublishMenuExpanded] = useState(false);
- const selectedPublishClickIcon = PublishClickIcons[props.publishClickType];
-
- const onLongPressPublish = useCallback(() => {
- setPublishMenuExpanded(true);
- }, []);
- const longPressPublishEvent = useLongPress(onLongPressPublish);
-
- const theme = useTheme();
// Publish control is only available if the canPublish prop is true and we have a fixed frame in the renderer
const showPublishControl =
@@ -241,67 +224,41 @@ function RendererOverlay(props: {
const publishControls = showPublishControl && (
<>
<IconButton
- {...longPressPublishEvent}
- color={props.publishActive ? "info" : "inherit"}
- title={props.publishActive ? "Click to cancel" : "Click to publish"}
+ color={props.publishActive && props.publishClickType === "point" ? "info" : "inherit"}
+ title="Publish point"
ref={publickClickButtonRef}
- onClick={props.onClickPublish}
- data-testid="publish-button"
+ onClick={() => {
+ if (props.publishClickType == "point") props.onClickPublish();
+ else props.onChangePublishClickType("point");
+ }}
style={{ fontSize: "1rem", pointerEvents: "auto" }}
>
- {selectedPublishClickIcon}
- <div
- style={{
- borderBottom: "6px solid currentColor",
- borderRight: "6px solid transparent",
- bottom: 0,
- left: 0,
- height: 0,
- width: 0,
- margin: theme.spacing(0.25),
- position: "absolute",
- }}
- />
+ {PublishClickIcons.point}
+ </IconButton>
+ <IconButton
+ color={props.publishActive && props.publishClickType === "pose" ? "info" : "inherit"}
+ title="Publish pose"
+ ref={publickClickButtonRef}
+ onClick={() => {
+ if (props.publishClickType == "pose") props.onClickPublish();
+ else props.onChangePublishClickType("pose");
+ }}
+ style={{ fontSize: "1rem", pointerEvents: "auto" }}
+ >
+ {PublishClickIcons.pose}
</IconButton>
- <Menu
- id="publish-menu"
- anchorEl={publickClickButtonRef.current}
- anchorOrigin={{ vertical: "top", horizontal: "left" }}
- transformOrigin={{ vertical: "top", horizontal: "right" }}
- open={publishMenuExpanded}
- onClose={() => setPublishMenuExpanded(false)}
+ <IconButton
+ color={props.publishActive && props.publishClickType === "pose_estimate" ? "info" : "inherit"}
+ title="Publish pose estimate"
+ ref={publickClickButtonRef}
+ onClick={() => {
+ if (props.publishClickType == "pose_estimate") props.onClickPublish();
+ else props.onChangePublishClickType("pose_estimate");
+ }}
+ style={{ fontSize: "1rem", pointerEvents: "auto" }}
>
- <MenuItem
- selected={props.publishClickType === "pose_estimate"}
- onClick={() => {
- props.onChangePublishClickType("pose_estimate");
- setPublishMenuExpanded(false);
- }}
- >
- <ListItemIcon>{PublishClickIcons.pose_estimate}</ListItemIcon>
- <ListItemText>Publish pose estimate</ListItemText>
- </MenuItem>
- <MenuItem
- selected={props.publishClickType === "pose"}
- onClick={() => {
- props.onChangePublishClickType("pose");
- setPublishMenuExpanded(false);
- }}
- >
- <ListItemIcon>{PublishClickIcons.pose}</ListItemIcon>
- <ListItemText>Publish pose</ListItemText>
- </MenuItem>
- <MenuItem
- selected={props.publishClickType === "point"}
- onClick={() => {
- props.onChangePublishClickType("point");
- setPublishMenuExpanded(false);
- }}
- >
- <ListItemIcon>{PublishClickIcons.point}</ListItemIcon>
- <ListItemText>Publish point</ListItemText>
- </MenuItem>
- </Menu>
+ {PublishClickIcons.pose_estimate}
+ </IconButton>
</>
);
@@ -327,27 +284,31 @@ function RendererOverlay(props: {
timezone={props.timezone}
/>
{props.interfaceMode === "3d" && (
- <Paper square={false} elevation={4} style={{ display: "flex", flexDirection: "column" }}>
- <IconButton
- className={classes.iconButton}
- color={props.perspective ? "info" : "inherit"}
- title={props.perspective ? "Switch to 2D camera" : "Switch to 3D camera"}
- onClick={props.onTogglePerspective}
- >
- <span className={classes.threeDeeButton}>3D</span>
- </IconButton>
- <IconButton
- data-testid="measure-button"
- className={classes.iconButton}
- color={props.measureActive ? "info" : "inherit"}
- title={props.measureActive ? "Cancel measuring" : "Measure distance"}
- onClick={props.onClickMeasure}
- >
- <Ruler24Filled className={classes.rulerIcon} />
- </IconButton>
-
- {publishControls}
- </Paper>
+ <>
+ <Paper square={false} elevation={4} style={{ display: "flex", flexDirection: "column" }}>
+ <IconButton
+ className={classes.iconButton}
+ color={props.perspective ? "info" : "inherit"}
+ title={props.perspective ? "Switch to 2D camera" : "Switch to 3D camera"}
+ onClick={props.onTogglePerspective}
+ >
+ <span className={classes.threeDeeButton}>3D</span>
+ </IconButton>
+ <IconButton
+ data-testid="measure-button"
+ className={classes.iconButton}
+ color={props.measureActive ? "info" : "inherit"}
+ title={props.measureActive ? "Cancel measuring" : "Measure distance"}
+ onClick={props.onClickMeasure}
+ >
+ <Ruler24Filled className={classes.rulerIcon} />
+ </IconButton>
+ </Paper>
+
+ <Paper square={false} elevation={4} style={{ display: "flex", flexDirection: "column" }}>
+ {publishControls}
+ </Paper>
+ </>
)}
</div>
{clickedObjects.length > 1 && !selectedObject && (
diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/PublishClickTool.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/PublishClickTool.ts
index 3432f5d9e..cb31f7fff 100644
--- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/PublishClickTool.ts
+++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/PublishClickTool.ts
@@ -178,7 +178,8 @@ export class PublishClickTool extends SceneExtension<Renderable<BaseUserData>, P
publishClickType: this.publishClickType,
point: { x: this.point1.x, y: this.point1.y, z: this.point1.z },
});
- this._setState("idle");
+ // Prevent "publish point" from deactivating after click
+ // this._setState("idle");
} else {
this._setState("place-second-point");
}
diff --git a/packages/studio-web/src/index.tsx b/packages/studio-web/src/index.tsx
index f6209a1cb..a1bc69976 100644
--- a/packages/studio-web/src/index.tsx
+++ b/packages/studio-web/src/index.tsx
@@ -9,6 +9,7 @@ import Logger from "@foxglove/log";
import { IDataSourceFactory } from "@foxglove/studio-base";
import VersionBanner from "./VersionBanner";
+import { showOpenFilePicker } from "file-system-access";
const log = Logger.getLogger(__filename);
@@ -31,6 +32,10 @@ type MainParams = {
export async function main(params: MainParams = {}): Promise<void> {
log.debug("initializing");
+ // Support for "import layout" function on mobile devices
+ // Install extra dependencies with "yarn add -D file-system-access"
+ (window as any).showOpenFilePicker = showOpenFilePicker;
+
window.onerror = (...args) => {
console.error(...args);
};