Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/04/17 13:55:43 (7 years ago)
Author:
pfleck
Message:

#1666:

  • Reverted r15371 for HeuristicLab.MainForm and HeuristicLab.MainForm.WindowsForms (all changes concerning the progress)
  • Changed the signature of OptimizeConstants in the simplifiers to "tree in - tree out" (thanks to bburlacu)
Location:
trunk/sources/HeuristicLab.MainForm.WindowsForms
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.MainForm.WindowsForms

    • Property svn:mergeinfo deleted
  • trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

    r15371 r15400  
    154154        if (content != null) {
    155155          double progressValue = content.ProgressValue;
    156           if (progressValue < 0.0 || progressValue > 1.0) {
     156          if (progressValue <= 0.0 || progressValue > 1.0) {
    157157            progressBar.Style = ProgressBarStyle.Marquee;
    158158          } else {
  • trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

    r15371 r15400  
    230230    }
    231231
    232     public IContentView ShowContent<T>(T content, bool reuseExistingView, IEqualityComparer<T> comparer = null) where T : class, IContent {
     232    public IContentView ShowContent<T>(T content, bool reuseExistingView, IEqualityComparer<T> comparer = null) where T : class,IContent {
    233233      if (content == null) throw new ArgumentNullException("Content cannot be null.");
    234234      if (!reuseExistingView) return ShowContent(content);
     
    353353    /// Adds a <see cref="ProgressView"/> to the <see cref="ContentView"/>s showing the specified content.
    354354    /// </summary>
    355     public IProgress AddOperationProgressToContent(IContent content, string progressMessage, double progressValue = -1, bool addToObjectGraphObjects = true) {
     355    public IProgress AddOperationProgressToContent(IContent content, string progressMessage, bool addToObjectGraphObjects = true) {
    356356      if (InvokeRequired) {
    357         IProgress result = (IProgress)Invoke((Func<IContent, string, double, bool, IProgress>)AddOperationProgressToContent, content, progressMessage, progressValue, addToObjectGraphObjects);
     357        IProgress result = (IProgress)Invoke((Func<IContent, string, bool, IProgress>)AddOperationProgressToContent, content, progressMessage, addToObjectGraphObjects);
    358358        return result;
    359359      }
     
    371371        contentViews = contentViews.Where(v => v.Content == content);
    372372
    373       var progress = new Progress();
    374       progress.Start(progressMessage, progressValue);
     373      var progress = new Progress(progressMessage, ProgressState.Started);
    375374      foreach (var contentView in contentViews) {
    376375        progressViews.Add(new ProgressView(contentView, progress));
     
    385384    /// </summary>
    386385    public IProgress AddOperationProgressToView(Control control, string progressMessage) {
    387       var progress = new Progress();
    388       progress.Start(progressMessage);
     386      var progress = new Progress(progressMessage, ProgressState.Started);
    389387      AddOperationProgressToView(control, progress);
    390388      return progress;
Note: See TracChangeset for help on using the changeset viewer.