From 9f21302b487fb526cef4f7c755e22f2aaffb2a26 Mon Sep 17 00:00:00 2001 From: Elliott Rose Date: Thu, 23 Mar 2023 12:33:51 +0100 Subject: [PATCH] Fix disclaimers for vis-comparison. Update sync mosiac to avoid triggering error alerts from the dash console. --- assets/custom-functions.js | 20 +++++++++++++++++++- assets/style.css | 6 +++--- tabs/evaluation_callbacks.py | 16 ++++++++-------- tabs/forecast_callbacks.py | 9 +++++---- 4 files changed, 35 insertions(+), 16 deletions(-) diff --git a/assets/custom-functions.js b/assets/custom-functions.js index ff8bd97..1665eda 100644 --- a/assets/custom-functions.js +++ b/assets/custom-functions.js @@ -196,7 +196,7 @@ function waitForMutation(selector, func) { const observer = new MutationObserver(mutations => { if (document.querySelector(selector)) { resolve(document.querySelector(selector)); - // console.log(mutations); + console.log(mutations); func(mutations); } }); @@ -305,3 +305,21 @@ $(document).ready(function () { }); //==================END Funcfions to flip adjust colorbar values for only concentration var ========== + +//UPDATE TEXT UNDER TIMESLIDER HANDLE TO HAVE YELLOW OF THE FOLLOWING ITEMS +// function changeTextColor() { +// let marks = document.getElementsByClassName('rc-slider-mark-text-active'); +// let yellows = document.getElementsByClassName('rc-slider-mark-text'); +// console.log('looking for...' + marks[marks.length -1]); +// if(marks.length > 1) { +// marks[marks.length - 2].classList.add('rc-slider-mark-text-active'); +// } +// marks[marks.length - 1].classList.remove('rc-slider-mark-text-active'); +// // marks[marks.length - 1].style.color = '#F1B545'; +// // marks[marks.length - 2].style.color = '#999'; +// } +// +// $(document).ready(function () { +// waitForMutation('.rc-slider-handle', changeTextColor); +// }) +//END =========================================================== diff --git a/assets/style.css b/assets/style.css index 88c6569..0cc5ea5 100644 --- a/assets/style.css +++ b/assets/style.css @@ -909,12 +909,12 @@ div.dropdown-menu.show { } -.rc-slider-mark-text-active { - color: #999 !important; +.rc-slider-mark-text.rc-slider-mark-text-active { + color: var(--yellow); } .rc-slider-mark-text { - color: var(--yellow); + color: #999; } .rc-slider-handle{ diff --git a/tabs/evaluation_callbacks.py b/tabs/evaluation_callbacks.py index dcb4ae3..7762ae8 100644 --- a/tabs/evaluation_callbacks.py +++ b/tabs/evaluation_callbacks.py @@ -726,14 +726,14 @@ def update_eval_aeronet(n_clicks, sdate, edate, obs): edate = end_date stations, points_layer = get_obs1d(sdate, edate, obs, DEFAULT_VAR) - fig = get_figure(model=None, var=DEFAULT_VAR, layer=points_layer), -# eval_graph = html.Div([ -# get_figure(model=None, var=DEFAULT_VAR, layer=points_layer), -# html.Div(DISCLAIMER_OBS, -# className='disclaimer') -# ], -# id='graph-eval-aeronet', -# ) + # fig = get_figure(model=None, var=DEFAULT_VAR, layer=points_layer), + fig = html.Div([ + get_figure(model=None, var=DEFAULT_VAR, layer=points_layer), + html.Div(DISCLAIMER_OBS, + className='disclaimer') + ], + id='graph-eval-aeronet', + ) return stations.to_dict(), fig diff --git a/tabs/forecast_callbacks.py b/tabs/forecast_callbacks.py index eb78b07..1478177 100644 --- a/tabs/forecast_callbacks.py +++ b/tabs/forecast_callbacks.py @@ -783,10 +783,11 @@ def zoom_country(n_clicks, model, zoom, lat, lon): def zooms(viewport, models): """Syncronize all maps to have same center and zoom in mosaic""" ctx = dash.callback_context - changed = dict(ctx.triggered_id) - index = models.index(changed) - return 1, viewport[index]['zoom'], viewport[index]['center'][0], viewport[index]['center'][1] - + if viewport and viewport[0] is not None: + changed = dict(ctx.triggered_id) + index = models.index(changed) + return 1, viewport[index]['zoom'], viewport[index]['center'][0], viewport[index]['center'][1] + raise PreventUpdate # start/stop animation @dash.callback( -- GitLab