From ef5b11ce1030fd0a9f3ab2a51984cb33bad21a48 Mon Sep 17 00:00:00 2001 From: sennahoj0 <32790380+sennahoj0@users.noreply.github.com> Date: Wed, 4 Jan 2023 12:17:22 +0100 Subject: [PATCH 01/11] Update intro.py Fix Import Error --- UT330BUI/view/intro.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UT330BUI/view/intro.py b/UT330BUI/view/intro.py index 5a7ad22..9e85a16 100644 --- a/UT330BUI/view/intro.py +++ b/UT330BUI/view/intro.py @@ -12,7 +12,7 @@ # %%--------------------------------------------------------------------------- # Imports # ----------------------------------------------------------------------------- -from bokeh.models.widgets import (Div, Panel) +from bokeh.models.widgets import (Div, TabPanel) from bokeh.layouts import column @@ -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): From be0aedc443c0af8552be055d510a67d62feb80dc Mon Sep 17 00:00:00 2001 From: sennahoj0 <32790380+sennahoj0@users.noreply.github.com> Date: Wed, 4 Jan 2023 12:18:40 +0100 Subject: [PATCH 02/11] Update readdisplay.py --- UT330BUI/view/readdisplay.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UT330BUI/view/readdisplay.py b/UT330BUI/view/readdisplay.py index 2967495..dbf20c7 100644 --- a/UT330BUI/view/readdisplay.py +++ b/UT330BUI/view/readdisplay.py @@ -12,7 +12,7 @@ # %%--------------------------------------------------------------------------- # Imports # ----------------------------------------------------------------------------- -from bokeh.models.widgets import (Div, FileInput, Panel) +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 From 23a44de952d7421c765eb9bb9a135d84483ee938 Mon Sep 17 00:00:00 2001 From: sennahoj0 <32790380+sennahoj0@users.noreply.github.com> Date: Wed, 4 Jan 2023 12:19:10 +0100 Subject: [PATCH 03/11] Update intro.py --- UT330BUI/view/intro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UT330BUI/view/intro.py b/UT330BUI/view/intro.py index 9e85a16..0cc418f 100644 --- a/UT330BUI/view/intro.py +++ b/UT330BUI/view/intro.py @@ -12,7 +12,7 @@ # %%--------------------------------------------------------------------------- # Imports # ----------------------------------------------------------------------------- -from bokeh.models.widgets import (Div, TabPanel) +from bokeh.models import (Div, TabPanel) from bokeh.layouts import column From a12dca3f5633782e10bb8b01a7cfabad24ce5bff Mon Sep 17 00:00:00 2001 From: sennahoj0 <32790380+sennahoj0@users.noreply.github.com> Date: Wed, 4 Jan 2023 12:20:29 +0100 Subject: [PATCH 04/11] Update readsave.py --- UT330BUI/view/readsave.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UT330BUI/view/readsave.py b/UT330BUI/view/readsave.py index dabd608..c958698 100644 --- a/UT330BUI/view/readsave.py +++ b/UT330BUI/view/readsave.py @@ -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 @@ -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') # %% From acbe8cd839193926b01e544aee99b9157687a01f Mon Sep 17 00:00:00 2001 From: sennahoj0 <32790380+sennahoj0@users.noreply.github.com> Date: Wed, 4 Jan 2023 12:20:51 +0100 Subject: [PATCH 05/11] Update readdisplay.py --- UT330BUI/view/readdisplay.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UT330BUI/view/readdisplay.py b/UT330BUI/view/readdisplay.py index dbf20c7..6b25db9 100644 --- a/UT330BUI/view/readdisplay.py +++ b/UT330BUI/view/readdisplay.py @@ -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): From 4f1b407059aaea8f718040b011dda607c5a59dcd Mon Sep 17 00:00:00 2001 From: sennahoj0 <32790380+sennahoj0@users.noreply.github.com> Date: Wed, 4 Jan 2023 12:21:30 +0100 Subject: [PATCH 06/11] Update settings.py --- UT330BUI/view/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UT330BUI/view/settings.py b/UT330BUI/view/settings.py index 0d2028b..48793de 100644 --- a/UT330BUI/view/settings.py +++ b/UT330BUI/view/settings.py @@ -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 From 7f702338701a7464ef1ddb794296cfe766d2da47 Mon Sep 17 00:00:00 2001 From: sennahoj0 <32790380+sennahoj0@users.noreply.github.com> Date: Wed, 4 Jan 2023 12:22:07 +0100 Subject: [PATCH 07/11] Update settings.py --- UT330BUI/view/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UT330BUI/view/settings.py b/UT330BUI/view/settings.py index 48793de..4efe1d3 100644 --- a/UT330BUI/view/settings.py +++ b/UT330BUI/view/settings.py @@ -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): From aea9de13618fd4e0d7e94745e2810a9b9a675376 Mon Sep 17 00:00:00 2001 From: sennahoj0 <32790380+sennahoj0@users.noreply.github.com> Date: Wed, 4 Jan 2023 13:06:54 +0100 Subject: [PATCH 08/11] Update controller.py --- UT330BUI/controller/controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UT330BUI/controller/controller.py b/UT330BUI/controller/controller.py index 052ee8e..e111ca4 100644 --- a/UT330BUI/controller/controller.py +++ b/UT330BUI/controller/controller.py @@ -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 From 479d19c9d5a5dbd9c4c4513063412ae36aaacc4f Mon Sep 17 00:00:00 2001 From: sennahoj0 <32790380+sennahoj0@users.noreply.github.com> Date: Wed, 4 Jan 2023 13:08:46 +0100 Subject: [PATCH 09/11] Update readdisplay.py --- UT330BUI/view/readdisplay.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UT330BUI/view/readdisplay.py b/UT330BUI/view/readdisplay.py index 6b25db9..8a07f7b 100644 --- a/UT330BUI/view/readdisplay.py +++ b/UT330BUI/view/readdisplay.py @@ -13,7 +13,7 @@ # Imports # ----------------------------------------------------------------------------- from bokeh.models import (Div, FileInput, TabPanel) -from bokeh.plotting import Figure +from bokeh.plotting import figure from bokeh.layouts import column, row from bokeh.models import ColumnDataSource, LinearAxis, Range1d @@ -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)') From 035bcea9257170a25a7f6d31311811552b822fd7 Mon Sep 17 00:00:00 2001 From: sennahoj0 <32790380+sennahoj0@users.noreply.github.com> Date: Wed, 4 Jan 2023 13:23:28 +0100 Subject: [PATCH 10/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3caae9a..01bc89e 100644 --- a/README.md +++ b/README.md @@ -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 ======== From d82540e7cf7fa32453c48ea2635faf1d3bb39581 Mon Sep 17 00:00:00 2001 From: sennahoj0 <32790380+sennahoj0@users.noreply.github.com> Date: Thu, 5 Jan 2023 12:22:59 +0100 Subject: [PATCH 11/11] Update documentation.rst --- Documentation/documentation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/documentation.rst b/Documentation/documentation.rst index 7c3afde..25ccb21 100644 --- a/Documentation/documentation.rst +++ b/Documentation/documentation.rst @@ -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