Author: jm
Date: 2012-04-11 09:56:40 -0700 (Wed, 11 Apr 2012)
New Revision: 28793
Modified:
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutFRAlgorithm.java
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutKKAlgorithm.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableHandlerImpl.java
Log:
Fixes #588: Enabled edge attribute support for edge-weighted layout algorithms.
Fixed a bug with dynamic submenus where the layout name gets replaced by an
attribute name if only one node/edge attribute is available for selection.
Modified:
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutFRAlgorithm.java
===================================================================
---
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutFRAlgorithm.java
2012-04-11 01:55:50 UTC (rev 28792)
+++
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutFRAlgorithm.java
2012-04-11 16:56:40 UTC (rev 28793)
@@ -31,6 +31,9 @@
package csapps.layout.algorithms.bioLayout;
+import java.util.HashSet;
+import java.util.Set;
+
import org.cytoscape.view.layout.AbstractLayoutAlgorithm;
import org.cytoscape.work.TaskIterator;
@@ -64,6 +67,18 @@
}
+ @Override
+ public Set<Class<?>> supportsEdgeAttributes() {
+ Set<Class<?>> ret = new HashSet<Class<?>>();
+ if (!supportWeights)
+ return ret;
+
+ ret.add( Integer.class );
+ ret.add( Double.class );
+
+ return ret;
+ }
+
public TaskIterator createTaskIterator(BioLayoutFRContext context) {
return new TaskIterator(
new BioLayoutFRAlgorithmTask(getName(), context,
supportWeights));
Modified:
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutKKAlgorithm.java
===================================================================
---
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutKKAlgorithm.java
2012-04-11 01:55:50 UTC (rev 28792)
+++
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutKKAlgorithm.java
2012-04-11 16:56:40 UTC (rev 28793)
@@ -31,6 +31,9 @@
*/
package csapps.layout.algorithms.bioLayout;
+import java.util.HashSet;
+import java.util.Set;
+
import org.cytoscape.view.layout.AbstractLayoutAlgorithm;
import org.cytoscape.work.TaskIterator;
@@ -63,7 +66,19 @@
true);
supportWeights = supportEdgeWeights;
}
+
+ @Override
+ public Set<Class<?>> supportsEdgeAttributes() {
+ Set<Class<?>> ret = new HashSet<Class<?>>();
+ if (!supportWeights)
+ return ret;
+ ret.add( Integer.class );
+ ret.add( Double.class );
+
+ return ret;
+ }
+
public TaskIterator createTaskIterator(BioLayoutKKContext context) {
return new TaskIterator(
new BioLayoutKKAlgorithmTask(getName(), context,
supportWeights));
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableHandlerImpl.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableHandlerImpl.java
2012-04-11 01:55:50 UTC (rev 28792)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableHandlerImpl.java
2012-04-11 16:56:40 UTC (rev 28793)
@@ -50,9 +50,6 @@
if ( menuTitles.size() <= 0 ) {
menuItem = new SubmenuItem(null,this,dtm,tf);
- } else if ( menuTitles.size() == 1 ) {
- // assume the lone entry in the list is the title
- menuItem = new
SubmenuItem(menuTitles.get(0),this,dtm,tf);
} else {
menuItem = new JMenu((String) null);
for ( String title : menuTitles )
--
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.
