diff --git a/productMods/js/visualization/personlevel/person_level.js b/productMods/js/visualization/personlevel/person_level.js index 36654884..150c0e26 100644 --- a/productMods/js/visualization/personlevel/person_level.js +++ b/productMods/js/visualization/personlevel/person_level.js @@ -339,7 +339,7 @@ function renderCoAuthorshipVisualization() { "src", swfLink, "flashVars", "graphmlUrl=" + egoCoAuthorshipDataFeederURL, "width", "600", - "height", "840", + "height", "850", "align", "top", "id", "CoAuthor", "quality", "high", diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java index 95b552d4..dd7c4647 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java @@ -4,6 +4,9 @@ package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.Set; @@ -86,8 +89,11 @@ public class CoAuthorshipGraphMLWriter { Set edges = visVOContainer.getEdges(); + List orderedEdges = new ArrayList(edges); + + Collections.sort(orderedEdges, new EdgeComparator()); - for (Edge currentEdge : edges) { + for (Edge currentEdge : orderedEdges) { /* * This method actually creates the XML code for a single edge. "graphMLContent" @@ -182,8 +188,13 @@ public class CoAuthorshipGraphMLWriter { * */ getNodeContent(graphMLContent, egoNode); + List orderedAuthorNodes = new ArrayList(authorNodes); + orderedAuthorNodes.remove(egoNode); - for (Node currNode : authorNodes) { + Collections.sort(orderedAuthorNodes, new NodeComparator()); + + + for (Node currNode : orderedAuthorNodes) { /* * We have already printed the Ego Node info. diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/EdgeComparator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/EdgeComparator.java new file mode 100644 index 00000000..f33adc54 --- /dev/null +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/EdgeComparator.java @@ -0,0 +1,15 @@ +package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; + +import java.util.Comparator; + +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Edge; + + +public class EdgeComparator implements Comparator { + + @Override + public int compare(Edge arg0, Edge arg1) { + return arg1.getEdgeID() - arg0.getEdgeID(); + } + +} diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/NodeComparator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/NodeComparator.java new file mode 100644 index 00000000..b47259bb --- /dev/null +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/NodeComparator.java @@ -0,0 +1,15 @@ +package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; + +import java.util.Comparator; + +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Node; + + +public class NodeComparator implements Comparator { + + @Override + public int compare(Node arg0, Node arg1) { + return arg1.getNodeID() - arg0.getNodeID(); + } + +} diff --git a/themes/vivo-basic/site_icons/visualization/coauthorship/CoAuthor.swf b/themes/vivo-basic/site_icons/visualization/coauthorship/CoAuthor.swf index 3110758f..c801820b 100644 Binary files a/themes/vivo-basic/site_icons/visualization/coauthorship/CoAuthor.swf and b/themes/vivo-basic/site_icons/visualization/coauthorship/CoAuthor.swf differ