From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Thu, 7 Aug 2014 12:08:14 +0000 (+0200)
Subject: Validation of networkx imports in Plotter
X-Git-Tag: nepi-3.2.0~100
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=74bb6c4d720bab1e65a71db74525a1bf55cfcb2d;p=nepi.git

Validation of networkx imports in Plotter
---

diff --git a/src/nepi/util/plotter.py b/src/nepi/util/plotter.py
index f1c1748e..48b826ea 100644
--- a/src/nepi/util/plotter.py
+++ b/src/nepi/util/plotter.py
@@ -17,9 +17,24 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
-import networkx
+import logger
 import os
 
+try:
+    import networkx
+except ImportError:
+    msg = ("Networkx library is not installed, you will not be able to plot.")
+    logger = Logger("Plotter")
+    logger.debug(msg)
+
+try:
+    import matplotlib.pyplot as plt
+except ImportError:
+    msg = ("Matplotlib library is not installed, you will not be able "
+        "generate PNG plots.")
+    logger = Logger("Plotter")
+    logger.debug(msg)
+
 class PFormats:
     DOT = "dot"
     FIGURE = "figure"
@@ -38,7 +53,6 @@ class ECPlotter(object):
         fpath = os.path.join(dirpath, "%s_%s" % (ec.exp_id, ec.run_id)) 
 
         if format == PFormats.FIGURE:
-            import matplotlib.pyplot as plt
             pos = networkx.graphviz_layout(graph, prog="neato")
             networkx.draw(graph, pos = pos, node_color="white", 
                     node_size = 500, with_labels=True)