Author: scooter
Date: 2010-12-20 17:54:53 -0800 (Mon, 20 Dec 2010)
New Revision: 23254
Modified:
csplugins/trunk/ucsf/scooter/nodeCharts/examples/pie.com
csplugins/trunk/ucsf/scooter/nodeCharts/pom.xml
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/command/NodeChartCommandHandler.java
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/view/PieChart.java
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/resources/nodeCharts/plugin.props
Log:
Released
Modified: csplugins/trunk/ucsf/scooter/nodeCharts/examples/pie.com
===================================================================
--- csplugins/trunk/ucsf/scooter/nodeCharts/examples/pie.com 2010-12-21
00:50:53 UTC (rev 23253)
+++ csplugins/trunk/ucsf/scooter/nodeCharts/examples/pie.com 2010-12-21
01:54:53 UTC (rev 23254)
@@ -9,6 +9,8 @@
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 pie node="YNL189W" labellist="A,B" valuelist="2.0,2.0"
arcstart="-90.0"
+nodecharts pie node="YNL189W" labellist="A,B" valuelist="2.0,2.0"
arcstart="beginning"
nodecharts clear node="YCR084C"
Modified: csplugins/trunk/ucsf/scooter/nodeCharts/pom.xml
===================================================================
--- csplugins/trunk/ucsf/scooter/nodeCharts/pom.xml 2010-12-21 00:50:53 UTC
(rev 23253)
+++ csplugins/trunk/ucsf/scooter/nodeCharts/pom.xml 2010-12-21 01:54:53 UTC
(rev 23254)
@@ -14,7 +14,7 @@
<groupId>cytoscape.csplugins</groupId>
<artifactId>nodeCharts</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>0.91</version>
<name>Node Charts Plugin</name>
@@ -86,7 +86,7 @@
<dependency>
<groupId>cytoscape</groupId>
<artifactId>application</artifactId>
- <version>2.8.0-SNAPSHOT</version>
+ <version>2.8.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
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-12-21 00:50:53 UTC (rev 23253)
+++
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/command/NodeChartCommandHandler.java
2010-12-21 01:54:53 UTC (rev 23254)
@@ -216,10 +216,13 @@
private void register(NodeChartViewer viewer) {
addDescription(viewer.getName(), viewer.getDescription());
// Add our global commands
+ addArgument(viewer.getName(), ATTRIBUTELIST);
+ addArgument(viewer.getName(), LABELS);
addArgument(viewer.getName(), NETWORK, CURRENT);
addArgument(viewer.getName(), NODE);
addArgument(viewer.getName(), NODELIST);
addArgument(viewer.getName(), POSITION);
+ addArgument(viewer.getName(), VALUES);
// Get the specific commands handled by the viewer
Map<String,String> args = viewer.getOptions();
Modified:
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/view/PieChart.java
===================================================================
---
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/view/PieChart.java
2010-12-21 00:50:53 UTC (rev 23253)
+++
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/java/nodeCharts/view/PieChart.java
2010-12-21 01:54:53 UTC (rev 23254)
@@ -71,6 +71,7 @@
private static final String LABELSTYLE = "labelstyle";
private static final String LABELSIZE = "labelsize";
private static final String LABELOFFSET = "labeloffset";
+ private static final String ARCSTART = "arcstart";
public String getName() {
return "pie";
@@ -83,6 +84,7 @@
public Map<String,String> getOptions() {
Map<String,String> options = new HashMap<String,String>();
options.put(COLORS,"");
+ options.put(ARCSTART,"0.0");
return options;
}
@@ -92,6 +94,23 @@
// Get our colors
List<Color> colors =
ValueUtils.convertInputToColor(args.get(COLORS), values);
+ // Get our angular offset
+ double arcStart = 0.0;
+ Object startObj = args.get(ARCSTART);
+ if (startObj != null) {
+ if (startObj instanceof Double)
+ arcStart = ((Double)startObj).doubleValue();
+ else if (startObj instanceof Integer)
+ arcStart = ((Integer)startObj).doubleValue();
+ else if (startObj instanceof String) {
+ try {
+ arcStart =
Double.parseDouble((String)startObj);
+ } catch (NumberFormatException e) {
+ throw new CyCommandException("arcstart
must be a number: "+e.getMessage());
+ }
+ }
+ }
+
// Convert our data from values to increments
values= convertData(values);
@@ -102,7 +121,6 @@
values.size()+"), and
colors ("+colors.size()+") don't match");
int nSlices = labels.size();
- double arcStart = 0.0;
List<CustomGraphic> cgList = new ArrayList<CustomGraphic>();
List<CustomGraphic> labelList = new ArrayList<CustomGraphic>();
Modified:
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/resources/nodeCharts/plugin.props
===================================================================
---
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/resources/nodeCharts/plugin.props
2010-12-21 00:50:53 UTC (rev 23253)
+++
csplugins/trunk/ucsf/scooter/nodeCharts/src/main/resources/nodeCharts/plugin.props
2010-12-21 01:54:53 UTC (rev 23254)
@@ -11,7 +11,7 @@
pluginDescription=Paint a chart on a node
# Plugin version number, this must be two numbers separated by a decimlal.
Ex. 0.2, 14.03
-pluginVersion=0.9
+pluginVersion=0.91
# Compatible Cytoscape version
cytoscapeVersion=2.8
--
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.
