Author: ghuck
Date: 2010-06-29 07:54:16 -0700 (Tue, 29 Jun 2010)
New Revision: 20716

Modified:
   
csplugins/trunk/soc/ghuck/LabelPositioningPlugin/plugin/src/cytoscape/label/layout/LabelBioLayoutFRAlgorithm.java
   
csplugins/trunk/soc/ghuck/LabelPositioningPlugin/plugin/src/cytoscape/label/layout/ModifiedBioLayoutFRAlgorithm.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-29 01:35:15 UTC (rev 20715)
+++ 
csplugins/trunk/soc/ghuck/LabelPositioningPlugin/plugin/src/cytoscape/label/layout/LabelBioLayoutFRAlgorithm.java
   2010-06-29 14:54:16 UTC (rev 20716)
@@ -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(100 * Math.random(), 100 * 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/ModifiedBioLayoutFRAlgorithm.java
===================================================================
--- 
csplugins/trunk/soc/ghuck/LabelPositioningPlugin/plugin/src/cytoscape/label/layout/ModifiedBioLayoutFRAlgorithm.java
        2010-06-29 01:35:15 UTC (rev 20715)
+++ 
csplugins/trunk/soc/ghuck/LabelPositioningPlugin/plugin/src/cytoscape/label/layout/ModifiedBioLayoutFRAlgorithm.java
        2010-06-29 14:54:16 UTC (rev 20716)
@@ -171,32 +171,32 @@
      * Required methods (and overrides) for AbstractLayout
      */
 
-    /**
-     * Return the "name" of this algorithm.  This is meant
-     * to be used by programs for deciding which algorithm to
-     * use.  toString() should be used for the human-readable
-     * name.
-     *
-     * @return the algorithm name
-     */
+//     /**
+//      * Return the "name" of this algorithm.  This is meant
+//      * to be used by programs for deciding which algorithm to
+//      * use.  toString() should be used for the human-readable
+//      * name.
+//      *
+//      * @return the algorithm name
+//      */
 //     public String getName() {
 //     return "LabelModified-Fruchterman-Rheingold";
 //     }
 
-    /**
-     * Return the "title" of this algorithm.  This is meant
-     * to be used for titles and labels that represent this
-     * algorithm.
-     *
-     * @return the human-readable algorithm name
-     */
-    public String toString() {
-       if (supportWeights)
-           return "(Label Modified) Edge-Weighted Force-Directed (BioLayout)";
-       else
+//     /**
+//      * Return the "title" of this algorithm.  This is meant
+//      * to be used for titles and labels that represent this
+//      * algorithm.
+//      *
+//      * @return the human-readable algorithm name
+//      */
+//     public String toString() {
+//     if (supportWeights)
+//         return "(Label Modified) Edge-Weighted Force-Directed (BioLayout)";
+//     else
 
-           return "(Label Modified) Force-Directed (BioLayout)";
-    }
+//         return "(Label Modified) Force-Directed (BioLayout)";
+//     }
 
     /**
      * Sets the number of iterations

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