#790 use different sizes for brokers/destinations

hawtio · Nov 29, 2013 · 02804c9 · 02804c9
1 parent 0064351
commit 02804c9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/hawtio-web/src/main/webapp/app/fabric/html/brokerDiagram.html b/hawtio-web/src/main/webapp/app/fabric/html/brokerDiagram.html
@@ -284,7 +284,7 @@
 
   <div class="row-fluid">
     <div class="span12 canvas">
-      <div hawtio-force-graph graph="graph" link-distance="50" charge="-120" nodesize="10"
+      <div hawtio-force-graph graph="graph" link-distance="150" charge="-600" nodesize="10"
            style="min-height: 800px"></div>
     </div>
   </div>

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/brokerDiagram.ts b/hawtio-web/src/main/webapp/app/fabric/js/brokerDiagram.ts
@@ -16,6 +16,12 @@ module Fabric {
       producer: true
     };
 
+    $scope.shapeSize = {
+      broker: 20,
+      queue: 14,
+      topic: 14
+    };
+
     var graphBuilder = new ForceGraph.GraphBuilder();
 
     angular.forEach($scope.showFlags, (value, key) => {
@@ -282,6 +288,10 @@ module Fabric {
             node['name'] = id;
           }
           if (node) {
+            var size = $scope.shapeSize[typeName];
+            if (size && !node['size']) {
+              node['size'] = size;
+            }
             // lets not add nodes which are defined as being disabled
             var enabled = $scope.showFlags[typeName];
             if (enabled || !angular.isDefined(enabled)) {

diff --git a/hawtio-web/src/main/webapp/app/forcegraph/doc/developer.md b/hawtio-web/src/main/webapp/app/forcegraph/doc/developer.md
@@ -86,6 +86,7 @@ Below is an example to build a bundle node within the OSGI dependency viewer:
             name: bundle.SymbolicName,
             type: "bundle",
             navUrl: "#/osgi/bundle/" + bundle.Identifier,
+            size: 20,
             image: {
                 url: "/hawtio/app/osgi/img/bundle.png",
                 width: 32,

diff --git a/hawtio-web/src/main/webapp/app/forcegraph/js/forceGraphDirective.ts b/hawtio-web/src/main/webapp/app/forcegraph/js/forceGraphDirective.ts
@@ -207,7 +207,9 @@ module ForceGraph {
             .attr("class", (d) => {
               return d.type;
             })
-            .attr("r", $scope.nodesize);
+            .attr("r", (d) => {
+              return d.size || $scope.nodesize;
+            });
 
           // Add the labels to the viewport
           $scope.graphLabels = $scope.viewport.append("svg:g").selectAll("g")