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

Fix annotation widget #27

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix annotation widget #27

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31abf13
Fix annotation widget
dogancanbakir Jun 1, 2020
0c83e19
Fix prev widget render issue
dogancanbakir Jun 1, 2020
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
39 changes: 19 additions & 20 deletions formasaurus/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
)
from formasaurus.utils import inverse_mapping, download

out = widgets.Output()


def AddPageWidget(storage):
"""
Expand Down Expand Up @@ -46,7 +48,6 @@ def MultiFormAnnotator(annotations,
A widget with a paginator for annotating multiple forms.
"""
back, forward, slider = get_pager_elements(0, len(annotations) - 1)
rendered = {}

def render(i):
widget = FormAnnotator(
Expand All @@ -59,22 +60,20 @@ def render(i):
widget
])

def on_change(name, value):
for i in rendered:
rendered[i].close()

if value not in rendered:
rendered[value] = render(value)
else:
rendered[value].open()
def on_change(change):
value = change['new']
rendered_widget = render(value)

if save_func:
save_func()

display(rendered[value])
with out:
out.clear_output()
display(rendered_widget)

slider.on_trait_change(on_change, 'value')
on_change('value', slider.value)
slider.observe(on_change, names='value')
on_change({'new': slider.value})
display(out)


def FormAnnotator(ann, annotate_fields=True, annotate_types=True, max_fields=80):
Expand Down Expand Up @@ -140,10 +139,10 @@ def FormTypeSelect(ann):
description='form type:',
)

def on_change(name, value):
ann.info['forms'][ann.index] = form_types[value]
def on_change(change):
ann.info['forms'][ann.index] = form_types[change['new']]

type_select.on_trait_change(on_change, 'value')
type_select.observe(on_change, names='value')
return type_select


Expand All @@ -157,10 +156,10 @@ def FieldTypeSelect(ann, field_name):
value=field_types_inv[tp],
)

def on_change(name, value):
ann.fields[field_name] = field_types[value]
def on_change(change):
ann.fields[field_name] = field_types[change['new']]

type_select.on_trait_change(on_change, 'value')
type_select.observe(on_change, names='value')
return type_select


Expand Down Expand Up @@ -188,8 +187,8 @@ def HtmlCode(form_html, field_name=None, max_height=None, **kwargs):
kw['color'] = "#777"
kw.update(kwargs)
style = '; '.join([
'white-space:pre-wrap',
'max-width:800px',
'white-space:normal',
'max-width:inherit',
'word-wrap:break-word',
'font-family:monospace',
'overflow:scroll',
Expand Down