Author: scooter
Date: 2012-12-17 17:03:01 -0800 (Mon, 17 Dec 2012)
New Revision: 31015
Modified:
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/AbstractCompoundTask.java
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/CreateCompoundsTask.java
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/CreateNodeGraphicsTask.java
Log:
Don't try to provide progress meter if we're multithreaded
Modified:
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/AbstractCompoundTask.java
===================================================================
---
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/AbstractCompoundTask.java
2012-12-18 01:01:59 UTC (rev 31014)
+++
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/AbstractCompoundTask.java
2012-12-18 01:03:01 UTC (rev 31015)
@@ -127,7 +127,8 @@
List<Compound> cList = new ArrayList<Compound>();
for (GraphObject go: goSet) {
if (done()) break;
- updateMonitor();
+ if (maxThreads == 1)
+ updateMonitor();
cList.addAll(getCompounds(go, attributes, sList, iList,
threadList));
}
Modified:
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/CreateCompoundsTask.java
===================================================================
---
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/CreateCompoundsTask.java
2012-12-18 01:01:59 UTC (rev 31014)
+++
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/CreateCompoundsTask.java
2012-12-18 01:03:01 UTC (rev 31015)
@@ -91,7 +91,8 @@
public void run() {
compoundList = getCompounds(objectList, attributes,
dialog.getCompoundAttributes(type,AttriType.smiles),
-
dialog.getCompoundAttributes(type,AttriType.inchi), dialog.getMaxThreads());
+
dialog.getCompoundAttributes(type,AttriType.inchi),
+ dialog.getMaxThreads());
}
public List<Compound>getCompoundList() { return compoundList; }
Modified:
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/CreateNodeGraphicsTask.java
===================================================================
---
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/CreateNodeGraphicsTask.java
2012-12-18 01:01:59 UTC (rev 31014)
+++
csplugins/trunk/ucsf/scooter/chemViz/src/chemViz/tasks/CreateNodeGraphicsTask.java
2012-12-18 01:03:01 UTC (rev 31015)
@@ -196,8 +196,8 @@
public void run() {
CyAttributes networkAttributes =
Cytoscape.getNetworkAttributes();
CyAttributes nodeAttributes = Cytoscape.getNodeAttributes();
- if (monitor != null)
- monitor.setPercentCompleted(0);
+ // if (monitor != null)
+ // monitor.setPercentCompleted(0);
if (removeCustomGraphics) {
ArrayList<NodeView> removeList = new
ArrayList<NodeView>(graphMap.keySet());
--
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.
