Skip to content

Commit ca18555

Browse files
authored
Support for bokeh up to 2.2.3 (#40)
1 parent e4a121f commit ca18555

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,5 @@ ENV/
9191
*.swp
9292

9393
.unittests/
94+
95+
examples/test_bokehgui.py

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ The module was irst developed as a part of Google Summer of Code 2017 by Kartik
1111

1212
## Dependency
1313
1. GNU Radio 3.8.3
14-
2. [Bokeh library](https://docs.bokeh.org/en/2.0.2/)
15-
(Tested on v1.4.0 and 2.0.2) (later versions cause the waterfall display to crash)
14+
2. [Bokeh library between 2.1.0 and 2.2.3](https://docs.bokeh.org/en/2.2.3/) (earlier and later versions cause the waterfall display to crash, the rest is fine)
1615

1716
## Installation
1817

@@ -25,7 +24,7 @@ $ git clone https://github.com/gnuradio/gr-bokehgui.git
2524
3. Build with CMake:
2625
```
2726
$ cd gr-bokehgui/
28-
$ git checkout tags/compatbokeh2.0
27+
$ git checkout tags/compatbokeh2.2
2928
$ mkdir build
3029
$ cd build/
3130
$ cmake ../

examples/test_bokehgui.grc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ blocks:
10711071
bus_structure: null
10721072
coordinate: [602, 356]
10731073
rotation: 0
1074-
state: true
1074+
state: enabled
10751075
- name: bokehgui_waterfall_sink_x_0_0
10761076
id: bokehgui_waterfall_sink_x
10771077
parameters:
@@ -1104,7 +1104,7 @@ blocks:
11041104
bus_structure: null
11051105
coordinate: [608, 731]
11061106
rotation: 0
1107-
state: true
1107+
state: enabled
11081108
- name: fft_vxx_0
11091109
id: fft_vxx
11101110
parameters:

python/plots/waterfall.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ export class WaterfallRendererView extends RendererView {
5454
this.connect(this.model.change, this.request_render)
5555
}
5656

57-
render(): void {
58-
const ctx = this.plot_view.canvas_view.ctx
57+
protected _render(): void {
58+
const ctx = this.layer.ctx
5959
ctx.save()
6060

6161
const smoothing = ctx.getImageSmoothingEnabled()

0 commit comments

Comments
 (0)