From e817a031c8316d2f4bfba8eb8811b87bc41f211d Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Thu, 20 Mar 2014 22:56:07 -0400 Subject: [PATCH] metrics/generate_hier: project_hierarchy.dot use given_mmodules Instead of using the first loaded project Signed-off-by: Jean Privat --- src/metrics/generate_hierarchies.nit | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/metrics/generate_hierarchies.nit b/src/metrics/generate_hierarchies.nit index e1fdda3..7a85a5d 100644 --- a/src/metrics/generate_hierarchies.nit +++ b/src/metrics/generate_hierarchies.nit @@ -34,7 +34,7 @@ private class GenerateHierarchyPhase do if not toolcontext.opt_generate_hyperdoc.value and not toolcontext.opt_all.value then return var model = toolcontext.modelbuilder.model - generate_module_hierarchy(toolcontext, model) + generate_module_hierarchy(toolcontext, given_mmodules) generate_classdef_hierarchy(toolcontext, model) generate_class_hierarchy(toolcontext, mainmodule) end @@ -43,12 +43,18 @@ end # Create a dot file representing the module hierarchy of a model. # Importation relation is represented with arrow # Nesting relation is represented with nested boxes -fun generate_module_hierarchy(toolcontext: ToolContext, model: Model) +fun generate_module_hierarchy(toolcontext: ToolContext, given_mmodules: Collection[MModule]) do + var model = given_mmodules.first.model var dot = new MProjectDot(model) + # Collect requested projects + for m in given_mmodules do + var g = m.mgroup + if g == null then continue + dot.mprojects.add(g.mproject) + end var projectpath = toolcontext.output_dir.join_path("project_hierarchy.dot") - dot.mprojects.add(model.mprojects.first) print "generating {projectpath}" dot.write_to_file(projectpath) -- 1.7.9.5