Changeset 9356


Ignore:
Timestamp:
04/11/13 17:11:32 (8 years ago)
Author:
jkarder
Message:

#1853:

  • moved ValueConfigurationCheckedItemCollectionView to ParameterConfigurationEncoding
  • renamed ValueConfigurationCheckedItemCollectionView to ValueConfigurationCheckedItemListView
Location:
branches
Files:
1 deleted
3 edited
2 moved

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.MetaOptimization (trunk integration)/HeuristicLab.Problems.MetaOptimization.Views/3.3/HeuristicLab.Problems.MetaOptimization.Views-3.3.csproj

    r8576 r9356  
    183183      <DependentUpon>RunCollectionItemDictionaryView.cs</DependentUpon>
    184184    </Compile>
    185     <Compile Include="ValueConfigurationViews\ValueConfigurationCheckedItemCollectionView.cs">
    186       <SubType>UserControl</SubType>
    187     </Compile>
    188     <Compile Include="ValueConfigurationViews\ValueConfigurationCheckedItemCollectionView.Designer.cs">
    189       <DependentUpon>ValueConfigurationCheckedItemCollectionView.cs</DependentUpon>
    190     </Compile>
    191185    <Compile Include="Properties\AssemblyInfo.cs" />
    192186  </ItemGroup>
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views-3.3.csproj

    r8655 r9356  
    121121    <Compile Include="Properties\AssemblyInfo.cs" />
    122122    <None Include="Properties\AssemblyInfo.cs.frame" />
    123     <Compile Include="ValueConfigurationViews\CheckedValueConfigurationListView.cs">
    124       <SubType>UserControl</SubType>
    125     </Compile>
    126     <Compile Include="ValueConfigurationViews\CheckedValueConfigurationListView.Designer.cs">
    127       <DependentUpon>CheckedValueConfigurationListView.cs</DependentUpon>
    128     </Compile>
    129123    <Compile Include="ValueConfigurationViews\RangeView.cs">
    130124      <SubType>UserControl</SubType>
     
    132126    <Compile Include="ValueConfigurationViews\RangeView.Designer.cs">
    133127      <DependentUpon>RangeView.cs</DependentUpon>
     128    </Compile>
     129    <Compile Include="ValueConfigurationViews\ValueConfigurationCheckedItemListView.cs">
     130      <SubType>UserControl</SubType>
     131    </Compile>
     132    <Compile Include="ValueConfigurationViews\ValueConfigurationCheckedItemListView.Designer.cs">
     133      <DependentUpon>ValueConfigurationCheckedItemListView.cs</DependentUpon>
    134134    </Compile>
    135135    <Compile Include="ValueConfigurationViews\ValueView.cs">
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/OptimizableView.cs

    r8657 r9356  
    7070            } else {
    7171              viewHost.Content = pc.ValueConfigurations;
    72               viewHost.ViewType = typeof(CheckedValueConfigurationListView);
     72              viewHost.ViewType = typeof(ValueConfigurationCheckedItemListView);
    7373            }
    7474          } else if (vc != null) {
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/ValueConfigurationViews/ValueConfigurationCheckedItemListView.Designer.cs

    r9343 r9356  
    11namespace HeuristicLab.Encodings.ParameterConfigurationEncoding.Views {
    2   partial class ValueConfigurationCheckedItemCollectionView {
     2  partial class ValueConfigurationCheckedItemListView {
    33    /// <summary>
    44    /// Required designer variable.
     
    2525    private void InitializeComponent() {
    2626      components = new System.ComponentModel.Container();
    27       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     27      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    2828    }
    2929
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/ValueConfigurationViews/ValueConfigurationCheckedItemListView.cs

    r9343 r9356  
    1010  [View("ValueConfigurationList View")]
    1111  [Content(typeof(ICheckedValueConfigurationList), IsDefaultView = true)]
    12   public sealed partial class ValueConfigurationCheckedItemCollectionView : CheckedItemListView<IValueConfiguration> {
     12  public sealed partial class ValueConfigurationCheckedItemListView : CheckedItemListView<IValueConfiguration> {
    1313    public new ICheckedValueConfigurationList Content {
    1414      get { return (ICheckedValueConfigurationList)base.Content; }
     
    1616    }
    1717
    18     public ValueConfigurationCheckedItemCollectionView() {
     18    public ValueConfigurationCheckedItemListView() {
    1919      InitializeComponent();
    2020      this.viewHost.ViewsLabelVisible = false;
     21      this.typeSelectorDialog = new TypeSelectorDialog();
    2122    }
    2223
     
    4546
    4647    protected override IValueConfiguration CreateItem() {
    47       var objectSelectorDialog = new ObjectSelectorDialog<IItem>(Content.ValidValues.GroupBy(x => ApplicationManager.Manager.GetDeclaringPlugin(x.GetType()).Name));
    48       if (objectSelectorDialog.ShowDialog(this) == DialogResult.OK) {
     48      typeSelectorDialog.Caption = "Select Item";
     49      typeSelectorDialog.TypeSelector.Caption = "Available Items";
     50      typeSelectorDialog.TypeSelector.Configure(Content.ValidValues.Select(x => x.GetType()), false, false, false);
     51      if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
    4952        try {
    50           IItem value = (IItem)objectSelectorDialog.Item.Clone();
     53          IItem value = (IItem)Content.ValidValues.Single(x => x.GetType() == typeSelectorDialog.TypeSelector.SelectedType).Clone();
    5154          if (value is NullValue) {
    5255            return new NullValueConfiguration();
Note: See TracChangeset for help on using the changeset viewer.