basic aggregation visualizing, package/class label fixed

Author: nikitaeverywhere

web/js/ClassTree.js

@@ -46,8 +46,6 @@ ClassTree.prototype.classSelected = function (element, className) {
         this.cacheUMLExplorer.classView.loadClass(className);
     }
 
-    this.cacheUMLExplorer.elements.className.textContent = className;
-
 };
 
 ClassTree.prototype.packageSelected = function (element, packageName) {
@@ -62,8 +60,6 @@ ClassTree.prototype.packageSelected = function (element, packageName) {
         this.cacheUMLExplorer.classView.loadPackage(packageName);
     }
 
-    this.cacheUMLExplorer.elements.className.textContent = packageName;
-
 };
 
 ClassTree.prototype.updateTree = function (treeObject) {

web/js/ClassView.js

@@ -154,8 +154,24 @@ ClassView.prototype.render = function (data) {
         }
     }
 
+    for (p in data["aggregation"]) {
+        relTo = (classes[p] || {}).instance;
+        for (pp in data["aggregation"][p]) {
+            relFrom = (classes[pp] || {}).instance;
+            if (relFrom && relTo) {
+                this.graph.addCell(connector = new uml.Aggregation({
+                    source: { id: relFrom.id },
+                    target: { id: relTo.id },
+                    router: { name: "manhattan" },
+                    connector: { name: "rounded" }
+                }));
+                this.links.push(connector);
+            }
+        }
+    }
+
     joint.layout.DirectedGraph.layout(this.graph, {
-        setLinkVertices: true,
+        setLinkVertices: false,
         nodeSep: 100,
         rankSep: 100
     });
@@ -190,6 +206,7 @@ ClassView.prototype.loadClass = function (className) {
         }
     });
 
+    this.cacheUMLExplorer.elements.className.textContent = className;
     location.hash = "class:" + className;
 
 };
@@ -210,6 +227,7 @@ ClassView.prototype.loadPackage = function (packageName) {
         }
     });
 
+    this.cacheUMLExplorer.elements.className.textContent = packageName;
     location.hash = "package:" + packageName;
 
 };
@@ -256,7 +274,7 @@ ClassView.prototype.init = function () {
         el: this.container,
         width: this.container.offsetWidth,
         height: this.container.offsetHeight,
-        gridSize: 30,
+        gridSize: 20,
         model: this.graph,
         origin: {
             x: 0,

web/jsLib/joint.shapes.uml.js

@@ -177,7 +177,7 @@ joint.shapes.uml.Implementation = joint.dia.Link.extend({
 joint.shapes.uml.Aggregation = joint.dia.Link.extend({
     defaults: {
         type: 'uml.Aggregation',
-        attrs: { '.marker-target': { d: 'M 40 10 L 20 20 L 0 10 L 20 0 z', fill: 'white' }}
+        attrs: { '.marker-target': { d: 'M 20 10 L 10 15 L 0 10 L 10 5 z', fill: 'white' }}
     }
 });