Changeset 3306


Ignore:
Timestamp:
04/12/10 04:53:48 (11 years ago)
Author:
swagner
Message:

Implemented reviewers' comments (#893).

Location:
trunk/sources
Files:
38 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm.Views/3.3/GeneticAlgorithmView.Designer.cs

    r3262 r3306  
    5050      this.problemTabPage.SuspendLayout();
    5151      this.resultsTabPage.SuspendLayout();
     52      this.runsTabPage.SuspendLayout();
     53      this.problemPanel.SuspendLayout();
    5254      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5355      this.SuspendLayout();
     
    138140      this.toolTip.SetToolTip(this.stopButton, "Stop Algorithm");
    139141      //
     142      // runsTabPage
     143      //
     144      this.runsTabPage.Size = new System.Drawing.Size(736, 468);
     145      //
     146      // runsView
     147      //
     148      this.runsView.Size = new System.Drawing.Size(724, 456);
     149      //
     150      // problemPanel
     151      //
     152      this.problemPanel.Size = new System.Drawing.Size(724, 426);
     153      //
    140154      // nameTextBox
    141155      //
     
    160174      this.problemTabPage.ResumeLayout(false);
    161175      this.resultsTabPage.ResumeLayout(false);
     176      this.runsTabPage.ResumeLayout(false);
     177      this.problemPanel.ResumeLayout(false);
    162178      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    163179      this.ResumeLayout(false);
  • trunk/sources/HeuristicLab.Analysis/3.3/DataTable.cs

    r3160 r3306  
    2020#endregion
    2121
     22using System.Drawing;
    2223using HeuristicLab.Core;
    2324using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    3031  [StorableClass]
    3132  public sealed class DataTable : NamedItem {
     33    public override Image ItemImage {
     34      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Table; }
     35    }
     36
    3237    [Storable]
    3338    private NamedItemCollection<DataRow> rows;
  • trunk/sources/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

    r3095 r3306  
    7373      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    7474    </Reference>
     75    <Reference Include="System.Drawing" />
    7576    <Reference Include="System.Xml.Linq">
    7677      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     
    103104      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    104105      <Name>HeuristicLab.Collections-3.3</Name>
     106    </ProjectReference>
     107    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources-3.2.csproj">
     108      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     109      <Name>HeuristicLab.Common.Resources-3.2</Name>
    105110    </ProjectReference>
    106111    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
  • trunk/sources/HeuristicLab.Analysis/3.3/HeuristicLabAnalysisPlugin.cs.frame

    r2891 r3306  
    2929  [PluginFile("HeuristicLab.Analysis-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Collections", "3.3")]
     31  [PluginDependency("HeuristicLab.Common.Resources", "3.2")]
    3132  [PluginDependency("HeuristicLab.Core", "3.3")]
    3233  [PluginDependency("HeuristicLab.Data", "3.3")]
  • trunk/sources/HeuristicLab.Core.Views/3.3/CreateParameterDialog.Designer.cs

    r2924 r3306  
    148148      this.setDataTypeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    149149      this.setDataTypeButton.Enabled = false;
    150       this.setDataTypeButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Add;
     150      this.setDataTypeButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Edit;
    151151      this.setDataTypeButton.Location = new System.Drawing.Point(506, 420);
    152152      this.setDataTypeButton.Name = "setDataTypeButton";
  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

    r3298 r3306  
    2222using System;
    2323using System.Collections.Generic;
     24using System.Linq;
    2425using System.Windows.Forms;
    2526using HeuristicLab.Collections;
     
    9798    }
    9899    protected virtual ListViewItem CreateListViewItem(T item) {
    99       if (!itemsListView.SmallImageList.Images.ContainsKey(item.GetType().FullName))
    100         itemsListView.SmallImageList.Images.Add(item.GetType().FullName, item.ItemImage);
    101 
    102100      ListViewItem listViewItem = new ListViewItem();
    103101      listViewItem.Text = item.ToString();
    104102      listViewItem.ToolTipText = item.ItemName + ": " + item.ItemDescription;
    105       listViewItem.ImageIndex = itemsListView.SmallImageList.Images.IndexOfKey(item.GetType().FullName);
    106103      listViewItem.Tag = item;
     104      SetListViewItemImage(listViewItem);
    107105      return listViewItem;
    108106    }
    109107    protected virtual void AddListViewItem(ListViewItem listViewItem) {
    110108      itemsListView.Items.Add(listViewItem);
     109      ((T)listViewItem.Tag).ItemImageChanged += new EventHandler(Item_ItemImageChanged);
    111110      ((T)listViewItem.Tag).ToStringChanged += new EventHandler(Item_ToStringChanged);
    112111      sortAscendingButton.Enabled = itemsListView.Items.Count > 0;
     
    114113    }
    115114    protected virtual void RemoveListViewItem(ListViewItem listViewItem) {
     115      ((T)listViewItem.Tag).ItemImageChanged -= new EventHandler(Item_ItemImageChanged);
    116116      ((T)listViewItem.Tag).ToStringChanged -= new EventHandler(Item_ToStringChanged);
    117117      listViewItem.Remove();
     
    120120    }
    121121    protected virtual void UpdateListViewItem(ListViewItem listViewItem) {
    122       if (!listViewItem.Text.Equals(listViewItem.Tag.ToString())) {
     122      if (!listViewItem.Text.Equals(listViewItem.Tag.ToString()))
    123123        listViewItem.Text = listViewItem.Tag.ToString();
    124       }
     124      if (itemsListView.SmallImageList.Images[listViewItem.ImageIndex] != ((T)listViewItem.Tag).ItemImage)
     125        SetListViewItemImage(listViewItem);
    125126    }
    126127    protected virtual IEnumerable<ListViewItem> GetListViewItemsForItem(T item) {
     
    255256
    256257    #region Item Events
    257     protected virtual void Item_ToStringChanged(object sender, EventArgs e) {
    258       if (InvokeRequired)
    259         Invoke(new EventHandler(Item_ToStringChanged), sender, e);
     258    protected virtual void Item_ItemImageChanged(object sender, EventArgs e) {
     259      if (InvokeRequired)
     260        Invoke(new EventHandler(Item_ItemImageChanged), sender, e);
    260261      else {
    261262        T item = (T)sender;
     
    264265      }
    265266    }
     267    protected virtual void Item_ToStringChanged(object sender, EventArgs e) {
     268      if (InvokeRequired)
     269        Invoke(new EventHandler(Item_ToStringChanged), sender, e);
     270      else {
     271        T item = (T)sender;
     272        foreach (ListViewItem listViewItem in GetListViewItemsForItem(item))
     273          UpdateListViewItem(listViewItem);
     274      }
     275    }
    266276    #endregion
    267277
    268278    #region Helpers
     279    protected virtual void SetListViewItemImage(ListViewItem listViewItem) {
     280      T item = (T)listViewItem.Tag;
     281      int i = 0;
     282      while ((i < itemsListView.SmallImageList.Images.Count) && (item.ItemImage != itemsListView.SmallImageList.Images[i]))
     283        i++;
     284      if (i == itemsListView.SmallImageList.Images.Count) itemsListView.SmallImageList.Images.Add(item.ItemImage);
     285      listViewItem.ImageIndex = i;
     286    }
    269287    protected virtual void SortItemsListView(SortOrder sortOrder) {
    270288      itemsListView.Sorting = SortOrder.None;
  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.cs

    r3228 r3306  
    119119    }
    120120    protected virtual ListViewItem CreateListViewItem(T item) {
    121       if (!itemsListView.SmallImageList.Images.ContainsKey(item.GetType().FullName))
    122         itemsListView.SmallImageList.Images.Add(item.GetType().FullName, item.ItemImage);
    123 
    124121      ListViewItem listViewItem = new ListViewItem();
    125122      listViewItem.Text = item.ToString();
    126123      listViewItem.ToolTipText = item.ItemName + ": " + item.ItemDescription;
    127       listViewItem.ImageIndex = itemsListView.SmallImageList.Images.IndexOfKey(item.GetType().FullName);
    128124      listViewItem.Tag = item;
     125      SetListViewItemImage(listViewItem);
    129126      return listViewItem;
    130127    }
    131128    protected virtual void AddListViewItem(ListViewItem listViewItem) {
    132129      itemsListView.Items.Add(listViewItem);
     130      ((T)listViewItem.Tag).ItemImageChanged += new EventHandler(Item_ItemImageChanged);
    133131      ((T)listViewItem.Tag).ToStringChanged += new EventHandler(Item_ToStringChanged);
    134132    }
    135133    protected virtual void InsertListViewItem(int index, ListViewItem listViewItem) {
    136134      itemsListView.Items.Insert(index, listViewItem);
     135      ((T)listViewItem.Tag).ItemImageChanged += new EventHandler(Item_ItemImageChanged);
    137136      ((T)listViewItem.Tag).ToStringChanged += new EventHandler(Item_ToStringChanged);
    138137    }
    139138    protected virtual void RemoveListViewItem(ListViewItem listViewItem) {
     139      ((T)listViewItem.Tag).ItemImageChanged -= new EventHandler(Item_ItemImageChanged);
    140140      ((T)listViewItem.Tag).ToStringChanged -= new EventHandler(Item_ToStringChanged);
    141141      listViewItem.Remove();
     
    143143    protected virtual void UpdateListViewItem(ListViewItem listViewItem) {
    144144      T item = (T)listViewItem.Tag;
    145       if (!itemsListView.SmallImageList.Images.ContainsKey(item.GetType().FullName))
    146         itemsListView.SmallImageList.Images.Add(item.GetType().FullName, item.ItemImage);
    147 
    148145      listViewItem.Text = item.ToString();
    149146      listViewItem.ToolTipText = item.ItemName + ": " + item.ItemDescription;
    150       listViewItem.ImageIndex = itemsListView.SmallImageList.Images.IndexOfKey(item.GetType().FullName);
     147      if (itemsListView.SmallImageList.Images[listViewItem.ImageIndex] != item.ItemImage)
     148        SetListViewItemImage(listViewItem);
    151149    }
    152150
     
    334332
    335333    #region Item Events
    336     protected virtual void Item_ToStringChanged(object sender, EventArgs e) {
    337       if (InvokeRequired)
    338         Invoke(new EventHandler(Item_ToStringChanged), sender, e);
     334    protected virtual void Item_ItemImageChanged(object sender, EventArgs e) {
     335      if (InvokeRequired)
     336        Invoke(new EventHandler(Item_ItemImageChanged), sender, e);
    339337      else {
    340338        T item = (T)sender;
     
    345343      }
    346344    }
     345    protected virtual void Item_ToStringChanged(object sender, EventArgs e) {
     346      if (InvokeRequired)
     347        Invoke(new EventHandler(Item_ToStringChanged), sender, e);
     348      else {
     349        T item = (T)sender;
     350        foreach (ListViewItem listViewItem in itemsListView.Items) {
     351          if (((T)listViewItem.Tag) == item)
     352            UpdateListViewItem(listViewItem);
     353        }
     354      }
     355    }
     356    #endregion
     357
     358    #region Helpers
     359    protected virtual void SetListViewItemImage(ListViewItem listViewItem) {
     360      T item = (T)listViewItem.Tag;
     361      int i = 0;
     362      while ((i < itemsListView.SmallImageList.Images.Count) && (item.ItemImage != itemsListView.SmallImageList.Images[i]))
     363        i++;
     364      if (i == itemsListView.SmallImageList.Images.Count) itemsListView.SmallImageList.Images.Add(item.ItemImage);
     365      listViewItem.ImageIndex = i;
     366    }
    347367    #endregion
    348368  }
  • trunk/sources/HeuristicLab.Core.Views/3.3/VariableView.Designer.cs

    r3281 r3306  
    140140      // setValueButton
    141141      //
    142       this.setValueButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Add;
     142      this.setValueButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Edit;
    143143      this.setValueButton.Location = new System.Drawing.Point(6, 19);
    144144      this.setValueButton.Name = "setValueButton";
  • trunk/sources/HeuristicLab.Core/3.3/Interfaces/IItem.cs

    r2932 r3306  
    3232    Image ItemImage { get; }
    3333
     34    event EventHandler ItemImageChanged;
    3435    event EventHandler ToStringChanged;
    3536  }
  • trunk/sources/HeuristicLab.Core/3.3/Item.cs

    r3280 r3306  
    5555    }
    5656
     57    public event EventHandler ItemImageChanged;
     58    protected virtual void OnItemImageChanged() {
     59      EventHandler handler = ItemImageChanged;
     60      if (handler != null) handler(this, EventArgs.Empty);
     61    }
    5762    public event EventHandler ToStringChanged;
    5863    protected virtual void OnToStringChanged() {
    59       if (ToStringChanged != null)
    60         ToStringChanged(this, EventArgs.Empty);
     64      EventHandler handler = ToStringChanged;
     65      if (handler != null) handler(this, EventArgs.Empty);
    6166    }
    6267  }
  • trunk/sources/HeuristicLab.Core/3.3/ItemArray.cs

    r3286 r3306  
    6565    }
    6666
     67    public event EventHandler ItemImageChanged;
     68    protected virtual void OnItemImageChanged() {
     69      EventHandler handler = ItemImageChanged;
     70      if (handler != null) handler(this, EventArgs.Empty);
     71    }
    6772    public event EventHandler ToStringChanged;
    6873    protected virtual void OnToStringChanged() {
    69       if (ToStringChanged != null)
    70         ToStringChanged(this, EventArgs.Empty);
     74      EventHandler handler = ToStringChanged;
     75      if (handler != null) handler(this, EventArgs.Empty);
    7176    }
    7277  }
  • trunk/sources/HeuristicLab.Core/3.3/ItemCollection.cs

    r3286 r3306  
    6161    }
    6262
     63    public event EventHandler ItemImageChanged;
     64    protected virtual void OnItemImageChanged() {
     65      EventHandler handler = ItemImageChanged;
     66      if (handler != null) handler(this, EventArgs.Empty);
     67    }
    6368    public event EventHandler ToStringChanged;
    6469    protected virtual void OnToStringChanged() {
    65       if (ToStringChanged != null)
    66         ToStringChanged(this, EventArgs.Empty);
     70      EventHandler handler = ToStringChanged;
     71      if (handler != null) handler(this, EventArgs.Empty);
    6772    }
    6873  }
  • trunk/sources/HeuristicLab.Core/3.3/ItemList.cs

    r3286 r3306  
    6565    }
    6666
     67    public event EventHandler ItemImageChanged;
     68    protected virtual void OnItemImageChanged() {
     69      EventHandler handler = ItemImageChanged;
     70      if (handler != null) handler(this, EventArgs.Empty);
     71    }
    6772    public event EventHandler ToStringChanged;
    6873    protected virtual void OnToStringChanged() {
    69       if (ToStringChanged != null)
    70         ToStringChanged(this, EventArgs.Empty);
     74      EventHandler handler = ToStringChanged;
     75      if (handler != null) handler(this, EventArgs.Empty);
    7176    }
    7277  }
  • trunk/sources/HeuristicLab.Core/3.3/ItemSet.cs

    r3286 r3306  
    6464    }
    6565
     66    public event EventHandler ItemImageChanged;
     67    protected virtual void OnItemImageChanged() {
     68      EventHandler handler = ItemImageChanged;
     69      if (handler != null) handler(this, EventArgs.Empty);
     70    }
    6671    public event EventHandler ToStringChanged;
    6772    protected virtual void OnToStringChanged() {
    68       if (ToStringChanged != null)
    69         ToStringChanged(this, EventArgs.Empty);
     73      EventHandler handler = ToStringChanged;
     74      if (handler != null) handler(this, EventArgs.Empty);
    7075    }
    7176  }
  • trunk/sources/HeuristicLab.Core/3.3/NamedItemCollection.cs

    r3287 r3306  
    6969    }
    7070
     71    public event EventHandler ItemImageChanged;
     72    protected virtual void OnItemImageChanged() {
     73      EventHandler handler = ItemImageChanged;
     74      if (handler != null) handler(this, EventArgs.Empty);
     75    }
    7176    public event EventHandler ToStringChanged;
    7277    protected virtual void OnToStringChanged() {
    73       if (ToStringChanged != null)
    74         ToStringChanged(this, EventArgs.Empty);
     78      EventHandler handler = ToStringChanged;
     79      if (handler != null) handler(this, EventArgs.Empty);
    7580    }
    7681
  • trunk/sources/HeuristicLab.Data/3.3/BoolValue.cs

    r3160 r3306  
    2121
    2222using System;
     23using System.Drawing;
    2324using System.Text;
    2425using HeuristicLab.Core;
     
    2930  [StorableClass]
    3031  public class BoolValue : ValueTypeValue<bool>, IComparable, IStringConvertibleValue {
     32    public override Image ItemImage {
     33      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Field; }
     34    }
     35
    3136    public BoolValue() : base() { }
    3237    public BoolValue(bool value) : base(value) { }
  • trunk/sources/HeuristicLab.Data/3.3/Comparison.cs

    r3160 r3306  
    2121
    2222using System;
     23using System.Drawing;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    2829  [StorableClass]
    2930  public class Comparison : ValueTypeValue<ComparisonType>, IComparable {
     31    public override Image ItemImage {
     32      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Enum; }
     33    }
     34
    3035    public Comparison() : base() { }
    3136    public Comparison(ComparisonType value) : base(value) { }
  • trunk/sources/HeuristicLab.Data/3.3/DoubleValue.cs

    r3160 r3306  
    2121
    2222using System;
     23using System.Drawing;
    2324using System.Text;
    2425using HeuristicLab.Core;
     
    2930  [StorableClass]
    3031  public class DoubleValue : ValueTypeValue<double>, IComparable, IStringConvertibleValue {
     32    public override Image ItemImage {
     33      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Field; }
     34    }
     35
    3136    public DoubleValue() : base() { }
    3237    public DoubleValue(double value) : base(value) { }
  • trunk/sources/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj

    r3095 r3306  
    9595    </Reference>
    9696    <Reference Include="System.Data" />
     97    <Reference Include="System.Drawing" />
    9798    <Reference Include="System.Xml" />
    9899  </ItemGroup>
  • trunk/sources/HeuristicLab.Data/3.3/IntValue.cs

    r3160 r3306  
    2121
    2222using System;
     23using System.Drawing;
    2324using System.Text;
    2425using HeuristicLab.Core;
     
    2930  [StorableClass]
    3031  public class IntValue : ValueTypeValue<int>, IComparable, IStringConvertibleValue {
     32    public override Image ItemImage {
     33      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Field; }
     34    }
     35
    3136    public IntValue() : base() { }
    3237    public IntValue(int value) : base(value) { }
  • trunk/sources/HeuristicLab.Data/3.3/StringArray.cs

    r3263 r3306  
    2323using System.Linq;
    2424using System.Collections;
     25using System.Drawing;
    2526using System.Text;
    2627using HeuristicLab.Common;
     
    3334  [StorableClass]
    3435  public class StringArray : Item, IEnumerable<string>, IStringConvertibleArray {
     36    public override Image ItemImage {
     37      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Class; }
     38    }
     39
    3540    [Storable]
    3641    protected string[] array;
  • trunk/sources/HeuristicLab.Data/3.3/StringMatrix.cs

    r3160 r3306  
    2222using System;
    2323using System.Collections;
     24using System.Drawing;
    2425using System.Text;
    2526using HeuristicLab.Common;
     
    3132  [StorableClass]
    3233  public class StringMatrix : Item, IEnumerable, IStringConvertibleMatrix {
     34    public override Image ItemImage {
     35      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Class; }
     36    }
     37
    3338    [Storable]
    3439    protected string[,] matrix;
  • trunk/sources/HeuristicLab.Data/3.3/StringValue.cs

    r3160 r3306  
    2121
    2222using System;
     23using System.Drawing;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    2829  [StorableClass]
    2930  public class StringValue : Item, IComparable, IStringConvertibleValue {
     31    public override Image ItemImage {
     32      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Field; }
     33    }
     34
    3035    [Storable]
    3136    protected string value;
  • trunk/sources/HeuristicLab.Data/3.3/ValueTypeArray.cs

    r3054 r3306  
    2222using System;
    2323using System.Collections;
     24using System.Drawing;
    2425using System.Text;
    2526using HeuristicLab.Common;
     
    3132  [StorableClass]
    3233  public abstract class ValueTypeArray<T> : Item, IEnumerable where T : struct {
     34    public override Image ItemImage {
     35      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Class; }
     36    }
     37
    3338    [Storable]
    3439    protected T[] array;
  • trunk/sources/HeuristicLab.Data/3.3/ValueTypeMatrix.cs

    r3054 r3306  
    2222using System;
    2323using System.Collections;
     24using System.Drawing;
    2425using System.Text;
    2526using HeuristicLab.Common;
     
    3132  [StorableClass]
    3233  public abstract class ValueTypeMatrix<T> : Item, IEnumerable where T : struct {
     34    public override Image ItemImage {
     35      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Class; }
     36    }
     37
    3338    [Storable]
    3439    protected T[,] matrix;
  • trunk/sources/HeuristicLab.Data/3.3/ValueTypeValue.cs

    r3054 r3306  
    2121
    2222using System;
     23using System.Drawing;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    2829  [StorableClass]
    2930  public abstract class ValueTypeValue<T> : Item where T : struct {
     31    public override Image ItemImage {
     32      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.ValueType; }
     33    }
     34
    3035    [Storable]
    3136    protected T value;
  • trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests/TestRandom.cs

    r3053 r3306  
    112112    }
    113113
     114    public event EventHandler ItemImageChanged;
    114115    public event EventHandler ToStringChanged;
    115116
  • trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Tests/TestRandom.cs

    r3053 r3306  
    112112    }
    113113
     114    public event EventHandler ItemImageChanged;
    114115    public event EventHandler ToStringChanged;
    115116
  • trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Tests/Random.cs

    r3053 r3306  
    112112    }
    113113
     114    public event EventHandler ItemImageChanged;
    114115    public event EventHandler ToStringChanged;
    115116
  • trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Tests/TestRandom.cs

    r3053 r3306  
    112112    }
    113113
     114    public event EventHandler ItemImageChanged;
    114115    public event EventHandler ToStringChanged;
    115116
  • trunk/sources/HeuristicLab.Operators/3.3/AlgorithmOperator.cs

    r3017 r3306  
    3232  public abstract class AlgorithmOperator : SingleSuccessorOperator {
    3333    public override Image ItemImage {
    34       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Module; }
     34      get {
     35        if (Breakpoint) return HeuristicLab.Common.Resources.VS2008ImageLibrary.BreakpointActive;
     36        else return HeuristicLab.Common.Resources.VS2008ImageLibrary.Module;
     37      }
    3538    }
    3639    [Storable]
  • trunk/sources/HeuristicLab.Operators/3.3/Operator.cs

    r3034 r3306  
    3333  public abstract class Operator : ParameterizedNamedItem, IOperator {
    3434    public override Image ItemImage {
    35       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Method; }
     35      get {
     36        if (Breakpoint) return HeuristicLab.Common.Resources.VS2008ImageLibrary.BreakpointActive;
     37        else return HeuristicLab.Common.Resources.VS2008ImageLibrary.Method;
     38      }
    3639    }
    3740    public override bool CanChangeDescription {
     
    7679          breakpoint = value;
    7780          OnBreakpointChanged();
     81          OnItemImageChanged();
    7882        }
    7983      }
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.Designer.cs

    r3281 r3306  
    5454      this.problemTabPage.SuspendLayout();
    5555      this.resultsTabPage.SuspendLayout();
     56      this.runsTabPage.SuspendLayout();
     57      this.problemPanel.SuspendLayout();
    5658      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5759      this.engineTabPage.SuspendLayout();
     
    6264      this.tabControl.Controls.Add(this.engineTabPage);
    6365      this.tabControl.Size = new System.Drawing.Size(713, 467);
     66      this.tabControl.Controls.SetChildIndex(this.runsTabPage, 0);
    6467      this.tabControl.Controls.SetChildIndex(this.resultsTabPage, 0);
    6568      this.tabControl.Controls.SetChildIndex(this.engineTabPage, 0);
     
    132135      this.stopButton.Location = new System.Drawing.Point(60, 525);
    133136      this.toolTip.SetToolTip(this.stopButton, "Stop Algorithm");
     137      //
     138      // runsTabPage
     139      //
     140      this.runsTabPage.Size = new System.Drawing.Size(705, 441);
     141      //
     142      // runsView
     143      //
     144      this.runsView.Size = new System.Drawing.Size(693, 429);
     145      //
     146      // problemPanel
     147      //
     148      this.problemPanel.Size = new System.Drawing.Size(693, 399);
    134149      //
    135150      // nameTextBox
     
    172187      this.engineComboBox.Location = new System.Drawing.Point(55, 6);
    173188      this.engineComboBox.Name = "engineComboBox";
    174       this.engineComboBox.Size = new System.Drawing.Size(610, 21);
     189      this.engineComboBox.Size = new System.Drawing.Size(644, 21);
    175190      this.engineComboBox.TabIndex = 1;
    176191      this.engineComboBox.SelectedIndexChanged += new System.EventHandler(this.engineComboBox_SelectedIndexChanged);
     
    197212      this.engineViewHost.Location = new System.Drawing.Point(6, 33);
    198213      this.engineViewHost.Name = "engineViewHost";
    199       this.engineViewHost.Size = new System.Drawing.Size(659, 335);
     214      this.engineViewHost.Size = new System.Drawing.Size(693, 402);
    200215      this.engineViewHost.TabIndex = 2;
    201216      this.engineViewHost.ViewType = null;
     
    224239      this.problemTabPage.ResumeLayout(false);
    225240      this.resultsTabPage.ResumeLayout(false);
     241      this.runsTabPage.ResumeLayout(false);
     242      this.problemPanel.ResumeLayout(false);
    226243      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    227244      this.engineTabPage.ResumeLayout(false);
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs

    r3281 r3306  
    5757      this.problemTabPage.SuspendLayout();
    5858      this.resultsTabPage.SuspendLayout();
     59      this.runsTabPage.SuspendLayout();
     60      this.problemPanel.SuspendLayout();
    5961      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    6062      this.operatorGraphTabPage.SuspendLayout();
     
    6567      //
    6668      this.createUserDefinedAlgorithmButton.Enabled = false;
    67       this.createUserDefinedAlgorithmButton.Location = new System.Drawing.Point(150, 525);
    68       this.createUserDefinedAlgorithmButton.TabIndex = 9;
    6969      this.toolTip.SetToolTip(this.createUserDefinedAlgorithmButton, "Create User Defined Algorithm from this Algorithm");
    7070      this.createUserDefinedAlgorithmButton.Visible = false;
     
    104104      // resetButton
    105105      //
    106       this.resetButton.Location = new System.Drawing.Point(90, 525);
    107106      this.toolTip.SetToolTip(this.resetButton, "Reset Algorithm");
    108107      //
    109       // executionTimeLabel
    110       //
    111       this.executionTimeLabel.TabIndex = 10;
    112       //
    113       // executionTimeTextBox
    114       //
    115       this.executionTimeTextBox.TabIndex = 11;
    116       //
    117108      // stopButton
    118109      //
    119       this.stopButton.Location = new System.Drawing.Point(60, 525);
    120110      this.toolTip.SetToolTip(this.stopButton, "Stop Algorithm");
    121111      //
     
    216206      this.problemTabPage.ResumeLayout(false);
    217207      this.resultsTabPage.ResumeLayout(false);
     208      this.runsTabPage.ResumeLayout(false);
     209      this.problemPanel.ResumeLayout(false);
    218210      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    219211      this.operatorGraphTabPage.ResumeLayout(false);
  • trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.Designer.cs

    r3281 r3306  
    141141      // setValueButton
    142142      //
    143       this.setValueButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Add;
     143      this.setValueButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Edit;
    144144      this.setValueButton.Location = new System.Drawing.Point(6, 19);
    145145      this.setValueButton.Name = "setValueButton";
  • trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueParameterView.Designer.cs

    r3281 r3306  
    127127      // setValueButton
    128128      //
    129       this.setValueButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Add;
     129      this.setValueButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Edit;
    130130      this.setValueButton.Location = new System.Drawing.Point(6, 19);
    131131      this.setValueButton.Name = "setValueButton";
  • trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views/3.3/TSPLIBImportDialog.Designer.cs

    r3158 r3306  
    105105      //
    106106      this.openTSPFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    107       this.openTSPFileButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Add;
     107      this.openTSPFileButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Open;
    108108      this.openTSPFileButton.Location = new System.Drawing.Point(520, 10);
    109109      this.openTSPFileButton.Name = "openTSPFileButton";
     
    136136      //
    137137      this.openTourFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    138       this.openTourFileButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Add;
     138      this.openTourFileButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Open;
    139139      this.openTourFileButton.Location = new System.Drawing.Point(520, 62);
    140140      this.openTourFileButton.Name = "openTourFileButton";
  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/PathTSPTour.cs

    r3239 r3306  
    2121
    2222using System;
     23using System.Drawing;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
     
    3435  [StorableClass]
    3536  public sealed class PathTSPTour : Item {
     37    public override Image ItemImage {
     38      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Image; }
     39    }
     40
    3641    private DoubleMatrix coordinates;
    3742    [Storable]
Note: See TracChangeset for help on using the changeset viewer.