diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-04-14 14:07:40 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-04-14 14:07:40 -0700 |
| commit | d13de2faffc6e9c50d353e1c3567d688b326b805 (patch) | |
| tree | d26168e5a1402c073e21b029c8639cd9c79634b2 /gnuradio-runtime/python | |
| parent | 24028a56ef87f158d8df420c7010562de55140ce (diff) | |
| parent | bdf85171b8a35004cdbf634f48ff696787b5fbde (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-runtime/python')
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx index cc9f76f864..cf67584235 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx +++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2012-2013 Free Software Foundation, Inc. +# Copyright 2012-2016 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -53,7 +53,16 @@ import itertools from gnuradio import gr, ctrlport from gnuradio.ctrlport.GrDataPlotter import * -if float(nx.__version__) >= 1.11: +#check for networkx version +_critical_version = (1,11) +_atleast_critical = False + +for act,ref in zip(nx.__version__.split("."), _critical_version): + _atleast_critical = (act >= ref) + if not act == ref: + break + +if _atleast_critical: from networkx.drawing.nx_agraph import graphviz_layout else: graphviz_layout = nx.graphviz_layout |