Author: kono
Date: 2012-07-17 19:25:51 -0700 (Tue, 17 Jul 2012)
New Revision: 29918
Modified:
core3/impl/trunk/network-analyzer-impl/src/main/java/de/mpg/mpi_inf/bioinf/netanalyzer/task/AnalyzeNetworkTask.java
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/CreateNewNetworkPanel.java
Log:
refs #1275 Parameter for task had been fixed and now all statistics will be
calculated.
Modified:
core3/impl/trunk/network-analyzer-impl/src/main/java/de/mpg/mpi_inf/bioinf/netanalyzer/task/AnalyzeNetworkTask.java
===================================================================
---
core3/impl/trunk/network-analyzer-impl/src/main/java/de/mpg/mpi_inf/bioinf/netanalyzer/task/AnalyzeNetworkTask.java
2012-07-18 02:10:47 UTC (rev 29917)
+++
core3/impl/trunk/network-analyzer-impl/src/main/java/de/mpg/mpi_inf/bioinf/netanalyzer/task/AnalyzeNetworkTask.java
2012-07-18 02:25:51 UTC (rev 29918)
@@ -54,7 +54,7 @@
selectedNodes.add(network.getNode(row.get(CyIdentifiable.SUID, Long.class)));
} else {
- selectedNodes = new
HashSet<CyNode>(network.getNodeList());
+ selectedNodes = null;
}
analyze(network, selectedNodes);
processed = processed+increment;
Modified:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/CreateNewNetworkPanel.java
===================================================================
---
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/CreateNewNetworkPanel.java
2012-07-18 02:10:47 UTC (rev 29917)
+++
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/CreateNewNetworkPanel.java
2012-07-18 02:25:51 UTC (rev 29918)
@@ -82,6 +82,9 @@
private final AnalyzeNetworkCollectionTaskFactory
analyzeNetworkCollectionTaskFactory;
private final VisualStyleBuilder vsBuilder;
private final VisualMappingManager vmm;
+
+ private Set<CyNetwork> networkToBeAnalyzed;
+ private Set<CyNetworkView> networkViews;
CreateNewNetworkPanel(Window parent, final BundleContext bc, final
DialogTaskManager guiTaskManager,
final TaskFactory importNetworkFileTF, final
LoadNetworkURLTaskFactory loadTF,
@@ -118,6 +121,9 @@
});
networkList.setEnabled(true);
+
+ networkToBeAnalyzed = new HashSet<CyNetwork>();
+ networkViews = new HashSet<CyNetworkView>();
}
private void setFromDataSource() {
@@ -216,16 +222,13 @@
if (layout.isSelected()) {
props.getProperties().setProperty(CyLayoutAlgorithmManager.DEFAULT_LAYOUT_PROPERTY_NAME,
LAYOUT_ALGORITHM);
- networkToBeAnalyzed = new HashSet<CyNetwork>();
- networkViews = new HashSet<CyNetworkView>();
loadTaskIt.append(analyzeNetworkCollectionTaskFactory.createTaskIterator(networkToBeAnalyzed));
loadTaskIt.append(new
AnalyzeAndVisualizeNetworkTask(networkViews, vsBuilder, vmm));
}
guiTaskManager.execute(loadTaskIt);
}
- private Set<CyNetwork> networkToBeAnalyzed;
- private Set<CyNetworkView> networkViews;
+
/**
* Due to its dependency, we need to import this service dynamically.
--
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.
