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.

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

Modifications in GRC to allow BokehGUI #1434

Merged
merged 1 commit into from Sep 25, 2017

Conversation

Projects
None yet
3 participants
@kartikp1995
Contributor

kartikp1995 commented Aug 20, 2017

This includes all modifications required in GRC to allow BokehGUI.

Major changes:
Added BokehGUI main() in flow_graph.tmpl
Added an option for BokehGUI in Options block

@jmcorgan jmcorgan requested a review from skoslowski Aug 21, 2017

@skoslowski

Thanks.
I might have some more comments after testing this later tonight.

Show outdated Hide outdated grc/blocks/options.xml Outdated
Show outdated Hide outdated grc/blocks/options.xml Outdated
Show outdated Hide outdated grc/blocks/options.xml Outdated
Show outdated Hide outdated grc/blocks/options.xml Outdated
Show outdated Hide outdated grc/blocks/options.xml Outdated
Show outdated Hide outdated grc/core/generator/Generator.py Outdated
Show outdated Hide outdated grc/core/generator/flow_graph.tmpl Outdated
tb.wait()
finally:
serverProc.terminate()
serverProc.kill()

This comment has been minimized.

@skoslowski

skoslowski Aug 21, 2017

Member

Is it possible to query if

  • a server instance is already running (before creating our own - possibly failing due to the tcp port being used already)
  • this is the only document being served - if not the server instance should probably live on...
@skoslowski

skoslowski Aug 21, 2017

Member

Is it possible to query if

  • a server instance is already running (before creating our own - possibly failing due to the tcp port being used already)
  • this is the only document being served - if not the server instance should probably live on...

This comment has been minimized.

@kartikp1995

kartikp1995 Aug 21, 2017

Contributor

So, I am not sure what exactly are you suggesting. Is it that instead of the new server, we can connect the new process in existing server?

As of now: Every time the server starts, it checks if the particular port is being used. If yes, it checks next one. It creates new server instance if any port in the sequence is free! And for each server instance, a unique Document is being served.

So, if we terminate/kill the server, it basically closes the only document instance being served. So, no need to check if the document instance exists.

@kartikp1995

kartikp1995 Aug 21, 2017

Contributor

So, I am not sure what exactly are you suggesting. Is it that instead of the new server, we can connect the new process in existing server?

As of now: Every time the server starts, it checks if the particular port is being used. If yes, it checks next one. It creates new server instance if any port in the sequence is free! And for each server instance, a unique Document is being served.

So, if we terminate/kill the server, it basically closes the only document instance being served. So, no need to check if the document instance exists.

Show outdated Hide outdated grc/core/utils/is_bokeh_gui_installed.py Outdated
tb = top_block_cls(doc)
try:
tb.start()
signal.signal(signal.SIGTERM, functools.partial(killProc, tb=tb))

This comment has been minimized.

@skoslowski

skoslowski Aug 21, 2017

Member

Not sure if I missed the import of functools?

@skoslowski

skoslowski Aug 21, 2017

Member

Not sure if I missed the import of functools?

This comment has been minimized.

@kartikp1995

kartikp1995 Aug 21, 2017

Contributor

There is import functools in options.xml

@kartikp1995

kartikp1995 Aug 21, 2017

Contributor

There is import functools in options.xml

This comment has been minimized.

@skoslowski

skoslowski Aug 23, 2017

Member

ah okay

@skoslowski

skoslowski Aug 23, 2017

Member

ah okay

grc: Modifications in GRC to allow BokehGUI
grc: Updated template for bokehgui

grc: Removed import from template file

grc: Added a condition to load bokeh based on installed library

grc: Allowed display from remote PC

grc: Added default layout option

grc: Added WidgetPlacement, Sizing Mode options in Options block

grc: Add terminate handler in main function

grc: default rowspan, colspan = 1

grc: Updated Document title and session id from the parameters of Options block

grc: Layout indexing starts from 0

grc: Allowed dynamic port selection

grc: Added a URL path for flow_graph

grc: Reviews incorporated

@jmcorgan jmcorgan added the GRC label Aug 27, 2017

@jmcorgan jmcorgan added this to the Release 3.7.12 milestone Aug 27, 2017

@jmcorgan

This comment has been minimized.

Show comment
Hide comment
@jmcorgan

jmcorgan Aug 27, 2017

Contributor

@skoslowski This will have conflicts on next and python3 that I'd like to to resolve. Can you prepare a merge for next and one for python3, that includes both this and #1418? That would let me merge both this PR and #1418, then merge your two fixup branches.

Contributor

jmcorgan commented Aug 27, 2017

@skoslowski This will have conflicts on next and python3 that I'd like to to resolve. Can you prepare a merge for next and one for python3, that includes both this and #1418? That would let me merge both this PR and #1418, then merge your two fixup branches.

@skoslowski

This comment has been minimized.

Show comment
Hide comment
@skoslowski

skoslowski Sep 6, 2017

Member

My python3 branch https://github.com/skoslowski/gnuradio/commits/python3 now contains commits that merge this into master, from there into next and finally into python3.
The last merge contains significant changes as the template engine as well as some internal APIs haved changed in the python3 branch. @kartikp1995 please review my changes and make sure I didn't miss anything on the way...

Member

skoslowski commented Sep 6, 2017

My python3 branch https://github.com/skoslowski/gnuradio/commits/python3 now contains commits that merge this into master, from there into next and finally into python3.
The last merge contains significant changes as the template engine as well as some internal APIs haved changed in the python3 branch. @kartikp1995 please review my changes and make sure I didn't miss anything on the way...

@kartikp1995

This comment has been minimized.

Show comment
Hide comment
@kartikp1995

kartikp1995 Sep 6, 2017

Contributor

@skoslowski Reviewed and verified. Thanks!

Contributor

kartikp1995 commented Sep 6, 2017

@skoslowski Reviewed and verified. Thanks!

@jmcorgan jmcorgan removed the Under Review label Sep 25, 2017

@jmcorgan jmcorgan merged commit 3c989f9 into gnuradio:master Sep 25, 2017

1 of 3 checks passed

bb/Ubuntu_14_04_64_py2_qt4_master Build done.
Details
bb/pull_request_runner Build done.
Details
bb/Ubuntu_16_04_64_py2_qt4_master Build done.
Details

skoslowski added a commit to skoslowski/gnuradio that referenced this pull request Sep 30, 2017

haakov added a commit to haakov/gnuradio that referenced this pull request Oct 10, 2017

haakov added a commit to haakov/gnuradio that referenced this pull request Oct 16, 2017

haakov added a commit to haakov/gnuradio that referenced this pull request Dec 4, 2017

@kartikp1995 kartikp1995 deleted the kartikp1995:bokeh_in_gnuradio branch Jan 20, 2018

haakov added a commit to haakov/gnuradio that referenced this pull request Jul 22, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment