Skip to content

Commit

Permalink
Merge pull request holoviz#238 from bokeh/hsparra/dashboard_select_fix
Browse files Browse the repository at this point in the history
Remove .create on Select creation and convert options to list.
  • Loading branch information
jbednar authored Sep 20, 2016
2 parents d1c30af + 41e0663 commit cd166c7
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions examples/dashboard/dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,29 +356,24 @@ def create_layout(self):

# add ui components
controls = []
axes_options = zip(self.model.axes.keys(), self.model.axes.keys())
axes_select = Select.create(name='Axes', options=axes_options)
axes_select = Select(name='Axes', options=list(self.model.axes.keys()))
axes_select.on_change('value', self.on_axes_change)
controls.append(axes_select)

fields_options = zip(self.model.fields.keys(), self.model.fields.keys())
self.field_select = Select.create(name='Field', options=fields_options)
self.field_select = Select(name='Field', options=list(self.model.fields.keys()))
self.field_select.on_change('value', self.on_field_change)
controls.append(self.field_select)

agg_options = zip(self.model.aggregate_functions.keys(), self.model.aggregate_functions.keys())
self.aggregate_select = Select.create(name='Aggregate', options=agg_options)
self.aggregate_select = Select(name='Aggregate', options=list(self.model.aggregate_functions.keys()))
self.aggregate_select.on_change('value', self.on_aggregate_change)
controls.append(self.aggregate_select)

transfer_options = zip(self.model.transfer_functions.keys(), self.model.transfer_functions.keys())
transfer_select = Select.create(name='Transfer Function',
options=transfer_options)
transfer_select = Select(name='Transfer Function',
options=list(self.model.transfer_functions.keys()))
transfer_select.on_change('value', self.on_transfer_function_change)
controls.append(transfer_select)

color_options = zip(self.model.color_ramps.keys(), self.model.color_ramps.keys())
color_ramp_select = Select.create(name='Color Ramp', options=color_options)
color_ramp_select = Select(name='Color Ramp', options=list(self.model.color_ramps.keys()))
color_ramp_select.on_change('value', self.on_color_ramp_change)
controls.append(color_ramp_select)

Expand All @@ -396,8 +391,7 @@ def create_layout(self):
# controls.append(self.model.legend_side_vbox)

# add map components
basemap_options = zip(self.model.basemaps.keys(), self.model.basemaps.keys())
basemap_select = Select.create(name='Basemap', value='Imagery', options=basemap_options)
basemap_select = Select(name='Basemap', value='Imagery', options=list(self.model.basemaps.keys()))
basemap_select.on_change('value', self.on_basemap_change)

image_opacity_slider = Slider(title="Opacity", value=100, start=0,
Expand All @@ -416,7 +410,7 @@ def create_layout(self):

self.controls = VBox(height=600, children=controls)
self.map_controls = HBox(width=self.fig.plot_width, children=map_controls)

# legends (temporarily disabled)
self.map_area = VBox(width=900, height=600, children=[self.map_controls,
self.fig])
Expand Down

0 comments on commit cd166c7

Please sign in to comment.