Author: Christian Lopes
Date: 2010-11-29 14:43:51 -0800 (Mon, 29 Nov 2010)
New Revision: 23046
Modified:
cytoscapeweb/trunk/website/build.xml
cytoscapeweb/trunk/website/default.properties
cytoscapeweb/trunk/website/src/js/content/demo.js
Log:
Added edge style fields to demo app.
Modified: cytoscapeweb/trunk/website/build.xml
===================================================================
--- cytoscapeweb/trunk/website/build.xml 2010-11-29 22:37:37 UTC (rev
23045)
+++ cytoscapeweb/trunk/website/build.xml 2010-11-29 22:43:51 UTC (rev
23046)
@@ -77,7 +77,7 @@
<mkdir dir="${api.dir}/elements"/>
<copy todir="${api.dir}/elements" overwrite="true">
- <fileset dir="${temp.dir}/symbols" includes="**.Edge.php
**.Node.php **.Group.php"/>
+ <fileset dir="${temp.dir}/symbols" includes="**.NetworkModel.php
**.Edge.php **.Node.php **.Group.php"/>
</copy>
<mkdir dir="${api.dir}/events"/>
Modified: cytoscapeweb/trunk/website/default.properties
===================================================================
--- cytoscapeweb/trunk/website/default.properties 2010-11-29 22:37:37 UTC
(rev 23045)
+++ cytoscapeweb/trunk/website/default.properties 2010-11-29 22:43:51 UTC
(rev 23046)
@@ -1,7 +1,7 @@
# Website version
-build.version=0.5.1
+build.version=0.6
# The released Cytoscape Web version (downloadable zip & API doc)
-cw.build.version=0.6.1
+cw.build.version=0.7
CYTOSCAPEWEB_HOME=../cytoscapeweb
CW_FILE_HOME=../file
\ No newline at end of file
Modified: cytoscapeweb/trunk/website/src/js/content/demo.js
===================================================================
--- cytoscapeweb/trunk/website/src/js/content/demo.js 2010-11-29 22:37:37 UTC
(rev 23045)
+++ cytoscapeweb/trunk/website/src/js/content/demo.js 2010-11-29 22:43:51 UTC
(rev 23046)
@@ -1734,6 +1734,13 @@
mapgroup: "edges"
},
{
+ name: "Style",
+ variable: "edges.style",
+ type: "edge style",
+ mappable: true,
+ mapgroup: "edges"
+ },
+ {
name: "Curvature",
variable: "edges.curvature",
type: "number",
@@ -1799,6 +1806,13 @@
type: "per cent number",
mappable: true,
mapgroup: "edges"
+ },
+ {
+ name: "Style",
+ variable: "edges.mergeStyle",
+ type: "edge style",
+ mappable: true,
+ mapgroup: "edges"
}
]
}
@@ -1858,9 +1872,7 @@
case "integer":
return parseInt(value);
case "string":
- case "non-empty string":
- case "node shape":
- case "edge shape":
+ default:
return "" + value;
}
@@ -1875,9 +1887,7 @@
case "integer":
return "continuous";
case "string":
- case "non-empty string":
- case "node shape":
- case "edge shape":
+ default:
return "discrete";
}
}
@@ -1900,6 +1910,8 @@
return
value.match(/^(ellipse)|(diamond)|(rectangle)|(triangle)|(hexagon)|(roundrect)|(parallelogram)|(octagon)|(vee)|(v)$/i);
case "edge shape":
return
value.match(/^(circle)|(diamond)|(delta)|(arrow)|(T)|(none)$/i);
+ case "edge style":
+ return
value.match(/^(SOLID)|(DOT)|(LONG_DASH)|(EQUAL_DASH)$/i);
}
return false;
--
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.
