Author: Christian Lopes
Date: 2011-01-04 09:26:19 -0800 (Tue, 04 Jan 2011)
New Revision: 23294
Modified:
cytoscapeweb/trunk/website/default.properties
cytoscapeweb/trunk/website/src/file/example_graphs/sample1.graphml
cytoscapeweb/trunk/website/src/js/content/demo.js
cytoscapeweb/trunk/website/src/js/content/home.js
cytoscapeweb/trunk/website/src/js/cytoscape_web/cytoscapeweb-styles-demo.js
Log:
Removed "reindeers" graph example. Added more Coogle Chart images to the
"shapes" graph example.
Modified: cytoscapeweb/trunk/website/default.properties
===================================================================
--- cytoscapeweb/trunk/website/default.properties 2011-01-04 17:16:58 UTC
(rev 23293)
+++ cytoscapeweb/trunk/website/default.properties 2011-01-04 17:26:19 UTC
(rev 23294)
@@ -1,7 +1,7 @@
# Website version
-build.version=0.6
+build.version=0.6.1
# The released Cytoscape Web version (downloadable zip & API doc)
-cw.build.version=0.7
+cw.build.version=0.7.1
CYTOSCAPEWEB_HOME=../cytoscapeweb
CW_FILE_HOME=../file
\ No newline at end of file
Modified: cytoscapeweb/trunk/website/src/file/example_graphs/sample1.graphml
===================================================================
--- cytoscapeweb/trunk/website/src/file/example_graphs/sample1.graphml
2011-01-04 17:16:58 UTC (rev 23293)
+++ cytoscapeweb/trunk/website/src/file/example_graphs/sample1.graphml
2011-01-04 17:26:19 UTC (rev 23294)
@@ -63,6 +63,18 @@
<data key="shape">VEE</data>
</node>
+ <edge target="a05" source="a05" directed="false">
+ <data key="network">15</data>
+ <data key="weight">0.2</data>
+ <data key="label">a05 (15) a05</data>
+ <data key="lineStyle">SOLID</data>
+ </edge>
+ <edge target="a05" source="a05" directed="false">
+ <data key="network">25</data>
+ <data key="weight">0.4</data>
+ <data key="label">a05 (25) a05</data>
+ <data key="lineStyle">DOT</data>
+ </edge>
<edge target="a01" source="a02" directed="true">
<data key="network">25</data>
<data key="weight">0.4</data>
Modified: cytoscapeweb/trunk/website/src/js/content/demo.js
===================================================================
--- cytoscapeweb/trunk/website/src/js/content/demo.js 2011-01-04 17:16:58 UTC
(rev 23293)
+++ cytoscapeweb/trunk/website/src/js/content/demo.js 2011-01-04 17:26:19 UTC
(rev 23294)
@@ -360,17 +360,9 @@
// example graphs
var examples = {
- reindeers: {
- name: "Reindeers",
- description: "Merry Christmas!",
- url: path("file/example_graphs/reindeers.xgmml"),
- visualStyleName: "Dark",
- visualStyle: GRAPH_STYLES["Images"],
- nodeLabelsVisible: true
- },
shapes: {
name: "Shapes example",
- description: "A graph that contains all possible shapes for nodes
and arrows",
+ description: "A graph that contains all available node and arrow
shapes and all edge styles",
url: path("file/example_graphs/sample1.graphml"),
visualStyleName: "Shapes",
visualStyle: GRAPH_STYLES["Shapes"],
Modified: cytoscapeweb/trunk/website/src/js/content/home.js
===================================================================
--- cytoscapeweb/trunk/website/src/js/content/home.js 2011-01-04 17:16:58 UTC
(rev 23293)
+++ cytoscapeweb/trunk/website/src/js/content/home.js 2011-01-04 17:26:19 UTC
(rev 23294)
@@ -40,7 +40,7 @@
var options = {
panZoomControlVisible: false,
edgesMerged: false,
- nodeLabelsVisible: true,
+ nodeLabelsVisible: false,
edgeLabelsVisible: false,
nodeTooltipsEnabled: false,
edgeTooltipsEnabled: false,
@@ -57,9 +57,8 @@
}, DELAY_BEFORE_HIDING_LOADER);
});
- $.get("/file/example_graphs/reindeers.xgmml", function(data){
+ $.get("/file/example_graphs/petersen.xgmml", function(data){
options.network = data;
- options.visualStyle = GRAPH_STYLES["Images"],
vis.draw(options);
});
}
Modified:
cytoscapeweb/trunk/website/src/js/cytoscape_web/cytoscapeweb-styles-demo.js
===================================================================
--- cytoscapeweb/trunk/website/src/js/cytoscape_web/cytoscapeweb-styles-demo.js
2011-01-04 17:16:58 UTC (rev 23293)
+++ cytoscapeweb/trunk/website/src/js/cytoscape_web/cytoscapeweb-styles-demo.js
2011-01-04 17:26:19 UTC (rev 23294)
@@ -277,13 +277,23 @@
{ attrValue: "delta", value: "#ff0000" },
{ attrValue: "diamond", value: "#aaaa00" },
{ attrValue: "circle", value: "#00ff00" } ];
+ var nodeImages = [ { attrValue: "ELLIPSE", value:
"/file/php/proxy.php?mimeType=image/gif&url=http://chart.apis.google.com/chart?chs=300x300%26cht=p%26chd=e0:U-gh..bR";
},
+ { attrValue: "OCTAGON", value:
"/file/php/proxy.php?mimeType=image/gif&url=http://chart.apis.google.com/chart?chxt=x,y%26chs=300x300%26cht=r%26chco=FF0000%26chd=t:63,64,67,73,77,81,85,86,85,81,74,67,63%26chls=2,4,0%26chm=B,FF000080,0,0,0";
},
+ { attrValue: "RECTANGLE", value:
"/file/php/proxy.php?mimeType=image/gif&url=http://chart.apis.google.com/chart?chxt=y%26chbh=a%26chs=250x250%26cht=bvs%26chco=A2C180,3D7930%26chds=5,100,-3.333,100%26chd=t:10,50,60,80,40,60,30|50,60,100,40,20,40,30"
},
+ { attrValue: "ROUNDRECT", value:
"/file/php/proxy.php?mimeType=image/gif&url=http://chart.apis.google.com/chart?chxr=0,0,160%26chxt=x%26chbh=a%26chs=250x250%26cht=bhs%26chco=4D89F9,C6D9FD%26chds=0,160,0,160%26chd=t:10,50,60,80,40,60,30|50,60,100,40,30,40,30"
} ];
GRAPH_STYLES["Shapes"] = {
nodes: {
+ size: 32,
selectionColor: "#aaaaff",
selectionOpacity: 1,
hoverOpacity: 1,
- image:
"/file/php/proxy.php?mimeType=image/gif&url=http://chart.apis.google.com/chart?chs=300x300%26cht=p%26chd=e0:U-gh..bR";,
+ image: {
+ discreteMapper: {
+ attrName: "shape",
+ entries: nodeImages
+ }
+ },
shape: { passthroughMapper: { attrName: "shape"
} }
},
edges: {
@@ -297,6 +307,7 @@
sourceArrowColor: "#6666ff",
targetArrowShape: { passthroughMapper: {
attrName: "targetArrowShape" } },
targetArrowColor: {
+ defaultValue: null,
discreteMapper: {
attrName: "targetArrowShape",
entries: arrowColors
@@ -413,49 +424,5 @@
selectionOpacity: 1
}
};
-
- /*---- IMAGES
------------------------------------------------------------------------------------*/
-
- GRAPH_STYLES["Images"] = {
- global: {
- backgroundColor: "#ffffff",
- selectionLineColor: "#ae0300",
- selectionLineOpacity: 0.5,
- selectionLineWidth: 1,
- selectionFillColor: "#ae0300",
- selectionFillOpacity: 0.1
- },
- nodes: {
- opacity: 1,
- size: 40,
- labelFontColor: "#ffffff",
- labelFontSize: 14,
- labelFontWeight: "bold",
- labelVerticalAnchor: "top",
- tooltipText: "${label}",
- tooltipFontColor: "#ffffff",
- tooltipBackgroundColor: "#ae0300",
- tooltipBorderColor: "#999999",
- labelGlowColor: "#ae0300",
- labelGlowOpacity: 0.8,
- selectionGlowColor: "#ffff00",
- selectionGlowOpacity: 0.5,
- selectionGlowBlur: 32,
- image: { passthroughMapper: { attrName: "image" } }
- },
- edges: {
- opacity: 1,
- color: "#ff0000",
- width: 3,
- mergeWidth: 3,
- labelFontColor: "#ffffff",
- tooltipFontColor: "#ffffff",
- tooltipBackgroundColor: "#000000",
- tooltipBorderColor: "#999999",
- selectionGlowColor: "#ffffaa",
- hoverOpacity: 1,
- selectionOpacity: 1
- }
- };
});
\ No newline at end of file
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
