Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Documentation/documentation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Note that the script might delete all data on the device and do a factory reset
UT330BUI
--------

This is a complete app to control the UT330B devices using the UT330 class. It's written using Bokeh 2.0.1. To run the software, go to the folder above the UT330BUI folder and type in: ::
This is a complete app to control the UT330B devices using the UT330 class. It's written using Bokeh 3.0.3. To run the software, go to the folder above the UT330BUI folder and type in: ::

bokeh serve UT330BUI --show

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Many thanks to [Philip Gladstone](https://github.com/pjsg) for his tremendous he
Installation notes
==================

The project uses uses pyserial __version 3.01 or later__. This version uses Bokeh version 2.0.1. See the Documentation section for instructions for how to use the software.
The project uses uses pyserial __version 3.01 or later__. This version uses Bokeh version 3.0.3. See the Documentation section for instructions for how to use the software.

Oddities
========
Expand Down
2 changes: 1 addition & 1 deletion UT330BUI/controller/controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# Imports
# -----------------------------------------------------------------------------
from bokeh.io import curdoc
from bokeh.models.widgets import Tabs
from bokeh.models import Tabs
from model.UT330 import UT330
from view.intro import Intro
from view.readdisplay import ReadDisplay
Expand Down
4 changes: 2 additions & 2 deletions UT330BUI/view/intro.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# %%---------------------------------------------------------------------------
# Imports
# -----------------------------------------------------------------------------
from bokeh.models.widgets import (Div, Panel)
from bokeh.models import (Div, TabPanel)
from bokeh.layouts import column


Expand Down Expand Up @@ -57,7 +57,7 @@ def __init__(self, controller):
self.layout = column(children=[self.logo,
self.description],
sizing_mode='stretch_both')
self.panel = Panel(child=self.layout, title='UT330B')
self.panel = TabPanel(child=self.layout, title='UT330B')

# %%
def setup(self):
Expand Down
8 changes: 4 additions & 4 deletions UT330BUI/view/readdisplay.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# %%---------------------------------------------------------------------------
# Imports
# -----------------------------------------------------------------------------
from bokeh.models.widgets import (Div, FileInput, Panel)
from bokeh.plotting import Figure
from bokeh.models import (Div, FileInput, TabPanel)
from bokeh.plotting import figure
from bokeh.layouts import column, row
from bokeh.models import ColumnDataSource, LinearAxis, Range1d

Expand Down Expand Up @@ -48,7 +48,7 @@ def __init__(self, controller):
sizing_mode='stretch_width')

# Chart to show temperature and/or humidity.
self.temphumidity = Figure(x_axis_type='datetime',
self.temphumidity = figure(x_axis_type='datetime',
title="Humidity & temperature by datetime",
x_axis_label='Datetime',
y_axis_label='Temperature (C)')
Expand Down Expand Up @@ -101,7 +101,7 @@ def __init__(self, controller):
width=250, height=80),
column(self.temphumidity, sizing_mode='stretch_both')],
sizing_mode='stretch_both')
self.panel = Panel(child=self.layout, title='Read & display')
self.panel = TabPanel(child=self.layout, title='Read & display')

# %%
def setup(self):
Expand Down
4 changes: 2 additions & 2 deletions UT330BUI/view/readsave.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# Imports
# -----------------------------------------------------------------------------
import os
from bokeh.models.widgets import (Button, Div, Panel)
from bokeh.models import (Button, Div, TabPanel)
from bokeh.layouts import column, row
import pandas as pd

Expand Down Expand Up @@ -102,7 +102,7 @@ def __init__(self, controller):
self.write_to_disk, self.erase_data,
self.disconnect)],
sizing_mode="stretch_both")
self.panel = Panel(child=self.layout,
self.panel = TabPanel(child=self.layout,
title='Read & save')

# %%
Expand Down
4 changes: 2 additions & 2 deletions UT330BUI/view/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# Imports
# -----------------------------------------------------------------------------
import datetime
from bokeh.models.widgets import (Button, Div, Panel, Select, TextInput)
from bokeh.models import (Button, Div, TabPanel, Select, TextInput)
from bokeh.layouts import column, row


Expand Down Expand Up @@ -194,7 +194,7 @@ def __init__(self, controller):
self.write_offsets)
],
sizing_mode='stretch_both')
self.panel = Panel(child=self.layout, title='Settings')
self.panel = TabPanel(child=self.layout, title='Settings')

# %%
def setup(self):
Expand Down