Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/18/14 12:35:00 (10 years ago)
Author:
ascheibe
Message:

reverted last commit

Location:
branches/HiveStatistics/sources
Files:
4 deleted
58 edited
4 copied

Legend:

Unmodified
Added
Removed

  • branches/HiveStatistics/sources

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/AlgorithmView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/BatchRunView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/BatchRunView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ExperimentListView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ExperimentListView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ExperimentView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ExperimentView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r11202 r11203  
    239239      <DependentUpon>RunCollectionEqualityConstraintView.cs</DependentUpon>
    240240    </Compile>
    241     <Compile Include="RunCollectionViews\RunCollectionTableView.cs">
    242       <SubType>UserControl</SubType>
    243     </Compile>
    244     <Compile Include="RunCollectionViews\RunCollectionTableView.Designer.cs">
    245       <DependentUpon>RunCollectionTableView.cs</DependentUpon>
     241    <Compile Include="RunCollectionViews\RunCollectionTabularView.cs">
     242      <SubType>UserControl</SubType>
     243    </Compile>
     244    <Compile Include="RunCollectionViews\RunCollectionTabularView.Designer.cs">
     245      <DependentUpon>RunCollectionTabularView.cs</DependentUpon>
    246246    </Compile>
    247247    <Compile Include="RunCollectionViews\RunCollectionView.cs">
    … …  
    257257      <DependentUpon>RunView.cs</DependentUpon>
    258258    </Compile>
    259     <Compile Include="RunCollectionViews\RunCollectionChartAggregationView.cs">
    260       <SubType>UserControl</SubType>
    261     </Compile>
    262     <Compile Include="RunCollectionViews\RunCollectionChartAggregationView.Designer.cs">
    263       <DependentUpon>RunCollectionChartAggregationView.cs</DependentUpon>
     259    <Compile Include="RunCollectionViews\RunCollectionDataTableView.cs">
     260      <SubType>UserControl</SubType>
     261    </Compile>
     262    <Compile Include="RunCollectionViews\RunCollectionDataTableView.Designer.cs">
     263      <DependentUpon>RunCollectionDataTableView.cs</DependentUpon>
    264264    </Compile>
    265265    <Compile Include="UserDefinedAlgorithmView.cs">

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/IOptimizerView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/IOptimizerView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ISimilarityCalculatorView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ISimilarityCalculatorView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ISingleObjectiveSolutionSimilarityCalculatorView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ISingleObjectiveSolutionSimilarityCalculatorView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/OptimizerListView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/OptimizerListView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/Plugin.cs.frame

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626  /// Plugin class for HeuristicLab.Optimization.Views plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Optimization.Views", "3.3.10.$WCREV$")]
     28  [Plugin("HeuristicLab.Optimization.Views", "3.3.7.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Optimization.Views-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Analysis", "3.3")]

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ProblemInstanceProviderView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ProblemInstanceProviderView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ProblemView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    4646    private void InitializeComponent() {
    4747      this.problemInstanceSplitContainer = new System.Windows.Forms.SplitContainer();
    48       this.libraryLabel = new System.Windows.Forms.Label();
    49       this.problemInstanceProviderComboBox = new System.Windows.Forms.ComboBox();
    50       this.problemInstanceProviderViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
     48      this.ProblemInstanceConsumerViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    5149      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5250      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).BeginInit();
    … …  
    8987      // problemInstanceSplitContainer.Panel1
    9088      //
    91       this.problemInstanceSplitContainer.Panel1.Controls.Add(this.libraryLabel);
    92       this.problemInstanceSplitContainer.Panel1.Controls.Add(this.problemInstanceProviderComboBox);
    93       this.problemInstanceSplitContainer.Panel1.Controls.Add(this.problemInstanceProviderViewHost);
     89      this.problemInstanceSplitContainer.Panel1.Controls.Add(this.ProblemInstanceConsumerViewHost);
    9490      this.problemInstanceSplitContainer.Panel1MinSize = 10;
    9591      //
    … …  
    104100      this.problemInstanceSplitContainer.TabIndex = 13;
    105101      //
    106       // libraryLabel
     102      // ProblemInstanceConsumerViewHost
    107103      //
    108       this.libraryLabel.AutoSize = true;
    109       this.libraryLabel.Location = new System.Drawing.Point(3, 6);
    110       this.libraryLabel.Name = "libraryLabel";
    111       this.libraryLabel.Size = new System.Drawing.Size(41, 13);
    112       this.libraryLabel.TabIndex = 17;
    113       this.libraryLabel.Text = "Library:";
    114       //
    115       // problemInstanceProviderComboBox
    116       //
    117       this.problemInstanceProviderComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    118       this.problemInstanceProviderComboBox.FormattingEnabled = true;
    119       this.problemInstanceProviderComboBox.Location = new System.Drawing.Point(50, 2);
    120       this.problemInstanceProviderComboBox.Name = "problemInstanceProviderComboBox";
    121       this.problemInstanceProviderComboBox.Size = new System.Drawing.Size(208, 21);
    122       this.problemInstanceProviderComboBox.TabIndex = 18;
    123       this.problemInstanceProviderComboBox.SelectedIndexChanged += new System.EventHandler(this.problemInstanceProviderComboBox_SelectedIndexChanged);
    124       //
    125       // problemInstanceProviderViewHost
    126       //
    127       this.problemInstanceProviderViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     104      this.ProblemInstanceConsumerViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    128105            | System.Windows.Forms.AnchorStyles.Left)
    129106            | System.Windows.Forms.AnchorStyles.Right)));
    130       this.problemInstanceProviderViewHost.Caption = "ProblemInstanceConsumerView";
    131       this.problemInstanceProviderViewHost.Content = null;
    132       this.problemInstanceProviderViewHost.Enabled = false;
    133       this.problemInstanceProviderViewHost.Location = new System.Drawing.Point(264, 1);
    134       this.problemInstanceProviderViewHost.Name = "problemInstanceProviderViewHost";
    135       this.problemInstanceProviderViewHost.ReadOnly = false;
    136       this.problemInstanceProviderViewHost.Size = new System.Drawing.Size(247, 23);
    137       this.problemInstanceProviderViewHost.TabIndex = 0;
    138       this.problemInstanceProviderViewHost.ViewsLabelVisible = false;
    139       this.problemInstanceProviderViewHost.ViewType = null;
     107      this.ProblemInstanceConsumerViewHost.Caption = "ProblemInstanceConsumerView";
     108      this.ProblemInstanceConsumerViewHost.Content = null;
     109      this.ProblemInstanceConsumerViewHost.Enabled = false;
     110      this.ProblemInstanceConsumerViewHost.Location = new System.Drawing.Point(0, 1);
     111      this.ProblemInstanceConsumerViewHost.Name = "ProblemInstanceConsumerViewHost";
     112      this.ProblemInstanceConsumerViewHost.ReadOnly = false;
     113      this.ProblemInstanceConsumerViewHost.Size = new System.Drawing.Size(511, 23);
     114      this.ProblemInstanceConsumerViewHost.TabIndex = 0;
     115      this.ProblemInstanceConsumerViewHost.ViewsLabelVisible = false;
     116      this.ProblemInstanceConsumerViewHost.ViewType = null;
    140117      //
    141118      // ProblemView
    142119      //
     120      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    143121      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    144122      this.Controls.Add(this.problemInstanceSplitContainer);
    … …  
    147125      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    148126      this.problemInstanceSplitContainer.Panel1.ResumeLayout(false);
    149       this.problemInstanceSplitContainer.Panel1.PerformLayout();
    150127      this.problemInstanceSplitContainer.Panel2.ResumeLayout(false);
    151128      this.problemInstanceSplitContainer.Panel2.PerformLayout();
    … …  
    159136
    160137    protected System.Windows.Forms.SplitContainer problemInstanceSplitContainer;
    161     protected HeuristicLab.MainForm.WindowsForms.ViewHost problemInstanceProviderViewHost;
    162     protected System.Windows.Forms.Label libraryLabel;
    163     protected System.Windows.Forms.ComboBox problemInstanceProviderComboBox;
     138    protected HeuristicLab.MainForm.WindowsForms.ViewHost ProblemInstanceConsumerViewHost;
    164139  }
    165140}

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ProblemView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using System.Collections.Generic;
    2424using System.Linq;
     25using System.Windows.Forms;
    2526using HeuristicLab.Core.Views;
    2627using HeuristicLab.MainForm;
    … …  
    3637  public partial class ProblemView : ParameterizedNamedItemView {
    3738
     39    private static Type neededViewType = typeof(ProblemInstanceConsumerView);
     40
    3841    public new IProblem Content {
    3942      get { return (IProblem)base.Content; }
    4043      set { base.Content = value; }
    4144    }
    42 
    43     protected IEnumerable<IProblemInstanceProvider> problemInstanceProviders;
    44     public IEnumerable<IProblemInstanceProvider> ProblemInstanceProviders {
    45       get { return new List<IProblemInstanceProvider>(problemInstanceProviders); }
    46     }
    47 
    48     public IProblemInstanceProvider SelectedProvider { get; protected set; }
    4945
    5046    /// <summary>
    … …  
    5753    protected override void OnContentChanged() {
    5854      base.OnContentChanged();
    59       if (Content == null) {
    60         problemInstanceProviders = null;
    61         problemInstanceProviderComboBox.DataSource = null;
     55      IProblemInstanceConsumer consumer = Content as IProblemInstanceConsumer;
     56      if (consumer != null) {
     57        IEnumerable<Type> viewTypes = MainFormManager.GetViewTypes(consumer.GetType(), true);
     58        Type genericView = viewTypes.Where(x => x.IsSubclassOf(neededViewType)).First();
     59        ProblemInstanceConsumerViewHost.Content = null; //necessary to enable the change of the ViewType
     60        ProblemInstanceConsumerViewHost.ViewType = genericView;
     61        ProblemInstanceConsumerViewHost.Content = consumer;
     62        ProblemInstanceConsumerView view = (ProblemInstanceConsumerView)ProblemInstanceConsumerViewHost.ActiveView;
     63        problemInstanceSplitContainer.Panel1Collapsed = !view.ProblemInstanceProviders.Any();
     64      } else {
    6265        problemInstanceSplitContainer.Panel1Collapsed = true;
    63       } else {
    64         var consumer = Content as IProblemInstanceConsumer;
    65         if (consumer != null) {
    66           problemInstanceProviders = ProblemInstanceManager.GetProviders(Content);
    67           bool expand = problemInstanceProviders.Any();
    68           if (expand) {
    69             problemInstanceProviderComboBox.DisplayMember = "Name";
    70             problemInstanceProviderComboBox.DataSource = ProblemInstanceProviders.OrderBy(x => x.Name).ToList();
    71           }
    72           problemInstanceSplitContainer.Panel1Collapsed = !expand;
    73         } else
    74           problemInstanceSplitContainer.Panel1Collapsed = true;
    7566      }
    7667      SetEnabledStateOfControls();
    7768    }
    7869
    79     protected virtual void problemInstanceProviderComboBox_SelectedIndexChanged(object sender, System.EventArgs e) {
    80       if (problemInstanceProviderComboBox.SelectedIndex >= 0) {
    81         SelectedProvider = (IProblemInstanceProvider)problemInstanceProviderComboBox.SelectedItem;
    82         problemInstanceProviderViewHost.Content = SelectedProvider;
    83         var view = (ProblemInstanceProviderView)problemInstanceProviderViewHost.ActiveView;
    84         var consumer = (IProblemInstanceConsumer)Content;
    85         view.Consumer = consumer;
    86         if (CheckForIProblemInstanceExporter(consumer))
    87           view.Exporter = (IProblemInstanceExporter)Content;
    88         else view.Exporter = null;
    89         SetTooltip();
    90       } else {
    91         SelectedProvider = null;
    92       }
    93       SetEnabledStateOfControls();
    94     }
    95 
    96     protected bool CheckForIProblemInstanceExporter(IProblemInstanceConsumer content) {
    97       return Content.GetType().GetInterfaces()
    98                     .Any(x => x == typeof(IProblemInstanceExporter));
    99     }
    100 
    101     #region ToolTip
    102     protected void SetTooltip() {
    103       toolTip.SetToolTip(problemInstanceProviderComboBox, GetProviderToolTip());
    104     }
    105 
    106     private string GetProviderToolTip() {
    107       var provider = SelectedProvider;
    108       string toolTip = provider.Name;
    109 
    110       if (!String.IsNullOrEmpty(provider.ReferencePublication)) {
    111         toolTip = toolTip
    112             + Environment.NewLine + Environment.NewLine
    113             + provider.ReferencePublication;
    114       }
    115       if (provider.WebLink != null) {
    116         toolTip = toolTip
    117             + Environment.NewLine
    118             + provider.WebLink.ToString();
    119       }
    120 
    121       return toolTip;
    122     }
    123     #endregion
    12470  }
    12571}

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/Properties/AssemblyInfo.cs.frame

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3232[assembly: AssemblyCompany("")]
    3333[assembly: AssemblyProduct("HeuristicLab")]
    34 [assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
    3535[assembly: AssemblyTrademark("")]
    3636[assembly: AssemblyCulture("")]
    … …  
    5454// by using the '*' as shown below:
    5555[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
     56[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ResultCollectionView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ResultCollectionView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ResultValueView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ResultValueView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ResultView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/ResultView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionColumnConstraintView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionColumnConstraintView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionComparisonConstraintView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionComparisonConstraintView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionConstraintCollectionView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionConstraintCollectionView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionContentConstraintView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionContentConstraintView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionEqualityConstraintView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionEqualityConstraintView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionTypeCompatibilityConstraintView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionTypeCompatibilityConstraintView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionModifierListView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionModifierListView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    6161      this.tooltip = new System.Windows.Forms.ToolTip(this.components);
    6262      ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit();
    63       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
    6463      this.splitContainer.Panel1.SuspendLayout();
    6564      this.splitContainer.Panel2.SuspendLayout();
    … …  
    7271      this.xAxisLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    7372      this.xAxisLabel.AutoSize = true;
    74       this.xAxisLabel.Location = new System.Drawing.Point(363, 345);
     73      this.xAxisLabel.Location = new System.Drawing.Point(298, 256);
    7574      this.xAxisLabel.Name = "xAxisLabel";
    7675      this.xAxisLabel.Size = new System.Drawing.Size(15, 13);
    … …  
    8483      this.xAxisComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    8584      this.xAxisComboBox.FormattingEnabled = true;
    86       this.xAxisComboBox.Location = new System.Drawing.Point(384, 342);
     85      this.xAxisComboBox.Location = new System.Drawing.Point(319, 253);
    8786      this.xAxisComboBox.Name = "xAxisComboBox";
    88       this.xAxisComboBox.Size = new System.Drawing.Size(600, 21);
     87      this.xAxisComboBox.Size = new System.Drawing.Size(221, 21);
    8988      this.xAxisComboBox.TabIndex = 11;
    9089      this.xAxisComboBox.SelectedIndexChanged += new System.EventHandler(this.AxisComboBox_SelectedIndexChanged);
    … …  
    106105      this.yAxisComboBox.Location = new System.Drawing.Point(24, 3);
    107106      this.yAxisComboBox.Name = "yAxisComboBox";
    108       this.yAxisComboBox.Size = new System.Drawing.Size(600, 21);
     107      this.yAxisComboBox.Size = new System.Drawing.Size(221, 21);
    109108      this.yAxisComboBox.TabIndex = 9;
    110109      this.yAxisComboBox.SelectedIndexChanged += new System.EventHandler(this.AxisComboBox_SelectedIndexChanged);
    … …  
    112111      // chart
    113112      //
    114       this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    115             | System.Windows.Forms.AnchorStyles.Left)
    116             | System.Windows.Forms.AnchorStyles.Right)));
     113      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     114                  | System.Windows.Forms.AnchorStyles.Left)
     115                  | System.Windows.Forms.AnchorStyles.Right)));
    117116      chartArea1.Name = "ChartArea1";
    118117      this.chart.ChartAreas.Add(chartArea1);
    119       this.chart.Location = new System.Drawing.Point(-1, 30);
     118      this.chart.Location = new System.Drawing.Point(6, 30);
    120119      this.chart.Name = "chart";
    121120      series1.ChartArea = "ChartArea1";
    … …  
    126125      series1.YValuesPerPoint = 6;
    127126      this.chart.Series.Add(series1);
    128       this.chart.Size = new System.Drawing.Size(989, 306);
     127      this.chart.Size = new System.Drawing.Size(534, 217);
    129128      this.chart.TabIndex = 17;
    130129      this.chart.Text = "chart";
    … …  
    136135      this.noRunsLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
    137136      this.noRunsLabel.AutoSize = true;
    138       this.noRunsLabel.Location = new System.Drawing.Point(434, 167);
     137      this.noRunsLabel.Location = new System.Drawing.Point(212, 122);
    139138      this.noRunsLabel.Name = "noRunsLabel";
    140139      this.noRunsLabel.Size = new System.Drawing.Size(138, 13);
    … …  
    162161      //
    163162      this.splitContainer.Panel2.Controls.Add(this.statisticsGroupBox);
    164       this.splitContainer.Size = new System.Drawing.Size(987, 550);
    165       this.splitContainer.SplitterDistance = 366;
     163      this.splitContainer.Size = new System.Drawing.Size(543, 416);
     164      this.splitContainer.SplitterDistance = 277;
    166165      this.splitContainer.TabIndex = 23;
    167166      //
    … …  
    173172      this.showStatisticsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
    174173      this.showStatisticsCheckBox.Image = HeuristicLab.Common.Resources.VSImageLibrary.Properties;
    175       this.showStatisticsCheckBox.Location = new System.Drawing.Point(3, 339);
     174      this.showStatisticsCheckBox.Location = new System.Drawing.Point(6, 245);
    176175      this.showStatisticsCheckBox.Name = "showStatisticsCheckBox";
    177176      this.showStatisticsCheckBox.Size = new System.Drawing.Size(24, 24);
    … …  
    183182      // statisticsGroupBox
    184183      //
    185       this.statisticsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    186             | System.Windows.Forms.AnchorStyles.Left)
    187             | System.Windows.Forms.AnchorStyles.Right)));
     184      this.statisticsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     185                  | System.Windows.Forms.AnchorStyles.Left)
     186                  | System.Windows.Forms.AnchorStyles.Right)));
    188187      this.statisticsGroupBox.Controls.Add(this.statisticsMatrixView);
    189188      this.statisticsGroupBox.Location = new System.Drawing.Point(3, 3);
    190189      this.statisticsGroupBox.Name = "statisticsGroupBox";
    191       this.statisticsGroupBox.Size = new System.Drawing.Size(981, 174);
     190      this.statisticsGroupBox.Size = new System.Drawing.Size(534, 129);
    192191      this.statisticsGroupBox.TabIndex = 1;
    193192      this.statisticsGroupBox.TabStop = false;
    … …  
    204203      this.statisticsMatrixView.ShowRowsAndColumnsTextBox = false;
    205204      this.statisticsMatrixView.ShowStatisticalInformation = false;
    206       this.statisticsMatrixView.Size = new System.Drawing.Size(975, 155);
     205      this.statisticsMatrixView.Size = new System.Drawing.Size(528, 110);
    207206      this.statisticsMatrixView.TabIndex = 0;
    208207      //
    209208      // RunCollectionBoxPlotView
    210209      //
     210      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    211211      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    212212      this.BackColor = System.Drawing.SystemColors.Window;
    … …  
    214214      this.Controls.Add(this.splitContainer);
    215215      this.Name = "RunCollectionBoxPlotView";
    216       this.Size = new System.Drawing.Size(987, 550);
     216      this.Size = new System.Drawing.Size(543, 416);
    217217      ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit();
    218218      this.splitContainer.Panel1.ResumeLayout(false);
    219219      this.splitContainer.Panel1.PerformLayout();
    220220      this.splitContainer.Panel2.ResumeLayout(false);
    221       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
    222221      this.splitContainer.ResumeLayout(false);
    223222      this.statisticsGroupBox.ResumeLayout(false);

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3232
    3333namespace HeuristicLab.Optimization.Views {
    34   [View("Box Plot")]
     34  [View("RunCollection BoxPlots")]
    3535  [Content(typeof(RunCollection), false)]
    3636  public partial class RunCollectionBoxPlotView : AsynchronousContentView {
    … …  
    122122        Invoke(new EventHandler(Content_Reset), sender, e);
    123123      else {
     124        this.categoricalMapping.Clear();
    124125        UpdateDataPoints();
    125126        UpdateAxisLabels();
    … …  
    158159
    159160    private void UpdateCaption() {
    160       Caption = Content != null ? Content.OptimizerName + " Box Plot" : ViewAttribute.GetViewName(GetType());
     161      Caption = Content != null ? Content.OptimizerName + " Box Plots" : ViewAttribute.GetViewName(GetType());
    161162    }
    162163
    … …  
    188189
    189190    private void UpdateDataPoints() {
    190       this.categoricalMapping.Clear();
    191191      this.chart.Series.Clear();
    192192      this.seriesCache.Clear();
    … …  
    216216        if (datapoint != null) {
    217217          IRun run = (IRun)datapoint.Tag;
    218           string selectedAxis = xAxisValue;
     218          string selectedAxis = (string)xAxisComboBox.SelectedItem;
    219219          IItem value = null;
    220220
    … …  
    234234      }
    235235      matrix.ColumnNames = columnNames;
    236       matrix.RowNames = new string[] { "Count", "Minimum", "Maximum", "Median", "Average", "Standard Deviation", "Variance", "25th Percentile", "75th Percentile" };
     236      matrix.RowNames = new string[] { "Count", "Minimum", "Maximum", "Average", "Median", "Standard Deviation", "Variance", "25th Percentile", "75th Percentile" };
    237237
    238238      for (int i = 0; i < seriesCache.Count; i++) {
    … …  
    242242        matrix[1, i] = seriesValues.Min();
    243243        matrix[2, i] = seriesValues.Max();
    244         matrix[3, i] = seriesValues.Median();
    245         matrix[4, i] = seriesValues.Average();
     244        matrix[3, i] = seriesValues.Average();
     245        matrix[4, i] = seriesValues.Median();
    246246        matrix[5, i] = seriesValues.StandardDeviation();
    247247        matrix[6, i] = seriesValues.Variance();
    … …  
    325325      }
    326326    }
    327     private double? GetCategoricalValue(int dimension, string value) {
     327    private double GetCategoricalValue(int dimension, string value) {
    328328      if (!this.categoricalMapping.ContainsKey(dimension)) {
    329329        this.categoricalMapping[dimension] = new Dictionary<object, double>();
    … …  
    336336        }
    337337      }
    338       if (!this.categoricalMapping[dimension].ContainsKey(value)) return null;
    339338      return this.categoricalMapping[dimension][value];
    340339    }
    341     private double? GetValue(IRun run, AxisDimension axisDimension) {
    342       double? value = double.NaN;
     340    private double GetValue(IRun run, AxisDimension axisDimension) {
     341      double value = double.NaN;
    343342      switch (axisDimension) {
    344343        case AxisDimension.Color: {
    … …  
    374373      Axis yAxis = this.chart.ChartAreas[BoxPlotChartAreaName].AxisY;
    375374      int axisDimensionCount = Enum.GetNames(typeof(AxisDimension)).Count();
    376       //mkommend: combobox.SelectedIndex could not be used as this changes during hoovering over possible values
    377       var xSAxisSelectedIndex = xAxisValue == null ? 0 : xAxisComboBox.Items.IndexOf(xAxisValue);
    378       var ySAxisSelectedIndex = yAxisValue == null ? 0 : xAxisComboBox.Items.IndexOf(yAxisValue);
    379       SetCustomAxisLabels(xAxis, xSAxisSelectedIndex - axisDimensionCount);
    380       SetCustomAxisLabels(yAxis, ySAxisSelectedIndex - axisDimensionCount);
    381       if (xAxisValue != null)
    382         xAxis.Title = xAxisValue;
    383       if (yAxisValue != null)
    384         yAxis.Title = yAxisValue;
     375      SetCustomAxisLabels(xAxis, xAxisComboBox.SelectedIndex - axisDimensionCount);
     376      SetCustomAxisLabels(yAxis, yAxisComboBox.SelectedIndex - axisDimensionCount);
     377      if (xAxisComboBox.SelectedItem != null)
     378        xAxis.Title = xAxisComboBox.SelectedItem.ToString();
     379      if (yAxisComboBox.SelectedItem != null)
     380        yAxis.Title = yAxisComboBox.SelectedItem.ToString();
    385381    }
    386382

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    4848      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
    4949      System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
    50       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RunCollectionBubbleChartView));
    5150      this.yJitterLabel = new System.Windows.Forms.Label();
    5251      this.xJitterlabel = new System.Windows.Forms.Label();
    … …  
    7271      this.transparencyTrackBar = new System.Windows.Forms.TrackBar();
    7372      this.hideRunsButton = new System.Windows.Forms.Button();
    74       this.colorDialogButton = new System.Windows.Forms.Button();
    7573      this.noRunsLabel = new System.Windows.Forms.Label();
    7674      this.sizeTrackBar = new System.Windows.Forms.TrackBar();
    … …  
    7977      this.unhideAllRunToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    8078      this.colorResetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
     79      this.colorDialogButton = new System.Windows.Forms.Button();
    8180      ((System.ComponentModel.ISupportInitialize)(this.xTrackBar)).BeginInit();
    8281      ((System.ComponentModel.ISupportInitialize)(this.yTrackBar)).BeginInit();
    … …  
    9089      //
    9190      this.yJitterLabel.AutoSize = true;
    92       this.yJitterLabel.Location = new System.Drawing.Point(457, 6);
     91      this.yJitterLabel.Location = new System.Drawing.Point(278, 6);
    9392      this.yJitterLabel.Name = "yJitterLabel";
    9493      this.yJitterLabel.Size = new System.Drawing.Size(32, 13);
    … …  
    10099      this.xJitterlabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    101100      this.xJitterlabel.AutoSize = true;
    102       this.xJitterlabel.Location = new System.Drawing.Point(893, 719);
     101      this.xJitterlabel.Location = new System.Drawing.Point(749, 472);
    103102      this.xJitterlabel.Name = "xJitterlabel";
    104103      this.xJitterlabel.Size = new System.Drawing.Size(32, 13);
    … …  
    110109      this.xTrackBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    111110      this.xTrackBar.Enabled = false;
    112       this.xTrackBar.Location = new System.Drawing.Point(919, 715);
     111      this.xTrackBar.Location = new System.Drawing.Point(787, 469);
    113112      this.xTrackBar.Maximum = 100;
    114113      this.xTrackBar.Name = "xTrackBar";
    … …  
    122121      this.xAxisLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    123122      this.xAxisLabel.AutoSize = true;
    124       this.xAxisLabel.Location = new System.Drawing.Point(439, 719);
     123      this.xAxisLabel.Location = new System.Drawing.Point(471, 472);
    125124      this.xAxisLabel.Name = "xAxisLabel";
    126125      this.xAxisLabel.Size = new System.Drawing.Size(15, 13);
    … …  
    133132      this.xAxisComboBox.BackColor = System.Drawing.SystemColors.ControlLightLight;
    134133      this.xAxisComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    135       this.xAxisComboBox.DropDownWidth = 500;
    136134      this.xAxisComboBox.FormattingEnabled = true;
    137       this.xAxisComboBox.Location = new System.Drawing.Point(460, 715);
     135      this.xAxisComboBox.Location = new System.Drawing.Point(492, 469);
    138136      this.xAxisComboBox.Name = "xAxisComboBox";
    139       this.xAxisComboBox.Size = new System.Drawing.Size(400, 21);
     137      this.xAxisComboBox.Size = new System.Drawing.Size(221, 21);
    140138      this.xAxisComboBox.TabIndex = 7;
    141139      this.xAxisComboBox.SelectedValueChanged += new System.EventHandler(this.AxisComboBox_SelectedValueChanged);
    … …  
    154152      this.yAxisComboBox.BackColor = System.Drawing.SystemColors.ControlLightLight;
    155153      this.yAxisComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    156       this.yAxisComboBox.DropDownWidth = 800;
    157154      this.yAxisComboBox.FormattingEnabled = true;
    158155      this.yAxisComboBox.Location = new System.Drawing.Point(24, 3);
    159156      this.yAxisComboBox.Name = "yAxisComboBox";
    160       this.yAxisComboBox.Size = new System.Drawing.Size(400, 21);
     157      this.yAxisComboBox.Size = new System.Drawing.Size(221, 21);
    161158      this.yAxisComboBox.TabIndex = 5;
    162159      this.yAxisComboBox.SelectedValueChanged += new System.EventHandler(this.AxisComboBox_SelectedValueChanged);
    … …  
    165162      //
    166163      this.yTrackBar.Enabled = false;
    167       this.yTrackBar.Location = new System.Drawing.Point(483, 3);
     164      this.yTrackBar.Location = new System.Drawing.Point(312, 3);
    168165      this.yTrackBar.Maximum = 100;
    169166      this.yTrackBar.Name = "yTrackBar";
    … …  
    178175      this.sizeComboBox.BackColor = System.Drawing.SystemColors.ControlLightLight;
    179176      this.sizeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    180       this.sizeComboBox.DropDownWidth = 400;
    181177      this.sizeComboBox.FormattingEnabled = true;
    182       this.sizeComboBox.Location = new System.Drawing.Point(613, 3);
     178      this.sizeComboBox.Location = new System.Drawing.Point(560, 4);
    183179      this.sizeComboBox.Name = "sizeComboBox";
    184       this.sizeComboBox.Size = new System.Drawing.Size(300, 21);
     180      this.sizeComboBox.Size = new System.Drawing.Size(221, 21);
    185181      this.sizeComboBox.TabIndex = 14;
    186182      this.sizeComboBox.SelectedValueChanged += new System.EventHandler(this.AxisComboBox_SelectedValueChanged);
    … …  
    190186      this.sizeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    191187      this.sizeLabel.AutoSize = true;
    192       this.sizeLabel.Location = new System.Drawing.Point(541, 6);
     188      this.sizeLabel.Location = new System.Drawing.Point(489, 7);
    193189      this.sizeLabel.Name = "sizeLabel";
    194190      this.sizeLabel.Size = new System.Drawing.Size(66, 13);
    … …  
    198194      // chart
    199195      //
    200       this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    201             | System.Windows.Forms.AnchorStyles.Left) 
     196      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     197            | System.Windows.Forms.AnchorStyles.Left)
    202198            | System.Windows.Forms.AnchorStyles.Right)));
    203199      chartArea1.Name = "ChartArea1";
    204200      this.chart.ChartAreas.Add(chartArea1);
    205       this.chart.Location = new System.Drawing.Point(-1, 30);
     201      this.chart.Location = new System.Drawing.Point(6, 30);
    206202      this.chart.Name = "chart";
    207203      series1.ChartArea = "ChartArea1";
    … …  
    212208      series1.YValuesPerPoint = 2;
    213209      this.chart.Series.Add(series1);
    214       this.chart.Size = new System.Drawing.Size(988, 681);
     210      this.chart.Size = new System.Drawing.Size(843, 425);
    215211      this.chart.TabIndex = 16;
    216212      this.chart.Text = "chart";
    … …  
    239235      this.zoomButton.AutoSize = true;
    240236      this.zoomButton.Checked = true;
    241       this.zoomButton.Location = new System.Drawing.Point(6, 11);
     237      this.zoomButton.Location = new System.Drawing.Point(6, 10);
    242238      this.zoomButton.Name = "zoomButton";
    243239      this.zoomButton.Size = new System.Drawing.Size(52, 17);
    … …  
    252248      this.selectButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    253249      this.selectButton.AutoSize = true;
    254       this.selectButton.Location = new System.Drawing.Point(61, 11);
     250      this.selectButton.Location = new System.Drawing.Point(64, 9);
    255251      this.selectButton.Name = "selectButton";
    256252      this.selectButton.Size = new System.Drawing.Size(55, 17);
    … …  
    264260      this.radioButtonGroup.Controls.Add(this.zoomButton);
    265261      this.radioButtonGroup.Controls.Add(this.selectButton);
    266       this.radioButtonGroup.Location = new System.Drawing.Point(3, 704);
     262      this.radioButtonGroup.Location = new System.Drawing.Point(2, 461);
    267263      this.radioButtonGroup.Name = "radioButtonGroup";
    268264      this.radioButtonGroup.Size = new System.Drawing.Size(122, 32);
    … …  
    275271      this.colorRunsButton.Enabled = false;
    276272      this.colorRunsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    277       this.colorRunsButton.Location = new System.Drawing.Point(131, 713);
     273      this.colorRunsButton.Location = new System.Drawing.Point(130, 469);
    278274      this.colorRunsButton.Name = "colorRunsButton";
    279275      this.colorRunsButton.Size = new System.Drawing.Size(21, 21);
    … …  
    293289      this.colorXAxisButton.Enabled = false;
    294290      this.colorXAxisButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.DisplayInColorVertical;
    295       this.colorXAxisButton.Location = new System.Drawing.Point(866, 715);
     291      this.colorXAxisButton.Location = new System.Drawing.Point(719, 469);
    296292      this.colorXAxisButton.Name = "colorXAxisButton";
    297293      this.colorXAxisButton.Size = new System.Drawing.Size(21, 21);
    … …  
    305301      this.colorYAxisButton.Enabled = false;
    306302      this.colorYAxisButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.DisplayInColor;
    307       this.colorYAxisButton.Location = new System.Drawing.Point(430, 3);
     303      this.colorYAxisButton.Location = new System.Drawing.Point(251, 3);
    308304      this.colorYAxisButton.Name = "colorYAxisButton";
    309305      this.colorYAxisButton.Size = new System.Drawing.Size(21, 21);
    … …  
    317313      this.transparencyTrackBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    318314      this.transparencyTrackBar.LargeChange = 16;
    319       this.transparencyTrackBar.Location = new System.Drawing.Point(302, 715);
     315      this.transparencyTrackBar.Location = new System.Drawing.Point(359, 470);
    320316      this.transparencyTrackBar.Maximum = 254;
    321317      this.transparencyTrackBar.Name = "transparencyTrackBar";
    … …  
    331327      this.hideRunsButton.Enabled = false;
    332328      this.hideRunsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    333       this.hideRunsButton.Location = new System.Drawing.Point(172, 713);
     329      this.hideRunsButton.Location = new System.Drawing.Point(177, 469);
    334330      this.hideRunsButton.Name = "hideRunsButton";
    335331      this.hideRunsButton.Size = new System.Drawing.Size(43, 21);
    … …  
    340336      this.hideRunsButton.Click += new System.EventHandler(this.hideRunsButton_Click);
    341337      //
    342       // colorDialogButton
    343       //
    344       this.colorDialogButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    345       this.colorDialogButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
    346       this.colorDialogButton.Enabled = false;
    347       this.colorDialogButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
    348       this.colorDialogButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    349       this.colorDialogButton.Location = new System.Drawing.Point(152, 713);
    350       this.colorDialogButton.Name = "colorDialogButton";
    351       this.colorDialogButton.Size = new System.Drawing.Size(14, 21);
    352       this.colorDialogButton.TabIndex = 25;
    353       this.colorDialogButton.Text = "v";
    354       this.tooltip.SetToolTip(this.colorDialogButton, "Choose color");
    355       this.colorDialogButton.UseVisualStyleBackColor = true;
    356       this.colorDialogButton.Click += new System.EventHandler(this.colorDialogButton_Click);
    357       //
    358338      // noRunsLabel
    359339      //
    360340      this.noRunsLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
    361341      this.noRunsLabel.AutoSize = true;
    362       this.noRunsLabel.Location = new System.Drawing.Point(432, 350);
     342      this.noRunsLabel.Location = new System.Drawing.Point(366, 228);
    363343      this.noRunsLabel.Name = "noRunsLabel";
    364344      this.noRunsLabel.Size = new System.Drawing.Size(138, 13);
    … …  
    369349      //
    370350      this.sizeTrackBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    371       this.sizeTrackBar.Location = new System.Drawing.Point(919, 3);
     351      this.sizeTrackBar.Location = new System.Drawing.Point(787, 3);
    372352      this.sizeTrackBar.Maximum = 20;
    373353      this.sizeTrackBar.Minimum = -20;
    … …  
    390370      this.transparencyLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    391371      this.transparencyLabel.AutoSize = true;
    392       this.transparencyLabel.Location = new System.Drawing.Point(233, 717);
     372      this.transparencyLabel.Location = new System.Drawing.Point(278, 475);
    393373      this.transparencyLabel.Name = "transparencyLabel";
    394374      this.transparencyLabel.Size = new System.Drawing.Size(75, 13);
    … …  
    410390      this.colorResetToolStripMenuItem.Click += new System.EventHandler(this.colorResetToolStripMenuItem_Click);
    411391      //
     392      // colorDialogButton
     393      //
     394      this.colorDialogButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     395      this.colorDialogButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
     396      this.colorDialogButton.Enabled = false;
     397      this.colorDialogButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
     398      this.colorDialogButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
     399      this.colorDialogButton.Location = new System.Drawing.Point(150, 469);
     400      this.colorDialogButton.Name = "colorDialogButton";
     401      this.colorDialogButton.Size = new System.Drawing.Size(14, 21);
     402      this.colorDialogButton.TabIndex = 25;
     403      this.colorDialogButton.Text = "v";
     404      this.tooltip.SetToolTip(this.colorDialogButton, "Choose color");
     405      this.colorDialogButton.UseVisualStyleBackColor = true;
     406      this.colorDialogButton.Click += new System.EventHandler(this.colorDialogButton_Click);
     407      //
    412408      // RunCollectionBubbleChartView
    413409      //
    … …  
    416412      this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
    417413      this.Controls.Add(this.hideRunsButton);
     414      this.Controls.Add(this.transparencyTrackBar);
    418415      this.Controls.Add(this.sizeTrackBar);
    419416      this.Controls.Add(this.colorYAxisButton);
    … …  
    422419      this.Controls.Add(this.colorRunsButton);
    423420      this.Controls.Add(this.radioButtonGroup);
     421      this.Controls.Add(this.sizeLabel);
     422      this.Controls.Add(this.sizeComboBox);
    424423      this.Controls.Add(this.yJitterLabel);
    425424      this.Controls.Add(this.transparencyLabel);
    … …  
    433432      this.Controls.Add(this.colorDialogButton);
    434433      this.Controls.Add(this.chart);
    435       this.Controls.Add(this.transparencyTrackBar);
    436       this.Controls.Add(this.sizeLabel);
    437       this.Controls.Add(this.sizeComboBox);
    438434      this.Name = "RunCollectionBubbleChartView";
    439       this.Size = new System.Drawing.Size(986, 741);
     435      this.Size = new System.Drawing.Size(854, 496);
    440436      ((System.ComponentModel.ISupportInitialize)(this.xTrackBar)).EndInit();
    441437      ((System.ComponentModel.ISupportInitialize)(this.yTrackBar)).EndInit();

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3333
    3434namespace HeuristicLab.Optimization.Views {
    35   [View("Bubble Chart")]
     35  [View("RunCollection BubbleChart")]
    3636  [Content(typeof(RunCollection), false)]
    3737  public partial class RunCollectionBubbleChartView : AsynchronousContentView {
    … …  
    5656    private bool suppressUpdates = false;
    5757
    58     private readonly RunCollectionContentConstraint visibilityConstraint = new RunCollectionContentConstraint() { Active = true };
     58    private const double transperencyExponent = 2.5;
     59
     60    private RunCollectionContentConstraint visibilityConstraint = new RunCollectionContentConstraint() { Active = true };
    5961
    6062    public RunCollectionBubbleChartView() {
    … …  
    153155        if (suppressUpdates) return;
    154156
    155         UpdateDataPoints();
     157        foreach (var run in Content) UpdateRun(run);
     158        UpdateMarkerSizes();
     159        UpdateCursorInterval();
     160        chart.ChartAreas[0].RecalculateAxesScale();
    156161        UpdateAxisLabels();
    157162      }
    … …  
    187192    protected override void OnContentChanged() {
    188193      base.OnContentChanged();
     194      this.categoricalMapping.Clear();
    189195      UpdateComboBoxes();
    190196      UpdateDataPoints();
    191197      UpdateCaption();
     198      RebuildInverseIndex();
    192199    }
    193200
    … …  
    262269        Invoke(new EventHandler(Content_Reset), sender, e);
    263270      else {
     271        this.categoricalMapping.Clear();
     272        RebuildInverseIndex();
    264273        UpdateDataPoints();
    265274        UpdateAxisLabels();
    … …  
    271280      series.Points.Clear();
    272281      runToDataPointMapping.Clear();
    273       categoricalMapping.Clear();
    274282      selectedRuns.Clear();
    275       RebuildInverseIndex();
    276283
    277284      chart.ChartAreas[0].AxisX.IsMarginVisible = xAxisValue != AxisDimension.Index.ToString();
    … …  
    433440      }
    434441    }
    435     private double? GetCategoricalValue(int dimension, string value) {
     442    private double GetCategoricalValue(int dimension, string value) {
    436443      if (!this.categoricalMapping.ContainsKey(dimension)) {
    437444        this.categoricalMapping[dimension] = new Dictionary<object, double>();
    … …  
    444451        }
    445452      }
    446       if (!this.categoricalMapping[dimension].ContainsKey(value)) return null;
    447453      return this.categoricalMapping[dimension][value];
    448454    }
    … …  
    551557          var point = chart.Series[0].Points[pointIndex];
    552558          IRun run = (IRun)point.Tag;
    553           if (selectedRuns.Contains(run)) {
    554             point.MarkerStyle = MarkerStyle.Circle;
    555             point.Color = Color.FromArgb(255 - LogTransform(transparencyTrackBar.Value), run.Color);
    556             selectedRuns.Remove(run);
    557           } else {
    558             point.Color = Color.Red;
    559             point.MarkerStyle = MarkerStyle.Cross;
    560             selectedRuns.Add(run);
    561           }
     559          point.Color = Color.Red;
     560          point.MarkerStyle = MarkerStyle.Cross;
     561          selectedRuns.Add(run);
    562562        }
    563563      } else {
    … …  
    663663      Axis yAxis = this.chart.ChartAreas[0].AxisY;
    664664      int axisDimensionCount = Enum.GetNames(typeof(AxisDimension)).Count();
    665       //mkommend: combobox.SelectedIndex could not be used as this changes during hovering over possible values
    666       var xSAxisSelectedIndex = xAxisValue == null ? 0 : xAxisComboBox.Items.IndexOf(xAxisValue);
    667       var ySAxisSelectedIndex = yAxisValue == null ? 0 : xAxisComboBox.Items.IndexOf(yAxisValue);
    668       SetCustomAxisLabels(xAxis, xSAxisSelectedIndex - axisDimensionCount);
    669       SetCustomAxisLabels(yAxis, ySAxisSelectedIndex - axisDimensionCount);
    670       if (xAxisValue != null)
    671         xAxis.Title = xAxisValue;
    672       if(yAxisValue != null)
    673       yAxis.Title = yAxisValue;
     665      SetCustomAxisLabels(xAxis, xAxisComboBox.SelectedIndex - axisDimensionCount);
     666      SetCustomAxisLabels(yAxis, yAxisComboBox.SelectedIndex - axisDimensionCount);
     667      if (xAxisComboBox.SelectedItem != null)
     668        xAxis.Title = xAxisComboBox.SelectedItem.ToString();
     669      if (yAxisComboBox.SelectedItem != null)
     670        yAxis.Title = yAxisComboBox.SelectedItem.ToString();
    674671    }
    675672
    … …  
    713710    }
    714711
     712    private IRun runToHide = null;
    715713    private void ContextMenuStrip_Opening(object sender, System.ComponentModel.CancelEventArgs e) {
    716       hideRunsToolStripMenuItem.Visible = selectedRuns.Any();
     714      var pos = Control.MousePosition;
     715      var chartPos = chart.PointToClient(pos);
     716
     717      HitTestResult h = this.chart.HitTest(chartPos.X, chartPos.Y, ChartElementType.DataPoint);
     718      if (h.ChartElementType == ChartElementType.DataPoint) {
     719        runToHide = (IRun)((DataPoint)h.Object).Tag;
     720        hideRunsToolStripMenuItem.Visible = true;
     721      } else {
     722        runToHide = null;
     723        hideRunsToolStripMenuItem.Visible = false;
     724      }
    717725    }
    718726
    … …  
    722730    }
    723731    private void hideRunsToolStripMenuItem_Click(object sender, EventArgs e) {
    724       //ToList is necessary to prevent lazy evaluation
    725       HideRuns(selectedRuns.ToList());
     732      HideRuns(selectedRuns);
    726733      //could not use ClearSelectedRuns as the runs are not visible anymore
    727734      selectedRuns.Clear();
    728735    }
    729736    private void hideRunsButton_Click(object sender, EventArgs e) {
    730       //ToList is necessary to prevent lazy evaluation
    731       HideRuns(selectedRuns.ToList());
     737      HideRuns(selectedRuns);
    732738      //could not use ClearSelectedRuns as the runs are not visible anymore
    733739      selectedRuns.Clear();
    … …  
    737743      visibilityConstraint.Active = false;
    738744      if (!Content.Constraints.Contains(visibilityConstraint)) Content.Constraints.Add(visibilityConstraint);
    739       foreach (var run in runs) {
     745      foreach (var run in selectedRuns) {
    740746        visibilityConstraint.ConstraintData.Add(run);
    741747      }

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    255255      if (e.KeyCode == Keys.Delete) {
    256256        if ((itemsListView.SelectedItems.Count > 0) && !Content.IsReadOnly && !ReadOnly) {
    257           if (RunCollection != null) {
    258             RunCollection.RemoveRange(itemsListView.SelectedItems.Cast<ListViewItem>().Select(i => (IRun)i.Tag));
    259           } else {
    260             foreach (ListViewItem item in itemsListView.SelectedItems)
    261               Content.Remove((IRun)item.Tag);
    262           }
     257          foreach (ListViewItem item in itemsListView.SelectedItems)
     258            Content.Remove((IRun)item.Tag);
    263259        }
    264260      }
    … …  
    354350    private void removeButton_Click(object sender, EventArgs e) {
    355351      if (itemsListView.SelectedItems.Count > 0) {
    356         if (RunCollection != null) {
    357           RunCollection.RemoveRange(itemsListView.SelectedItems.Cast<ListViewItem>().Select(i => (IRun)i.Tag));
    358         } else {
    359           foreach (ListViewItem item in itemsListView.SelectedItems)
    360             Content.Remove((IRun)item.Tag);
    361         }
     352        foreach (ListViewItem item in itemsListView.SelectedItems)
     353          Content.Remove((IRun)item.Tag);
    362354        itemsListView.SelectedItems.Clear();
    363355      }
    … …  
    385377      try {
    386378        RunCollection.Modify();
    387       }
    388       finally {
     379      } finally {
    389380        ReadOnly = false;
    390381      }

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/RunView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.