# Copyright (C) 2013 INRIA
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation;
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-import logger
+import logging
import os
try:
import networkx
except ImportError:
msg = "Networkx library is not installed, you will not be able to plot."
- logger = Logger("Plotter")
+ logger = logging.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")
+except:
+ msg = ("Matplotlib library is not installed or X11 is not enabled. "
+ "You will not be able generate PNG plots.")
+ logger = logging.Logger("Plotter")
logger.debug(msg)
class PFormats:
networkx.draw(graph, pos = pos, node_color="white",
node_size = 500, with_labels=True)
- label = "\n".join(map(lambda v: "%s: %s" % (v[0], v[1]), labels.iteritems()))
+ label = "\n".join(["%s: %s" % (v[0], v[1]) for v in iter(labels.items())])
plt.annotate(label, xy=(0.05, 0.95), xycoords='axes fraction')
fpath += ".png"
labels = dict()
connections = set()
- for guid, rm in ec._resources.iteritems():
+ for guid, rm in ec._resources.items():
label = rm.get_rtype()
graph.add_node(guid,