diff --git a/air_sans/app/core.py b/air_sans/app/core.py index cd23dfd..cfc0f74 100644 --- a/air_sans/app/core.py +++ b/air_sans/app/core.py @@ -44,6 +44,7 @@ def __init__(self, server=None): self.server = get_server(server, client_type="vue2") self._viz = Visualization(self.server) self._selected_device = None + self._active_directory = None # CLI self.server.cli.add_argument( @@ -56,7 +57,6 @@ def __init__(self, server=None): # search directory contents self.state.dirs = fs.get_directory_structure(args.data) - # self.state.directory = None self.state.files = [] self.state.file = None @@ -126,18 +126,18 @@ def on_device_change(self, selectedDevice, **kwargs): def select_directory(self, active_nodes): self.server.state.directory_label = None - self.server.state.directory = None + self._active_directory = None if len(active_nodes): node_id = active_nodes[0] if isinstance(node_id, str): self.server.state.directory_label = os.path.basename(node_id) - self.server.state.directory = node_id + self._active_directory = node_id self.server.state.files = fs.get_file_list(node_id) def selected_file(self, file): state = self.server.state state.file = file - data = fl.load(state.directory, state.file) + data = fl.load(self._active_directory, state.file) pixel_y = 1.0 pixel_x = 1.0 print(pixel_y / pixel_x, pixel_x, type(pixel_x), pixel_y, type(pixel_y)) diff --git a/air_sans/app/ui.py b/air_sans/app/ui.py index c5f0e16..b8c51fb 100644 --- a/air_sans/app/ui.py +++ b/air_sans/app/ui.py @@ -53,7 +53,8 @@ def __init__(self): class DirectoryDialog(vuetify.VDialog): def __init__(self, select_directory_fn): super().__init__( - v_model=("directory_dialog", False), persistent=True, max_width="300px" + v_model=("directory_dialog", False), + persistent=True, ) with self: with vuetify.Template( @@ -69,16 +70,16 @@ def __init__(self, select_directory_fn): ): vuetify.VIcon("mdi-folder") with vuetify.VCard( - classes="ma-1 rounded elevation-8", + classes="ma-1 rounded elevation-8", style="min-width: 50vw;" ): with vuetify.VCardTitle( - classes="grey lighten-1 pa-0 grey--text text--darken-3", - style="user-select: none; cursor: pointer", + classes="grey lighten-1 px-2 py-0 grey--text text--darken-3", + style="user-select: none;", hide_details=True, dense=True, ): html.Div("Directory") - with vuetify.VCardText(classes="pa-1"): + with vuetify.VCardText(classes="pa-1", style="height: 50vh;"): vuetify.VTreeview( classes="mb-1", dense=True, @@ -94,13 +95,12 @@ def __init__(self, select_directory_fn): ), ) with vuetify.VCardActions( - classes="px-0 py-1", + classes="py-1", hide_details=True, dense=True, ): vuetify.VSpacer() with vuetify.VBtn( - classes="ma-0", icon=True, dense=True, small=True, @@ -110,7 +110,6 @@ def __init__(self, select_directory_fn): ): vuetify.VIcon("mdi-cancel") with vuetify.VBtn( - classes="ma-0", icon=True, dense=True, small=True, diff --git a/air_sans/app/visualization.py b/air_sans/app/visualization.py index 89b40ee..d316c2f 100644 --- a/air_sans/app/visualization.py +++ b/air_sans/app/visualization.py @@ -160,7 +160,3 @@ def create_combined(self, fig, data, _row, _col, **kwargs): row=_row, col=_col, ) - - -def create_visualization(server=None): - return Visualization(server)