Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/03/13 15:55:36 (11 years ago)
Author:
ascheibe
Message:

#1042 merged r9849, r9851, r9865, r9867, r9868, r9893, r9894, r9895, r9896, r9900, r9901, r9905, r9907 into stable branch

Location:
stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Optimizer/3.3/StartPage.cs

    r9456 r9933  
    3434  [View("Start Page")]
    3535  public partial class StartPage : HeuristicLab.MainForm.WindowsForms.View {
     36    private IProgress progress;
     37
    3638    public StartPage() {
    3739      InitializeComponent();
     
    6769
    6870    private void LoadSamples(object state) {
     71      progress = MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(samplesListView, "Loading...");
    6972      Assembly assembly = Assembly.GetExecutingAssembly();
    7073      var samples = assembly.GetManifestResourceNames().Where(x => x.EndsWith(".hl"));
     
    7780            WriteStreamToTempFile(stream, path);
    7881            INamedItem item = XmlParser.Deserialize<INamedItem>(path);
    79             OnSampleLoaded(item, loadingProgressBar.Maximum / count);
     82            OnSampleLoaded(item, 1.0 / count);
    8083          }
    8184        }
    82         catch (Exception) { }
     85        catch (Exception) {
     86          MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(samplesListView);
     87        }
    8388      }
    8489      OnAllSamplesLoaded();
    8590    }
    86     private void OnSampleLoaded(INamedItem sample, int progress) {
     91    private void OnSampleLoaded(INamedItem sample, double progress) {
    8792      if (InvokeRequired)
    88         Invoke(new Action<INamedItem, int>(OnSampleLoaded), sample, progress);
     93        Invoke(new Action<INamedItem, double>(OnSampleLoaded), sample, progress);
    8994      else {
    9095        ListViewItem item = new ListViewItem(new string[] { sample.Name, sample.Description });
     
    9499        item.Tag = sample;
    95100        samplesListView.Items.Add(item);
    96         loadingProgressBar.Value += progress;
     101        this.progress.ProgressValue += progress;
    97102      }
    98103    }
     
    106111            samplesListView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
    107112        }
    108         loadingPanel.Visible = false;
     113        MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(samplesListView);
    109114      }
    110115    }
Note: See TracChangeset for help on using the changeset viewer.