Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🐛 disable controls using loadingOverlay #53

Merged
merged 4 commits into from
Jul 25, 2023
Merged

🐛 disable controls using loadingOverlay #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33c0f66
🐛 disable controls using loadingOverlay
hannahker Jul 21, 2023
b7d6e55
💄 decrease opacity
hannahker Jul 21, 2023
0162667
🎨 Apply black
hannahker Jul 21, 2023
279622e
💄 disable controls while slider is updating
hannahker Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion callbacks/image_viewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from dash import Input, Output, State, callback, ctx, Patch, clientside_callback
import dash
import dash_mantine_components as dmc
from tifffile import imread
import plotly.express as px
Expand All @@ -10,6 +11,9 @@
Output("image-viewer", "figure"),
Output("annotation-store", "data", allow_duplicate=True),
Output("image-viewer-loading", "zIndex", allow_duplicate=True),
Output("data-selection-controls", "children", allow_duplicate=True),
Output("image-transformation-controls", "children", allow_duplicate=True),
Output("annotations-controls", "children", allow_duplicate=True),
Input("image-selection-slider", "value"),
State("project-name-src", "value"),
State("paintbrush-width", "value"),
Expand Down Expand Up @@ -71,7 +75,16 @@ def render_image(
patched_annotation_store["image_size"] = tf.size
fig_loading_overlay = -1

return fig, patched_annotation_store, fig_loading_overlay
# No update is needed for the 'children' of the control components
# since we just want to trigger the loading overlay with this callback
return (
fig,
patched_annotation_store,
fig_loading_overlay,
dash.no_update,
dash.no_update,
dash.no_update,
)


clientside_callback(
Expand Down Expand Up @@ -116,6 +129,9 @@ def locally_store_annotations(relayout_data, img_idx, annotation_store):
Output("image-selection-slider", "value"),
Output("image-selection-slider", "disabled"),
Output("annotation-store", "data"),
Output("data-selection-controls", "children"),
Output("image-transformation-controls", "children"),
Output("annotations-controls", "children"),
Input("project-name-src", "value"),
State("annotation-store", "data"),
)
Expand All @@ -142,6 +158,11 @@ def update_slider_values(project_name, annotation_store):
slider_value,
disable_slider,
annotation_store,
# No update is needed for the 'children' of the control components
# since we just want to trigger the loading overlay with this callback
dash.no_update,
dash.no_update,
dash.no_update,
)


Expand Down
11 changes: 9 additions & 2 deletions components/control_bar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
DEFAULT_ANNOTATION_CLASS = "red"


def _accordion_item(title, icon, value, children):
def _accordion_item(title, icon, value, children, id):
return dmc.AccordionItem(
[
dmc.AccordionControl(
Expand All @@ -25,7 +25,11 @@ def _accordion_item(title, icon, value, children):
width=20,
),
),
dmc.AccordionPanel(children),
dmc.LoadingOverlay(
dmc.AccordionPanel(children=children, id=id),
loaderProps={"size": 0},
overlayOpacity=0.4,
),
],
value=value,
)
Expand All @@ -45,6 +49,7 @@ def layout():
"Data selection",
"majesticons:data-line",
"data-select",
id="data-selection-controls",
children=[
dmc.Text("Image"),
dmc.Select(
Expand All @@ -60,6 +65,7 @@ def layout():
"Image transformations",
"fluent-mdl2:image-pixel",
"image-transformations",
id="image-transformation-controls",
children=html.Div(
[
dmc.Text("Brightness", size="sm"),
Expand Down Expand Up @@ -109,6 +115,7 @@ def layout():
"Annotation tools",
"mdi:paintbrush-outline",
"annotations",
id="annotations-controls",
children=[
dmc.Center(
dmc.Switch(
Expand Down