Make Numpy support optional.

DINKIN · Dec 11, 2015 · 2c614f1 · 2c614f1
1 parent c89b121
commit 2c614f1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/pymavlink/mavutil.py b/pymavlink/mavutil.py
@@ -18,10 +18,6 @@
 except Exception:
     pass
 
-# these imports allow for mavgraph and mavlogdump to use maths expressions more easily
-from math import *
-from .mavextra import *
-
 # maximum packet length for a single receive call - use the UDP limit
 UDP_MAX_PACKET_LEN = 65535
 

diff --git a/pymavlink/tools/mavgraph.py b/pymavlink/tools/mavgraph.py
@@ -9,7 +9,10 @@
 import matplotlib
 from math import *
 
-from pymavlink.mavextra import *
+try:
+    from pymavlink.mavextra import *
+except:
+    print("WARNING: Numpy missing, mathematical notation will not be supported.")
 
 # cope with rename of raw_input in python3
 try:

diff --git a/pymavlink/tools/mavlogdump.py b/pymavlink/tools/mavlogdump.py
@@ -9,6 +9,11 @@
 
 import sys, time, os, struct, json
 
+try:
+    from pymavlink.mavextra import *
+except:
+    print("WARNING: Numpy missing, mathematical notation will not be supported..")
+
 from argparse import ArgumentParser
 parser = ArgumentParser(description=__doc__)