Author: apico
Date: 2009-03-12 15:44:21 -0700 (Thu, 12 Mar 2009)
New Revision: 16252
Modified:
csplugins/trunk/ucsf/apico/CellularLayout/src/org/genmapp/golayout/GOLayout.java
csplugins/trunk/ucsf/apico/CellularLayout/src/org/genmapp/golayout/PartitionAlgorithm.java
Log:
Modified:
csplugins/trunk/ucsf/apico/CellularLayout/src/org/genmapp/golayout/GOLayout.java
===================================================================
---
csplugins/trunk/ucsf/apico/CellularLayout/src/org/genmapp/golayout/GOLayout.java
2009-03-12 22:32:22 UTC (rev 16251)
+++
csplugins/trunk/ucsf/apico/CellularLayout/src/org/genmapp/golayout/GOLayout.java
2009-03-12 22:44:21 UTC (rev 16252)
@@ -4,6 +4,7 @@
import javax.swing.JPanel;
+import cytoscape.Cytoscape;
import cytoscape.layout.AbstractLayout;
import cytoscape.layout.CyLayoutAlgorithm;
import cytoscape.layout.CyLayouts;
@@ -12,13 +13,16 @@
import cytoscape.plugin.CytoscapePlugin;
public class GOLayout extends CytoscapePlugin {
+
+ PartitionAlgorithm pa = new PartitionAlgorithm();
+
/**
* The constructor registers our layout algorithm. The CyLayouts
mechanism
* will worry about how to get it in the right menu, etc.
*/
public GOLayout() {
CyLayouts.addLayout(new GOLayoutAlgorithm(), "GO Layout: Run
All");
- CyLayouts.addLayout(new PartitionAlgorithm(), "GO Layout:
Partition");
+ CyLayouts.addLayout(pa, "GO Layout: Partition");
CyLayouts.addLayout(new CellAlgorithm(), "GO Layout: Cell
Layout");
}
@@ -140,8 +144,9 @@
* The layout protocol...
*/
public void construct() {
+ pa.setLayoutName("cell-layout");
CyLayoutAlgorithm layout =
CyLayouts.getLayout("partition");
- layout.doLayout(new_view);
+ layout.doLayout(Cytoscape.getCurrentNetworkView());
}
}
}
Modified:
csplugins/trunk/ucsf/apico/CellularLayout/src/org/genmapp/golayout/PartitionAlgorithm.java
===================================================================
---
csplugins/trunk/ucsf/apico/CellularLayout/src/org/genmapp/golayout/PartitionAlgorithm.java
2009-03-12 22:32:22 UTC (rev 16251)
+++
csplugins/trunk/ucsf/apico/CellularLayout/src/org/genmapp/golayout/PartitionAlgorithm.java
2009-03-12 22:44:21 UTC (rev 16252)
@@ -87,6 +87,9 @@
Tunable t = layoutProperties.get("nodeSpacing");
if ((t != null) && (t.valueChanged() || force))
distanceBetweenNodes = ((Double)
t.getValue()).doubleValue();
+ Tunable t2 = layoutProperties.get("layoutName");
+ if ((t2 != null) && (t2.valueChanged() || force))
+ this.layoutName = t2.getValue().toString();
}
/**
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
