Author: ghuck
Date: 2010-06-28 11:44:26 -0700 (Mon, 28 Jun 2010)
New Revision: 20685

Modified:
   
csplugins/trunk/soc/ghuck/LabelPositioningPlugin/plugin/src/cytoscape/label/layout/LabelBioLayoutFRAlgorithm.java
   
csplugins/trunk/soc/ghuck/LabelPositioningPlugin/plugin/src/cytoscape/label/layout/LabelForceDirectedLayout.java
Log:


Modified: 
csplugins/trunk/soc/ghuck/LabelPositioningPlugin/plugin/src/cytoscape/label/layout/LabelBioLayoutFRAlgorithm.java
===================================================================
--- 
csplugins/trunk/soc/ghuck/LabelPositioningPlugin/plugin/src/cytoscape/label/layout/LabelBioLayoutFRAlgorithm.java
   2010-06-28 18:44:10 UTC (rev 20684)
+++ 
csplugins/trunk/soc/ghuck/LabelPositioningPlugin/plugin/src/cytoscape/label/layout/LabelBioLayoutFRAlgorithm.java
   2010-06-28 18:44:26 UTC (rev 20685)
@@ -182,15 +182,15 @@
        }
 
        // Layout the new partition using the parent class layout algorithm
-       // super.layoutPartition(newPartition);
+       super.layoutPartition(newPartition);
 
        // Move labels to a random position near their parents
-       for(LayoutLabelNodeImpl node: newPartition.getLabelNodes() ) {
-           logger.info("moving label of node " + node.getIdentifier());
-           node.increment(10 * Math.random(), 10 * Math.random());
-           node.moveToLocation();    
-           logger.info("label moved!");            
-       }
+//     for(LayoutLabelNodeImpl node: newPartition.getLabelNodes() ) {
+//         logger.info("moving label of node " + node.getIdentifier());
+//         node.increment(100 * Math.random(), 100 * Math.random());
+//         node.moveToLocation();    
+//         logger.info("label moved!");            
+//     }
 
        // redraw the network so that the new label positions are visible
        networkView.updateView();

Modified: 
csplugins/trunk/soc/ghuck/LabelPositioningPlugin/plugin/src/cytoscape/label/layout/LabelForceDirectedLayout.java
===================================================================
--- 
csplugins/trunk/soc/ghuck/LabelPositioningPlugin/plugin/src/cytoscape/label/layout/LabelForceDirectedLayout.java
    2010-06-28 18:44:10 UTC (rev 20684)
+++ 
csplugins/trunk/soc/ghuck/LabelPositioningPlugin/plugin/src/cytoscape/label/layout/LabelForceDirectedLayout.java
    2010-06-28 18:44:26 UTC (rev 20685)
@@ -44,6 +44,7 @@
 import giny.view.NodeView;
 import giny.view.*;
 
+
 import prefuse.util.force.*;
 
 import java.awt.Dimension;

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