Author: scooter
Date: 2010-09-06 20:33:13 -0700 (Mon, 06 Sep 2010)
New Revision: 21715
Added:
csplugins/trunk/ucsf/scooter/nodeCharts/examples/
csplugins/trunk/ucsf/scooter/nodeCharts/examples/bar.com
csplugins/trunk/ucsf/scooter/nodeCharts/examples/pie.com
csplugins/trunk/ucsf/scooter/nodeCharts/examples/pie2.com
csplugins/trunk/ucsf/scooter/nodeCharts/examples/stripe.com
csplugins/trunk/ucsf/scooter/nodeCharts/examples/test-stripe.txt
Removed:
csplugins/trunk/ucsf/scooter/nodeCharts/test-stripe.txt
csplugins/trunk/ucsf/scooter/nodeCharts/test.com
csplugins/trunk/ucsf/scooter/nodeCharts/test2.com
Modified:
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/command/NodeChartCommandHandler.java
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/view/BarChart.java
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/view/LineChart.java
Log:
Turned off debugging and created examples directory.
Added: csplugins/trunk/ucsf/scooter/nodeCharts/examples/bar.com
===================================================================
--- csplugins/trunk/ucsf/scooter/nodeCharts/examples/bar.com
(rev 0)
+++ csplugins/trunk/ucsf/scooter/nodeCharts/examples/bar.com 2010-09-07
03:33:13 UTC (rev 21715)
@@ -0,0 +1,3 @@
+nodecharts bar nodelist="all" attributelist="gal1RGexp,gal4RGexp,gal80Rexp"
colorlist="contrasting"
+
+network view update
Copied: csplugins/trunk/ucsf/scooter/nodeCharts/examples/pie.com (from rev
21709, csplugins/trunk/ucsf/scooter/nodeCharts/test.com)
===================================================================
--- csplugins/trunk/ucsf/scooter/nodeCharts/examples/pie.com
(rev 0)
+++ csplugins/trunk/ucsf/scooter/nodeCharts/examples/pie.com 2010-09-07
03:33:13 UTC (rev 21715)
@@ -0,0 +1,15 @@
+nodecharts pie node="YCL067C" labellist="A,B,C,D" valuelist="1.0,2.0,0.5,5"
colorlist="#FF0000,#00FF00,#0000FF,#0000FF80"
+nodecharts pie node="YKL101W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5"
+nodecharts pie node="YHR084W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="north" colorlist="random"
+nodecharts pie node="YDR461W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="south" colorlist="rainbow"
+nodecharts pie node="YFL026W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="east" colorlist="modulated"
+nodecharts pie node="YGL008C" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="west" colorlist="contrasting"
+nodecharts pie node="YBR112C" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="northwest"
+nodecharts pie node="YCR084C" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="southwest"
+nodecharts pie node="YNL145W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="northeast"
+nodecharts pie node="YIL015W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="southeast"
+nodecharts pie node="YBL069W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="10,10"
+
+nodecharts clear node="YCR084C"
+
+network view update
Copied: csplugins/trunk/ucsf/scooter/nodeCharts/examples/pie2.com (from rev
21709, csplugins/trunk/ucsf/scooter/nodeCharts/test2.com)
===================================================================
--- csplugins/trunk/ucsf/scooter/nodeCharts/examples/pie2.com
(rev 0)
+++ csplugins/trunk/ucsf/scooter/nodeCharts/examples/pie2.com 2010-09-07
03:33:13 UTC (rev 21715)
@@ -0,0 +1,3 @@
+nodecharts pie nodelist="all" attributelist="gal1RGsig,gal4RGsig,gal80Rsig"
colorlist="contrasting"
+
+network view update
Added: csplugins/trunk/ucsf/scooter/nodeCharts/examples/stripe.com
===================================================================
--- csplugins/trunk/ucsf/scooter/nodeCharts/examples/stripe.com
(rev 0)
+++ csplugins/trunk/ucsf/scooter/nodeCharts/examples/stripe.com 2010-09-07
03:33:13 UTC (rev 21715)
@@ -0,0 +1,8 @@
+nodecharts clear nodelist="all"
+nodecharts stripe node="YCL067C" labellist="A,B,C,D" valuelist="1.0,2.0,0.5,5"
colorlist="#FF0000,#00FF00,#0000FF,#0000FF80"
+nodecharts stripe node="YKL101W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5"
+nodecharts stripe node="YHR084W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" colorlist="random"
+nodecharts stripe node="YDR461W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" colorlist="rainbow"
+nodecharts stripe node="YFL026W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" colorlist="modulated"
+nodecharts stripe node="YGL008C" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" colorlist="contrasting"
+nodecharts stripe node="YBR112C" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5"
Copied: csplugins/trunk/ucsf/scooter/nodeCharts/examples/test-stripe.txt (from
rev 21713, csplugins/trunk/ucsf/scooter/nodeCharts/test-stripe.txt)
===================================================================
--- csplugins/trunk/ucsf/scooter/nodeCharts/examples/test-stripe.txt
(rev 0)
+++ csplugins/trunk/ucsf/scooter/nodeCharts/examples/test-stripe.txt
2010-09-07 03:33:13 UTC (rev 21715)
@@ -0,0 +1,8 @@
+nodecharts clear nodelist="all"
+nodecharts stripe node="YCL067C" labellist="A,B,C,D" valuelist="1.0,2.0,0.5,5"
colorlist="#FF0000,#00FF00,#0000FF,#0000FF80"
+nodecharts stripe node="YKL101W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5"
+nodecharts stripe node="YHR084W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" colorlist="random"
+nodecharts stripe node="YDR461W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" colorlist="rainbow"
+nodecharts stripe node="YFL026W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" colorlist="modulated"
+nodecharts stripe node="YGL008C" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" colorlist="contrasting"
+nodecharts stripe node="YBR112C" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5"
Modified:
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/command/NodeChartCommandHandler.java
===================================================================
---
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/command/NodeChartCommandHandler.java
2010-09-07 03:17:00 UTC (rev 21714)
+++
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/command/NodeChartCommandHandler.java
2010-09-07 03:33:13 UTC (rev 21715)
@@ -57,10 +57,10 @@
// nodeChart imports
import nodeCharts.view.NodeChartViewer;
+import nodeCharts.view.BarChart;
+import nodeCharts.view.LineChart;
import nodeCharts.view.PieChart;
import nodeCharts.view.StripeChart;
-import nodeCharts.view.LineChart;
-import nodeCharts.view.BarChart;
import nodeCharts.view.ViewUtils;
/**
@@ -90,10 +90,10 @@
viewerMap = new HashMap<String, NodeChartViewer>();
// Register each command
+ register(new BarChart());
+ register(new LineChart());
register(new PieChart());
register(new StripeChart());
- register(new LineChart());
- register(new BarChart());
// Register our built-in commands
addDescription(CLEAR, "Remove all charts from a node");
Modified:
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/view/BarChart.java
===================================================================
---
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/view/BarChart.java
2010-09-07 03:17:00 UTC (rev 21714)
+++
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/view/BarChart.java
2010-09-07 03:33:13 UTC (rev 21715)
@@ -88,7 +88,7 @@
double yMid = y + (0.5 * height);
- System.out.println("Node bounding box = " + bbox);
+ // System.out.println("Node bounding box = " + bbox);
// divide width into equal size segments
double slice = (width / values.size()) - (values.size() *
separation) + separation; // only have n-1 separators
// System.out.println("slice = " + slice);
@@ -128,7 +128,7 @@
double h = (0.5 * height) * (val / max);
Rectangle2D drect = new Rectangle2D.Double(px1, py1, w,
h);
- System.out.println ("Got rectangle from: " + px1 + ","
+ py1 + " of width " + w + " and height " + h);
+ // System.out.println ("Got rectangle from: " + px1 +
"," + py1 + " of width " + w + " and height " + h);
CustomGraphic c = new CustomGraphic(drect, pf);
// System.out.println("added custome graphic for line from
" + drect.getP1() + " to " + .getP2());
Modified:
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/view/LineChart.java
===================================================================
---
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/view/LineChart.java
2010-09-07 03:17:00 UTC (rev 21714)
+++
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/view/LineChart.java
2010-09-07 03:33:13 UTC (rev 21715)
@@ -65,10 +65,10 @@
double x = bbox.getX();
double y = bbox.getY() - 1;
- System.out.println("Node bounding box = " + bbox);
+ // System.out.println("Node bounding box = " + bbox);
// divide width into equal size segments
double slice = width / (values.size() - 1);
- System.out.println("slice = " + slice);
+ // System.out.println("slice = " + slice);
double divisor = getDivisor(values, height);
double min = Float.MAX_VALUE;
@@ -76,7 +76,7 @@
min = Math.min(min, i);
}
- System.out.println ("Divisor = " + divisor);
+ // System.out.println ("Divisor = " + divisor);
if (divisor == 0.0) {
// degenerate case -- a horizontal straight line
divisor = 1.0d;
Deleted: csplugins/trunk/ucsf/scooter/nodeCharts/test-stripe.txt
===================================================================
--- csplugins/trunk/ucsf/scooter/nodeCharts/test-stripe.txt 2010-09-07
03:17:00 UTC (rev 21714)
+++ csplugins/trunk/ucsf/scooter/nodeCharts/test-stripe.txt 2010-09-07
03:33:13 UTC (rev 21715)
@@ -1,8 +0,0 @@
-nodecharts clear nodelist="all"
-nodecharts stripe node="YCL067C" labellist="A,B,C,D" valuelist="1.0,2.0,0.5,5"
colorlist="#FF0000,#00FF00,#0000FF,#0000FF80"
-nodecharts stripe node="YKL101W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5"
-nodecharts stripe node="YHR084W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" colorlist="random"
-nodecharts stripe node="YDR461W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" colorlist="rainbow"
-nodecharts stripe node="YFL026W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" colorlist="modulated"
-nodecharts stripe node="YGL008C" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" colorlist="contrasting"
-nodecharts stripe node="YBR112C" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5"
Deleted: csplugins/trunk/ucsf/scooter/nodeCharts/test.com
===================================================================
--- csplugins/trunk/ucsf/scooter/nodeCharts/test.com 2010-09-07 03:17:00 UTC
(rev 21714)
+++ csplugins/trunk/ucsf/scooter/nodeCharts/test.com 2010-09-07 03:33:13 UTC
(rev 21715)
@@ -1,15 +0,0 @@
-nodecharts pie node="YCL067C" labellist="A,B,C,D" valuelist="1.0,2.0,0.5,5"
colorlist="#FF0000,#00FF00,#0000FF,#0000FF80"
-nodecharts pie node="YKL101W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5"
-nodecharts pie node="YHR084W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="north" colorlist="random"
-nodecharts pie node="YDR461W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="south" colorlist="rainbow"
-nodecharts pie node="YFL026W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="east" colorlist="modulated"
-nodecharts pie node="YGL008C" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="west" colorlist="contrasting"
-nodecharts pie node="YBR112C" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="northwest"
-nodecharts pie node="YCR084C" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="southwest"
-nodecharts pie node="YNL145W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="northeast"
-nodecharts pie node="YIL015W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="southeast"
-nodecharts pie node="YBL069W" labellist="A,B,C,D,E,F"
valuelist="3.0,2.0,0.5,5,1,1.5" position="10,10"
-
-nodecharts clear node="YCR084C"
-
-network view update
Deleted: csplugins/trunk/ucsf/scooter/nodeCharts/test2.com
===================================================================
--- csplugins/trunk/ucsf/scooter/nodeCharts/test2.com 2010-09-07 03:17:00 UTC
(rev 21714)
+++ csplugins/trunk/ucsf/scooter/nodeCharts/test2.com 2010-09-07 03:33:13 UTC
(rev 21715)
@@ -1,3 +0,0 @@
-nodecharts pie nodelist="all" attributelist="gal1RGsig,gal4RGsig,gal80Rsig"
colorlist="contrasting"
-
-network view update
--
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.
