Skip to content

Commit ad6272a

Browse files
committed
save work
1 parent 772ddf2 commit ad6272a

File tree

2 files changed

+32
-18
lines changed

2 files changed

+32
-18
lines changed

examples/serve/panels-demo/demo_panels/panel_demo.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ def render_panel(
3030
label="Opaque",
3131
)
3232

33+
# Will render the firstrow from viewer
34+
# first_row = FirstRow(id="firstrow", required=[dataset_title, time_label],
35+
# hostComponent= True)
36+
37+
# Will render the firstrow as a box with typography from chartlets
38+
# first_row = FirstRow(id="firstrow", required=[dataset_title, time_label],
39+
# hostComponent=False)
40+
3341
color_select = Select(
3442
id="color",
3543
value=color,
@@ -55,7 +63,7 @@ def render_panel(
5563
"It has no useful functionality.",
5664
opaque_checkbox,
5765
color_select,
58-
info_text
66+
info_text,
5967
],
6068
)
6169

examples/serve/panels-demo/demo_panels/panel_spectrum.py

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def render_panel(
8484
)
8585

8686
error_message = Typography(
87-
id="error_message", style={"color": "red"}, children=["Error: Panel Disabled"]
87+
id="error_message", style={"color": "red"}, children=[""]
8888
)
8989

9090
return Box(
@@ -107,9 +107,8 @@ def render_panel(
107107

108108

109109
@panel.callback(
110-
State("@app", "selectedPlaceGroup"),
110+
Input("@app", "selectedPlaceGroup"),
111111
Input("@app", "selectedDatasetId"),
112-
Input("@app", "selectedPlaceGeometry"),
113112
Input("@app", "selectedTimeLabel"),
114113
Input("button", "clicked"),
115114
Output("error_message", "children"),
@@ -118,15 +117,17 @@ def update_error_message(
118117
ctx: Context,
119118
place_group: list[dict[str, Any]] | None = None,
120119
dataset_id: str | None = None,
121-
place_geometry: str | None = None,
122120
_time_label: float | None = None,
123121
_clicked: bool | None = None,
124122
) -> str:
125123
dataset = get_dataset(ctx, dataset_id)
126124
points = get_places(ctx, place_group)
127-
if dataset is None or not place_geometry or not points:
128-
return "Error: Panel disabled"
129-
return ""
125+
if dataset is None:
126+
return "Missing dataset selection"
127+
elif not points:
128+
return "Missing point selection"
129+
else:
130+
return ""
130131

131132

132133
def get_spectra(
@@ -194,8 +195,8 @@ def get_spectra(
194195
)
195196
def update_text(
196197
ctx: Context,
197-
dataset_title: str,
198-
time_label: str,
198+
dataset_title: str | None = None,
199+
time_label: str | None = None,
199200
_time_label: bool | None = None,
200201
) -> list | None:
201202

@@ -208,23 +209,28 @@ def update_text(
208209
State("@app", "selectedDatasetId"),
209210
Input("@app", "selectedTimeLabel"),
210211
State("@app", "selectedPlaceGroup"),
212+
State("@app", "selectedPlaceGeometry"),
211213
State("select_places", "value"),
212214
Input("button", "clicked"),
213215
Output("plot", "chart"),
214216
Output("error_message", "children"),
215217
)
216218
def update_plot(
217219
ctx: Context,
218-
dataset_id: str,
219-
time_label: str,
220-
place_group: list[dict[str, Any]],
221-
place: list,
220+
dataset_id: str | None = None,
221+
time_label: str | None = None,
222+
place_group: list[dict[str, Any]] | None = None,
223+
place_geometry: str | None = None,
224+
place: list | None = None,
222225
_clicked: bool | None = None,
223226
) -> tuple[alt.Chart | None, str]:
224227
dataset = get_dataset(ctx, dataset_id)
225-
if dataset is None or not place_group or not place:
226-
return None, "Error: Panel disabled"
227-
228+
if dataset is None:
229+
return None, "Missing dataset selection"
230+
elif not place_geometry:
231+
return None, "Missing place geometry selection"
232+
elif not place:
233+
return None, "Missing point value selection from dropdown"
228234
place_group = gpd.GeoDataFrame(
229235
[
230236
{
@@ -245,7 +251,7 @@ def update_plot(
245251

246252
place_group["time"] = pd.to_datetime(time_label).tz_localize(None)
247253
place = [place]
248-
source = get_wavelength(dataset, place_group, place)
254+
source = get_spectra(dataset, place_group, place)
249255

250256
if source is None:
251257
return None, "No reflectances found in Variables"

0 commit comments

Comments
 (0)