--- a/graph.php +++ b/graph.php @@ -9,13 +9,13 @@ function add_node($id, $label, $parent="") { global $format; if ($format == "html") { - // echo "nodes[\"$id\"] = graph.newNode({label: \"$label\"});" . PHP_EOL; + // echo "nodes[\"$id\"] = graph.newNode({label: \"$label\"});" . PHP_EOL; } if ($format == "dot" && $label != "") { - echo "$id [label=\"$label\"];". PHP_EOL; + echo "\"$id\" [label=\"$label\", shape=plaintext];". PHP_EOL; } if ($format == "gexf") { - echo "<node id='$id' label=\"".htmlentities($label,ENT_XML1)."\" ".($parent != ""? "pid='$parent'><viz:size value='1'/>":"><viz:size value='2'/>") + echo "<node id='$id' label=\"".htmlentities($label)."\" ".($parent != ""? "pid='$parent'><viz:size value='1'/>":"><viz:size value='2'/>") ."<viz:color b='".rand(0,255)."' g='".rand(0,255)."' r='".rand(0,255)."'/>" ."</node>". PHP_EOL; } @@ -27,7 +27,7 @@ // echo "graph.newEdge(nodes[\"$from\"], nodes['$to'], {color: '$color'});" . PHP_EOL; } if ($format == "dot") { - echo "$from -> $to ".($color != ""? "[color=$color]":"").";". PHP_EOL; + echo "\"$from\" -> \"$to\" ".($color != ""? "[color=$color]":"").";". PHP_EOL; } if ($format == "gexf") { echo "<edge id='$from$to' source='$from' target='$to' />". PHP_EOL; @@ -55,7 +55,7 @@ $rows = $db->get_view("app", "byCanonicalName", null, true)->rows; //print_r($rows); foreach ($rows as $row) { - add_node($row->id, $row->key); + add_node($row->id, $row->value->name); } } catch (SetteeRestClientException $e) { setteErrorHandler($e); @@ -86,9 +86,9 @@ if ($format == "html") { ?> <div id="sigma-example" width="960" style="min-height:800px;background-color: #333;"></div> - <script src="javascripts/sigma.min.js"></script> - <script src="javascripts/sigma/plugins/sigma.parseGexf.js"></script> - <script src="javascripts/sigma/plugins/sigma.forceatlas2.js"></script> + <script src="js/sigma.min.js"></script> + <script src="js/sigma/plugins/sigma.parseGexf.js"></script> + <script src="js/sigma/plugins/sigma.forceatlas2.js"></script> <script type="text/javascript">function init() { // Instanciate sigma.js and customize rendering : var sigInst = sigma.init(document.getElementById('sigma-example')).drawingProperties({