diff options
| author | sidkapoor97 <16ec142siddharth@nitk.edu.in> | 2020-04-08 18:21:40 +0530 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2020-04-09 07:37:27 -0400 |
| commit | 995e577c2effe36468c2d88240b47dc1277e9763 (patch) | |
| tree | b4d9fa730c33b76d418e6fc7aff6ab5522c7f4f9 /gr-qtgui/python/qtgui | |
| parent | 8cbbb08e5ba9ef04895ffc2e7faa7e74aa12bc0f (diff) | |
Changes for #3281 qtgui:matplotlib dependency
Diffstat (limited to 'gr-qtgui/python/qtgui')
| -rw-r--r-- | gr-qtgui/python/qtgui/__init__.py | 13 | ||||
| -rw-r--r-- | gr-qtgui/python/qtgui/distanceradar.py | 8 |
2 files changed, 12 insertions, 9 deletions
diff --git a/gr-qtgui/python/qtgui/__init__.py b/gr-qtgui/python/qtgui/__init__.py index d727748130..a510163c0a 100644 --- a/gr-qtgui/python/qtgui/__init__.py +++ b/gr-qtgui/python/qtgui/__init__.py @@ -23,14 +23,22 @@ except ImportError: __path__.append(os.path.join(dirname, "..", "..", "swig")) from .qtgui_swig import * +try: + import matplotlib.pyplot as plt + from .distanceradar import DistanceRadar + from .azeplot import AzElPlot +except ImportError: + from gnuradio import gr + gr.log.warn("Matplotlib is a required dependency to use DistanceRadar and AzElPlot." + " Please install matplotlib to use these blocks (https://matplotlib.org/)") + + from .range import Range, RangeWidget from . import util from .compass import GrCompass from .togglebutton import ToggleButton from .msgpushbutton import MsgPushButton -from .distanceradar import DistanceRadar -from .azelplot import AzElPlot from .msgcheckbox import MsgCheckBox from .digitalnumbercontrol import MsgDigitalNumberControl from .dialcontrol import GrDialControl @@ -43,4 +51,3 @@ from .graphicoverlay import GrGraphicOverlay from .auto_correlator_sink import AutoCorrelatorSink from .auto_correlator_sink import AutoCorrelator from .auto_correlator_sink import Normalize - diff --git a/gr-qtgui/python/qtgui/distanceradar.py b/gr-qtgui/python/qtgui/distanceradar.py index a870be26e6..5659045c27 100644 --- a/gr-qtgui/python/qtgui/distanceradar.py +++ b/gr-qtgui/python/qtgui/distanceradar.py @@ -13,12 +13,8 @@ import sys from PyQt5 import QtWidgets import numpy as np import matplotlib.pyplot as plt -try: - from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas - from matplotlib.figure import Figure -except: - gr.log.error("Unable to import matplotlib. It's an optional dependency. " - "(e.g., via pip/pip3/dpkg/MacPorts).") +from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas +from matplotlib.figure import Figure from gnuradio import gr import pmt |