Changeset 2788


Ignore:
Timestamp:
7/31/2012 9:19:31 AM (2 years ago)
Author:
lowjoel
Message:

Fix the progress bar display in the report upload progress dialog. The dialog was displaying all sorts of incoherent information!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/eraser/Eraser.BlackBox/BlackBoxUploadForm.cs

    r2715 r2788  
    9292                S._("Compressing Report {0}: {1:#0.00%}", report.Name, 0)); 
    9393 
     94            reportProgress.Total = int.MaxValue; 
    9495            BlackBoxReportUploader uploader = new BlackBoxReportUploader(report); 
    9596            uploader.Submit(delegate(object from, EraserProgressChangedEventArgs e2) 
    9697                { 
    97                     reportProgress.Completed = (int)(e2.Progress.Progress * reportProgress.Total); 
    9898                    SteppedProgressManager reportSteps = (SteppedProgressManager)e2.Progress; 
     99                    reportProgress.Completed = (int)(reportSteps.Progress * reportProgress.Total); 
    99100                    int step = reportSteps.Steps.IndexOf(reportSteps.CurrentStep); 
    100101 
    101                     UploadWorker.ReportProgress((int)overallProgress.Progress, 
     102                    UploadWorker.ReportProgress((int)(overallProgress.Progress * 100), 
    102103                        step == 0 ? 
    103104                            S._("Compressing Report {0}: {1:#0.00%}", 
    104                                 report.Name, reportSteps.Progress) : 
     105                                report.Name, reportSteps.CurrentStep.Progress.Progress) : 
    105106                            S._("Uploading Report {0}: {1:#0.00%}", 
    106                                 report.Name, reportSteps.Progress)); 
     107                                report.Name, reportSteps.CurrentStep.Progress.Progress)); 
    107108 
    108109                    if (UploadWorker.CancellationPending) 
Note: See TracChangeset for help on using the changeset viewer.