Skip to content

Commit

Permalink
bug in widget
Browse files Browse the repository at this point in the history
  • Loading branch information
@rbardaji
rbardaji committed Feb 2, 2021
1 parent ac11104 commit 255df46
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 1,056 deletions.
1,013 changes: 0 additions & 1,013 deletions docs/examples/emso-qc-widget.ipynb
View file

This file was deleted.

2 changes: 1 addition & 1 deletion mooda/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
from .util import concat, iplot_location, iplot_timeseries, md5, \
es_create_indexes, EMSO, widget_qc, widget_emso, widget_emso_qc, widget_save

__version__ = '1.9.0'
__version__ = '1.9.1'
120 changes: 79 additions & 41 deletions mooda/util/md_widgets/widget_emso_qc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ def widget_emso_qc(wf, depth_range: List[float]=[-10, 10000],
"""
pyo.init_notebook_mode()

# Layout config
label_width = '7rem'
sublabel_width = '5rem'
checkbox_width = '8rem'

def show_result(wf, parameter_in, chart_title=''):
# Change name of flags
wf2 = wf.copy()
Expand All @@ -64,21 +69,30 @@ def show_result(wf, parameter_in, chart_title=''):
fig.show()

# Sing in
user_label = widgets.Label('User:')
authentification_title = widgets.HTML('<b>Authentification</b>')
user_label = widgets.Label('User:',
layout=widgets.Layout(width=label_width))
input_user = widgets.Text(value=user)
password_label = widgets.Label('Password:')
input_password = widgets.Text(value=password)
token_label = widgets.Label('Token:')
password_label = widgets.Label('Password:',
layout=widgets.Layout(width=label_width))
input_password = widgets.Password(value=password)
or_label = widgets.Label('or', layout=widgets.Layout(width=label_width))
token_label = widgets.Label('Token:',
layout=widgets.Layout(width=label_width))
input_token = widgets.Text(value=token)

break_label = widgets.Label('')

# map
emso = mooda.EMSO(user=input_user.value, password=input_password.value,
token=input_token.value)
map_dict = emso.get_fig_map()
pio.show(map_dict)

# Platform code
platform_label = widgets.Label('Platform code:')
data_title = widgets.HTML('<b>Downloading data</b>')
platform_label = widgets.Label('Platform code:',
layout=widgets.Layout(width=label_width))
platform_codes = emso.get_info_platform_code()
input_platform = widgets.Dropdown(options=platform_codes,
value=platform_codes[0], disabled=False)
Expand Down Expand Up @@ -106,17 +120,20 @@ def show_result(wf, parameter_in, chart_title=''):
end_date = None

# Parameters
parameters_label = widgets.Label('Parameters:')
parameters_label = widgets.Label('Parameters:',
layout=widgets.Layout(width=label_width))
input_parameters = widgets.SelectMultiple(options=parameter_list, rows=10,
disabled=False,
value=[parameter_list[0]])

# Size
size_label = widgets.Label('Size:')
size_label = widgets.Label('Size:',
layout=widgets.Layout(width=label_width))
input_size = widgets.BoundedIntText(value=10, min=1, step=1)

# Depth
depth_label = widgets.Label('Depth:')
depth_label = widgets.Label('Depth:',
layout=widgets.Layout(width=label_width))
input_depth = widgets.FloatRangeSlider(value=[depth_min, depth_max],
min=depth_min,
max=depth_max, step=0.1,
Expand All @@ -126,7 +143,8 @@ def show_result(wf, parameter_in, chart_title=''):
readout=True, readout_format='.1f')

# Time
start_date_label = widgets.Label('Start date:')
start_date_label = widgets.Label('Start date:',
layout=widgets.Layout(width=label_width))
input_start_date = widgets.DatePicker(disabled=False,
min_date=date(
int(start_date.split('-')[0]),
Expand All @@ -141,7 +159,8 @@ def show_result(wf, parameter_in, chart_title=''):
int(start_date.split('-')[1]),
int(start_date.split('-')[2])))

end_date_label = widgets.Label('End date:')
end_date_label = widgets.Label('End date:',
layout=widgets.Layout(width=label_width))
input_end_date = widgets.DatePicker(disabled=False,
min_date=date(
int(start_date.split('-')[0]),
Expand All @@ -156,49 +175,62 @@ def show_result(wf, parameter_in, chart_title=''):
int(end_date.split('-')[1]),
int(end_date.split('-')[2])))

qc_label = widgets.Label('QC Tests')
qc_label = widgets.HTML('<b>Data QC Tests - Select the test to run</b>')

# Layout config
checkbox_width = '8rem'
# Reset flags
reset_label = widgets.Label('Reset flags:')
reset_checkbox = widgets.Checkbox(description='Do it!')
# reset_label = widgets.Label('Reset flags:')
reset_checkbox = widgets.Checkbox(description='Reset flags',
style={'description_width': '0'},
layout=widgets.Layout(width=checkbox_width))

# Flat test
flat_label = widgets.Label('Flat test:')
flat_checkbox = widgets.Checkbox(description='Flat test',
style={'description_width': '0'},
layout=widgets.Layout(width=checkbox_width))
window_label = widgets.Label('Window:',
layout=widgets.Layout(width=sublabel_width))
window_flat = widgets.IntText(value=2,
description='Window:',
disabled=False,
color='black')
flat_checkbox = widgets.Checkbox(description='Do it!')


# Range test
range_label = widgets.Label('Range test:')
range_checkbox = widgets.Checkbox(description='Do it!')
# range_label = widgets.Label('Range test:')
range_checkbox = widgets.Checkbox(description='Range test',
style={'description_width': '0'},
layout=widgets.Layout(width=checkbox_width))
limit_label = widgets.Label('Limits:',
layout=widgets.Layout(width=sublabel_width))
limits = widgets.FloatRangeSlider(value=[range_test[0], range_test[1]],
min=range_test[0],
max=range_test[1],
step=0.1,
description='Limits:',
disabled=False,
continuous_update=False,
orientation='horizontal',
readout=True,
readout_format='.1f')

# Spike test
spike_label = widgets.Label('Spike test:')
spike_checkbox = widgets.Checkbox(description='Do it!')
window_spike = widgets.IntText(value=spike_window,
description='Window:', disabled=False,
color='black')
threshold = widgets.FloatText(value=spike_threshold,
description='Threshold:', disabled=False,
color='black')
# spike_label = widgets.Label('Spike test:')
spike_checkbox = widgets.Checkbox(description='Spike test',
style={'description_width': '0'},
layout=widgets.Layout(width=checkbox_width))
window_spike = widgets.IntText(value=spike_window, disabled=False,
color='black')
threshold_label = widgets.Label('Threshold:',
layout=widgets.Layout(width=sublabel_width))
threshold = widgets.FloatText(value=spike_threshold, disabled=False,
color='black')
influence_label = widgets.Label('Influence:',
layout=widgets.Layout(width=sublabel_width))
influence = widgets.FloatSlider(
value=spike_influence,
min=0,
max=1,
step=0.1,
description='Influence:',
disabled=False,
continuous_update=False,
orientation='horizontal',
Expand All @@ -208,8 +240,9 @@ def show_result(wf, parameter_in, chart_title=''):
)

# Replace
replace_label = widgets.Label('Replace QC:')
replace_checkbox = widgets.Checkbox(description='Do it!')
# replace_label = widgets.Label('Replace QC:')
replace_checkbox = widgets.Checkbox(description='Replace flags',
style={'description_width': '0'})

def update_components(_):
# Update all components
Expand Down Expand Up @@ -349,24 +382,29 @@ def on_button_clicked(_):

# linking button and function together using a button's method
button.on_click(on_button_clicked)

user_box = widgets.HBox([user_label, input_user, password_label,
input_password])
user_box = widgets.HBox([user_label, input_user])
password_box = widgets.HBox([password_label, input_password])
token_box = widgets.HBox([token_label, input_token])
platform_box = widgets.HBox([platform_label, input_platform])
parameters_box = widgets.HBox([parameters_label, input_parameters])
size_box = widgets.HBox([size_label, input_size])
depth_box = widgets.HBox([depth_label, input_depth])
start_date_box = widgets.HBox([start_date_label, input_start_date])
end_date_box = widgets.HBox([end_date_label, input_end_date])
reset_box = widgets.HBox([reset_label, reset_checkbox])
flat_box = widgets.HBox([flat_label, flat_checkbox, window_flat])
range_box = widgets.HBox([range_label, range_checkbox, limits])
spike_column = widgets.VBox([window_spike, threshold, influence])
spike_box = widgets.HBox([spike_label, spike_checkbox, spike_column])
replace_box = widgets.HBox([replace_label, replace_checkbox])

main_box = widgets.VBox([user_box, token_box, platform_box, parameters_box,
reset_box = widgets.HBox([reset_checkbox])
flat_box = widgets.HBox([flat_checkbox, window_label, window_flat])
range_box = widgets.HBox([range_checkbox, limit_label, limits])
spike_window_column = widgets.HBox([window_label, window_spike])
spike_threshold_column = widgets.HBox([threshold_label, threshold])
spike_influence_column = widgets.HBox([influence_label, influence])
spike_column = widgets.VBox([spike_window_column, spike_threshold_column,
spike_influence_column])
spike_box = widgets.HBox([spike_checkbox, spike_column])
replace_box = widgets.HBox([replace_checkbox])

main_box = widgets.VBox([authentification_title, user_box, password_box,
or_label, token_box, data_title,
platform_box, parameters_box,
size_box, depth_box, start_date_box, end_date_box,
qc_label, reset_box, flat_box, range_box,
spike_box, replace_box, button, out, out2])
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


NAME = 'mooda'
VERSION = '1.9.0'
VERSION = '1.9.1'
DESCRIPTION = 'Module for Ocean Observatory Data Analysis'
LONG_DESCRIPTION = ("""
MOODA - Module for Ocean Observatory Data Analysis
Expand Down

0 comments on commit 255df46

Please sign in to comment.