Author: thully
Date: 2012-10-19 13:02:40 -0700 (Fri, 19 Oct 2012)
New Revision: 30686
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/SwingTaskMonitor.java
Log:
Reset progress bar after each task if running more tasks than expectedNumTasks
(#1519)
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/SwingTaskMonitor.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/SwingTaskMonitor.java
2012-10-19 20:00:27 UTC (rev 30685)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/SwingTaskMonitor.java
2012-10-19 20:02:40 UTC (rev 30686)
@@ -181,9 +181,13 @@
if (dialog != null)
dialog.setPercentCompleted(-1);
} else {
- double completed =
(double)currentTaskNum/(double)expectedNumTasks;
- double adjustedProgress = (progress *
fractionOfOverall) + completed;
- this.progress = (int) Math.floor(100.0 *
adjustedProgress);
+ double adjustedProgress;
+ if(currentTaskNum < expectedNumTasks)
+ adjustedProgress = (progress *
fractionOfOverall) +
+
((double)currentTaskNum/(double)expectedNumTasks);
+ else
+ adjustedProgress = progress;
+ this.progress = (int) Math.floor(100.0 *
adjustedProgress);
if (dialog != null)
dialog.setPercentCompleted(this.progress);
}
--
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.
