Author: ghuck
Date: 2010-08-02 12:38:37 -0700 (Mon, 02 Aug 2010)
New Revision: 21119
Modified:
coreplugins/branches/labelLayout/AutomaticLayout/src/csplugins/layout/LayoutLabelPartition.java
coreplugins/branches/labelLayout/AutomaticLayout/src/csplugins/layout/algorithms/graphPartition/AbstractGraphPartition.java
Log:
Modified:
coreplugins/branches/labelLayout/AutomaticLayout/src/csplugins/layout/LayoutLabelPartition.java
===================================================================
---
coreplugins/branches/labelLayout/AutomaticLayout/src/csplugins/layout/LayoutLabelPartition.java
2010-08-02 17:03:15 UTC (rev 21118)
+++
coreplugins/branches/labelLayout/AutomaticLayout/src/csplugins/layout/LayoutLabelPartition.java
2010-08-02 19:38:37 UTC (rev 21119)
@@ -65,7 +65,6 @@
/**
* The LayoutLabelPartition class ....
*
- * @author <a href="mailto:gerardohuck .at. gmail .dot. com">Gerardo Huck</a>
* @version 0.1
*/
public class LayoutLabelPartition extends LayoutPartition {
Modified:
coreplugins/branches/labelLayout/AutomaticLayout/src/csplugins/layout/algorithms/graphPartition/AbstractGraphPartition.java
===================================================================
---
coreplugins/branches/labelLayout/AutomaticLayout/src/csplugins/layout/algorithms/graphPartition/AbstractGraphPartition.java
2010-08-02 17:03:15 UTC (rev 21118)
+++
coreplugins/branches/labelLayout/AutomaticLayout/src/csplugins/layout/algorithms/graphPartition/AbstractGraphPartition.java
2010-08-02 19:38:37 UTC (rev 21119)
@@ -173,13 +173,16 @@
// we use different initialization. Note that if the user only wants
// to lay out selected nodes, partitioning becomes a very bad idea!
if (selectedOnly || singlePartition) {
+
// We still use the partition abstraction, even if we're
// not partitioning. This makes the code further down
// much cleaner
LayoutPartition partition = new LayoutPartition(network,
networkView, selectedOnly, edgeWeighter);
partitionList = new ArrayList(1);
partitionList.add(partition);
+
} else if (staticNodes != null && staticNodes.size() > 0) {
+
// Someone has programmatically locked a set of nodes -- construct
// the list of unlocked nodes
List<CyNode> unlockedNodes = new ArrayList();
@@ -191,6 +194,7 @@
LayoutPartition partition = new LayoutPartition(network,
networkView, unlockedNodes, edgeWeighter);
partitionList = new ArrayList(1);
partitionList.add(partition);
+
} else {
partitionList = LayoutPartition.partition(network, networkView,
false, edgeWeighter);
}
@@ -226,7 +230,7 @@
setTaskStatus(1);
// Partitions Requiring Layout
- if (partition.nodeCount() > 1) { // TODO: add case when nodeCount =
1
+ if (partition.nodeCount() >= 1) { // LABEL
try {
layoutSinglePartition(partition);
} catch (OutOfMemoryError _e) {
@@ -245,7 +249,7 @@
}
// single nodes
- } else if ( partition.nodeCount() == 1 ) {
+ } else if ( partition.nodeCount() == 1 ) { // TODO: do something
with this
// Reset our bounds
partition.resetNodes();
@@ -281,7 +285,7 @@
/**
- *
+ * DOCUMENT ME!
*/
protected void layoutSinglePartition(LayoutPartition partition){
--
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.
