--- a/Graphics/PackageDiagramBuilder.py Fri Nov 01 15:48:48 2013 +0100 +++ b/Graphics/PackageDiagramBuilder.py Sun Nov 03 15:58:22 2013 +0100 @@ -76,9 +76,9 @@ import Utilities.ModuleParser supportedExt = \ - ['*{0}'.format(ext) for ext in + ['*{0}'.format(ext) for ext in Preferences.getPython("PythonExtensions")] + \ - ['*{0}'.format(ext) for ext in + ['*{0}'.format(ext) for ext in Preferences.getPython("Python3Extensions")] + \ ['*.rb'] extensions = Preferences.getPython("PythonExtensions") + \ @@ -127,9 +127,9 @@ import Utilities.ModuleParser supportedExt = \ - ['*{0}'.format(ext) for ext in + ['*{0}'.format(ext) for ext in Preferences.getPython("PythonExtensions")] + \ - ['*{0}'.format(ext) for ext in + ['*{0}'.format(ext) for ext in Preferences.getPython("Python3Extensions")] + \ ['*.rb'] extensions = Preferences.getPython("PythonExtensions") + \ @@ -200,7 +200,7 @@ if len(initlist) == 0: ct = QGraphicsTextItem(None, self.scene) ct.setHtml( - self.trUtf8("The directory <b>'{0}'</b> is not a package.")\ + self.trUtf8("The directory <b>'{0}'</b> is not a package.") .format(self.package)) return @@ -210,7 +210,7 @@ ct.setHtml( self.trUtf8( "The package <b>'{0}'</b> does not contain any modules.") - .format(self.package)) + .format(self.package)) return # step 1: build all classes found in the modules @@ -226,7 +226,7 @@ ct.setHtml( self.trUtf8( "The package <b>'{0}'</b> does not contain any classes.") - .format(self.package)) + .format(self.package)) return # step 2: build the class hierarchies @@ -246,10 +246,10 @@ self.allClasses[className] = cw if cw and cw.noAttrs != self.noAttrs: cw = None - if cw and not (cw.external and \ + if cw and not (cw.external and (className in module.classes or className in module.modules) - ): + ): if className not in nodes: nodes.append(className) else: @@ -428,10 +428,10 @@ for route in routes: if len(route) > 1: assoc = AssociationItem( - self.__getCurrentShape(route[1]), - self.__getCurrentShape(route[0]), - Generalisation, - topToBottom=True) + self.__getCurrentShape(route[1]), + self.__getCurrentShape(route[0]), + Generalisation, + topToBottom=True) self.scene.addItem(assoc) def getPersistenceData(self):