Author: pwang
Date: 2010-10-07 13:39:21 -0700 (Thu, 07 Oct 2010)
New Revision: 22183

Modified:
   cytoscape/trunk/application/src/main/java/cytoscape/view/CyMenus.java
Log:
run force-directed layout as a task

Modified: cytoscape/trunk/application/src/main/java/cytoscape/view/CyMenus.java
===================================================================
--- cytoscape/trunk/application/src/main/java/cytoscape/view/CyMenus.java       
2010-10-07 20:34:13 UTC (rev 22182)
+++ cytoscape/trunk/application/src/main/java/cytoscape/view/CyMenus.java       
2010-10-07 20:39:21 UTC (rev 22183)
@@ -646,31 +646,9 @@
                forceDirectLayoutButton.setToolTipText("Apply force-directed 
layout");
                forceDirectLayoutButton.setBorderPainted(false);
                forceDirectLayoutButton.setRolloverEnabled(true);
-               forceDirectLayoutButton.addMouseListener(new MouseListener() {
-                               public void mouseClicked(MouseEvent e) {
-                                       //Perform force-directed layout
-                                       CyLayoutAlgorithm fd = 
CyLayouts.getLayout("force-directed");
-                                       fd.setSelectedOnly(false);
-                                       fd.getSettings().updateValues();
-                                       fd.updateSettings();                    
                
-                                       CyNetworkView view = 
Cytoscape.getCurrentNetworkView();
-                                       if (view != null){
-                                               view.applyLayout(fd);
-                                               view.redrawGraph(true, true);   
                                        
-                                       }
-                               }
+               
+               forceDirectLayoutButton.addMouseListener(new 
ApplyForcedDirectedLayoutMouseAdapter(forceDirectLayoutButton));
 
-                               public void mouseEntered(MouseEvent e) {}
-                               public void mouseExited(MouseEvent e) {}
-
-                               public void mousePressed(MouseEvent e) {
-                                       
forceDirectLayoutButton.setSelected(true);
-                               }
-
-                               public void mouseReleased(MouseEvent e) {
-                                       
forceDirectLayoutButton.setSelected(false);
-                               }
-                       });
                toolBar.add(forceDirectLayoutButton);
 
 

-- 
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.

Reply via email to