diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-08-28 12:03:54 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-08-28 12:03:54 -0700 |
| commit | 1b9349297663e5af00df4a42f1a7b9389ac9b4ac (patch) | |
| tree | df652ad08e62b37b24b4cadeb911b35dd6b7933f /gnuradio-runtime/python | |
| parent | 183dc9e9e18814beacb74bc7810a3a321e005522 (diff) | |
| parent | 5e645075ebaeb1d32a0a4c7b2e99a4bed8220163 (diff) | |
Merge branch 'master' into next
Conflicts:
docs/sphinx/source/index.rst
Diffstat (limited to 'gnuradio-runtime/python')
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx index a05ea3a28e..bb53e02cc4 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx +++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx @@ -20,18 +20,23 @@ # Boston, MA 02110-1301, USA. # +import sys, time, re, pprint import random,math,operator -import networkx as nx -import matplotlib -matplotlib.use("QT4Agg") -import matplotlib.pyplot as plt -from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas -from matplotlib.backends.backend_qt4agg import NavigationToolbar2QTAgg as NavigationToolbar -from matplotlib.figure import Figure +try: + import networkx as nx + import matplotlib + matplotlib.use("QT4Agg") + import matplotlib.pyplot as plt + from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas + from matplotlib.backends.backend_qt4agg import NavigationToolbar2QTAgg as NavigationToolbar + from matplotlib.figure import Figure +except ImportError: + print sys.argv[0], "requires networkx and matplotlib.", \ + "Please check that they are installed and try again." + sys.exit(1) from PyQt4 import QtCore,Qt,Qwt5 import PyQt4.QtGui as QtGui -import sys, time, re, pprint import itertools from gnuradio import gr, ctrlport @@ -582,7 +587,7 @@ class MForm(QtGui.QWidget): def pauseFlowgraph(self): knobs = [self.radioclient.Knob(self.top_block + "::lock"), - self.radioclient.Knob(self.top_block + "::stop")] + self.radioclient.Knob(self.top_block + "::stop")] k = self.radioclient.setKnobs(knobs) def unpauseFlowgraph(self): |