Fix GUI remove

nerfstudio-project · Jun 19, 2023 · db94cce · db94cce
1 parent b958b64
commit db94cce
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 19 deletions.
diff --git a/examples/03_gui_callbacks.py b/examples/03_gui_callbacks.py
@@ -25,7 +25,7 @@ def main() -> None:
 
         @gui_include_z.on_update
         def _(_) -> None:
-            gui_axis.options = ["x", "y", "z"] if gui_include_z.value else ["x", "y"]
+            gui_axis.options = ("x", "y", "z") if gui_include_z.value else ("x", "y")
 
         with server.gui_folder("Sliders"):
             gui_location = server.add_gui_slider(

diff --git a/viser/_gui.py b/viser/_gui.py
@@ -155,7 +155,7 @@ def visible(self, visible: bool) -> None:
 
     def remove(self) -> None:
         """Permanently remove this GUI element from the visualizer."""
-        self._impl.api._queue(GuiRemoveMessage(self._impl.label))
+        self._impl.api._queue(GuiRemoveMessage(self._impl.id))
         assert self._impl.cleanup_cb is not None
         self._impl.cleanup_cb()
 

diff --git a/viser/client/build/asset-manifest.json b/viser/client/build/asset-manifest.json
@@ -1,13 +1,13 @@
 {
   "files": {
     "main.css": "/static/css/main.82973013.css",
-    "main.js": "/static/js/main.679eff5c.js",
+    "main.js": "/static/js/main.fbdbcf0c.js",
     "index.html": "/index.html",
     "main.82973013.css.map": "/static/css/main.82973013.css.map",
-    "main.679eff5c.js.map": "/static/js/main.679eff5c.js.map"
+    "main.fbdbcf0c.js.map": "/static/js/main.fbdbcf0c.js.map"
   },
   "entrypoints": [
     "static/css/main.82973013.css",
-    "static/js/main.679eff5c.js"
+    "static/js/main.fbdbcf0c.js"
   ]
 }
diff --git a/viser/client/build/index.html b/viser/client/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.svg"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Viser</title><script defer="defer" src="/static/js/main.679eff5c.js"></script><link href="/static/css/main.82973013.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.svg"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Viser</title><script defer="defer" src="/static/js/main.fbdbcf0c.js"></script><link href="/static/css/main.82973013.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/...r/client/build/static/js/main.679eff5c.js → ...r/client/build/static/js/main.fbdbcf0c.js b/...r/client/build/static/js/main.679eff5c.js → ...r/client/build/static/js/main.fbdbcf0c.js
diff --git a/...ld/static/js/main.679eff5c.js.LICENSE.txt → ...ld/static/js/main.fbdbcf0c.js.LICENSE.txt b/...ld/static/js/main.679eff5c.js.LICENSE.txt → ...ld/static/js/main.fbdbcf0c.js.LICENSE.txt
diff --git a/...ient/build/static/js/main.679eff5c.js.map → ...ient/build/static/js/main.fbdbcf0c.js.map b/...ient/build/static/js/main.679eff5c.js.map → ...ient/build/static/js/main.fbdbcf0c.js.map
diff --git a/viser/client/src/ControlPanel/Generated.tsx b/viser/client/src/ControlPanel/Generated.tsx
@@ -50,35 +50,37 @@ export default function Generated() {
 
   return (
     <>
-      <Space h="xs" />
       <GeneratedFolder folder={guiTree} />
     </>
   );
 }
 
 function GeneratedFolder({ folder }: { folder: Folder }) {
   return (
-    <Stack spacing="xs">
+    <Stack spacing="xs" pt="0.25rem">
       {folder.inputs.map((conf) => (
         <GeneratedInput key={conf.id} conf={conf} />
       ))}
       <Accordion
         chevronPosition="right"
         multiple
-        defaultValue={Object.keys(folder.subfolders)}
+        defaultValue={[...Object.keys(folder.subfolders)]}
         styles={(theme) => ({
           label: { padding: "0.625rem 0.2rem" },
           item: { border: 0 },
           control: { paddingLeft: 0 },
           content: {
             borderLeft: "1px solid",
-            borderLeftColor: theme.colors.gray[4],
+            borderLeftColor:
+              theme.colorScheme == "light"
+                ? theme.colors.gray[3]
+                : theme.colors.dark[5],
             paddingRight: "0",
             paddingLeft: "0.5rem",
             paddingBottom: 0,
             paddingTop: 0,
             marginBottom: "0.5rem",
-            marginLeft: "0.1rem",
+            marginLeft: "0.05rem",
           },
         })}
       >

diff --git a/viser/client/src/ControlPanel/GuiState.tsx b/viser/client/src/ControlPanel/GuiState.tsx
@@ -39,7 +39,7 @@ interface GuiActions {
   setGuiValue: (id: string, value: any) => void;
   setGuiVisible: (id: string, visible: boolean) => void;
   setGuiDisabled: (id: string, visible: boolean) => void;
-  removeGui: (name: string) => void;
+  removeGui: (id: string) => void;
   resetGui: () => void;
 }
 
@@ -90,9 +90,11 @@ export function useGuiState(initialServer: string) {
               disabled: disabled,
             };
           }),
-        removeGui: (name) =>
+        removeGui: (id) =>
           set((state) => {
-            delete state.guiConfigFromId[name];
+            delete state.guiConfigFromId[id];
+            delete state.guiValueFromId[id];
+            delete state.guiAttributeFromId[id];
           }),
         resetGui: () =>
           set((state) => {

diff --git a/viser/client/src/index.tsx b/viser/client/src/index.tsx
@@ -109,7 +109,7 @@ function SingleViewer() {
                   : theme.colors.dark[4],
             })}
           >
-            <ScrollArea type="always" sx={{height: "100%"}}>
+            <ScrollArea type="always" sx={{ height: "100%" }}>
               <Box
                 p="sm"
                 sx={(theme) => ({