Author: pwang
Date: 2010-09-21 16:44:22 -0700 (Tue, 21 Sep 2010)
New Revision: 21967
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenu.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/StaticLayoutMenu.java
Log:
Add menuItem for each algorithm
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenu.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenu.java
2010-09-21 22:20:20 UTC (rev 21966)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenu.java
2010-09-21 23:44:22 UTC (rev 21967)
@@ -98,6 +98,7 @@
subMenuList.remove(layout);
}
+
/**
* DOCUMENT ME!
*
@@ -140,11 +141,10 @@
boolean enableMenuItem = checkEnabled();
- /*
// Now, add each layout, as appropriate
for (CyLayoutAlgorithm layout:
menuMgr.getLayoutsInMenu(getText())) {
// Make sure we don't have any lingering locked nodes
- layout.unlockAllNodes();
+ //layout.unlockAllNodes();
if ((layout.supportsNodeAttributes().size() > 0)
|| (layout.supportsEdgeAttributes().size() > 0)) {
@@ -155,7 +155,6 @@
super.add(new
StaticLayoutMenu(layout,enableMenuItem,netmgr,tm));
}
}
- */
}
private boolean checkEnabled() {
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/StaticLayoutMenu.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/StaticLayoutMenu.java
2010-09-21 22:20:20 UTC (rev 21966)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/StaticLayoutMenu.java
2010-09-21 23:44:22 UTC (rev 21967)
@@ -73,6 +73,6 @@
public void actionPerformed(ActionEvent e) {
layout.setSelectedOnly(false);
final Task layoutTask = new LayoutTask(layout,
netmgr.getCurrentNetworkView());
- tm.execute(new TaskIterator(layoutTask));
+ tm.execute(layout.getTaskIterator());
}
}
--
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.
