Free cookie consent management tool by TermsFeed Policy Generator

Changeset 10589 for branches


Ignore:
Timestamp:
03/12/14 17:37:19 (11 years ago)
Author:
psteiner
Message:

Implemented Filterview, ComparisonFilterView

Location:
branches/DataPreprocessing
Files:
4 added
6 edited

Legend:

Unmodified
Added
Removed

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

    • Property svn:ignore set to
      ComparisonFilterView.resx
      FilterView.resx

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/ComparisonFilterView.Designer.cs

    r10558 r10589  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       this.label1 = new System.Windows.Forms.Label();
     47      this.lblAttr = new System.Windows.Forms.Label();
     48      this.lblFilterOperation = new System.Windows.Forms.Label();
     49      this.lblFilterData = new System.Windows.Forms.Label();
     50      this.cbAttr = new System.Windows.Forms.ComboBox();
     51      this.cbFilterOperation = new System.Windows.Forms.ComboBox();
     52      this.tbFilterData = new System.Windows.Forms.TextBox();
    4853      this.SuspendLayout();
    4954      //
    50       // label1
     55      // lblAttr
    5156      //
    52       this.label1.AutoSize = true;
    53       this.label1.Location = new System.Drawing.Point(312, 120);
    54       this.label1.Name = "label1";
    55       this.label1.Size = new System.Drawing.Size(35, 13);
    56       this.label1.TabIndex = 0;
    57       this.label1.Text = "label1";
     57      this.lblAttr.AutoSize = true;
     58      this.lblAttr.Location = new System.Drawing.Point(3, 15);
     59      this.lblAttr.Name = "lblAttr";
     60      this.lblAttr.Size = new System.Drawing.Size(49, 13);
     61      this.lblAttr.TabIndex = 0;
     62      this.lblAttr.Text = "Attribute:";
     63      //
     64      // lblFilterOperation
     65      //
     66      this.lblFilterOperation.AutoSize = true;
     67      this.lblFilterOperation.Location = new System.Drawing.Point(3, 42);
     68      this.lblFilterOperation.Name = "lblFilterOperation";
     69      this.lblFilterOperation.Size = new System.Drawing.Size(81, 13);
     70      this.lblFilterOperation.TabIndex = 1;
     71      this.lblFilterOperation.Text = "Filter Operation:";
     72      //
     73      // lblFilterData
     74      //
     75      this.lblFilterData.AutoSize = true;
     76      this.lblFilterData.Location = new System.Drawing.Point(3, 69);
     77      this.lblFilterData.Name = "lblFilterData";
     78      this.lblFilterData.Size = new System.Drawing.Size(58, 13);
     79      this.lblFilterData.TabIndex = 2;
     80      this.lblFilterData.Text = "Filter Data:";
     81      //
     82      // cbAttr
     83      //
     84      this.cbAttr.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     85            | System.Windows.Forms.AnchorStyles.Right)));
     86      this.cbAttr.FormattingEnabled = true;
     87      this.cbAttr.Location = new System.Drawing.Point(92, 12);
     88      this.cbAttr.Name = "cbAttr";
     89      this.cbAttr.Size = new System.Drawing.Size(247, 21);
     90      this.cbAttr.TabIndex = 3;
     91      //
     92      // cbFilterOperation
     93      //
     94      this.cbFilterOperation.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     95            | System.Windows.Forms.AnchorStyles.Right)));
     96      this.cbFilterOperation.FormattingEnabled = true;
     97      this.cbFilterOperation.Location = new System.Drawing.Point(92, 39);
     98      this.cbFilterOperation.Name = "cbFilterOperation";
     99      this.cbFilterOperation.Size = new System.Drawing.Size(247, 21);
     100      this.cbFilterOperation.TabIndex = 4;
     101      //
     102      // tbFilterData
     103      //
     104      this.tbFilterData.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     105            | System.Windows.Forms.AnchorStyles.Right)));
     106      this.tbFilterData.Location = new System.Drawing.Point(92, 67);
     107      this.tbFilterData.Name = "tbFilterData";
     108      this.tbFilterData.Size = new System.Drawing.Size(247, 20);
     109      this.tbFilterData.TabIndex = 5;
    58110      //
    59111      // ComparisonFilterView
    … …  
    61113      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    62114      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    63       this.Controls.Add(this.label1);
     115      this.Controls.Add(this.tbFilterData);
     116      this.Controls.Add(this.cbFilterOperation);
     117      this.Controls.Add(this.cbAttr);
     118      this.Controls.Add(this.lblFilterData);
     119      this.Controls.Add(this.lblFilterOperation);
     120      this.Controls.Add(this.lblAttr);
    64121      this.Name = "ComparisonFilterView";
    65       this.Size = new System.Drawing.Size(615, 503);
     122      this.Size = new System.Drawing.Size(348, 97);
    66123      this.ResumeLayout(false);
    67124      this.PerformLayout();
    … …  
    71128    #endregion
    72129
    73     private System.Windows.Forms.Label label1;
     130    private System.Windows.Forms.Label lblAttr;
     131    private System.Windows.Forms.Label lblFilterOperation;
     132    private System.Windows.Forms.Label lblFilterData;
     133    private System.Windows.Forms.ComboBox cbAttr;
     134    private System.Windows.Forms.ComboBox cbFilterOperation;
     135    private System.Windows.Forms.TextBox tbFilterData;
    74136
    75137  }

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/ComparisonFilterView.cs

    r10558 r10589  
    2121
    2222using HeuristicLab.Core.Views;
     23using HeuristicLab.Core;
     24using HeuristicLab.Data;
    2325using HeuristicLab.DataPreprocessing.Filter;
    2426using HeuristicLab.MainForm;
     27using System.Collections;
    2528
    2629namespace HeuristicLab.DataPreprocessing.Views {
    … …  
    3740    }
    3841
    39     protected override void OnContentChanged() {
    40       base.OnContentChanged();
    41     }
     42    //protected override void OnContentChanged() {
     43    //  base.OnContentChanged();
     44    //  cbAttr.Items.Clear();
     45    //  cbFilterOperation.Items.Clear();
     46    //  if (Content != null)
     47    //  {
     48    //    cbFilterOperation.Items.AddRange(Content.AllowedConstraintOperations.ToArray());
     49    //    if (Content.ConstraintOperation != null)
     50    //      cbFilterOperation.SelectedItem = Content.ConstraintOperation;
     51    //    else if (cbFilterOperation.Items.Count != 0)
     52    //      cbFilterOperation.SelectedIndex = 0;
     53    //    UpdateColumnComboBox();
     54    //    ReadOnly = Content.Active;
     55    //  }
     56    //}
     57
     58
     59
     60    //protected virtual void UpdateColumnComboBox()
     61    //{
     62    //  this.cbAttr.Items.Clear();
     63    //  if (Content.ConstrainedValue != null)
     64    //  {
     65    //    this.cbAttr.Items.AddRange(((IStringConvertibleMatrix)Content.ConstrainedValue).ColumnNames.ToArray());
     66    //    if (!string.IsNullOrEmpty(Content.ConstraintColumn))
     67    //      this.cbAttr.SelectedItem = Content.ConstraintColumn;
     68    //  }
     69    //}
    4270
    4371  }

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj

    r10583 r10589  
    3838  </PropertyGroup>
    3939  <ItemGroup>
     40    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     41      <SpecificVersion>False</SpecificVersion>
     42      <HintPath>..\..\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     43    </Reference>
     44    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     45      <SpecificVersion>False</SpecificVersion>
     46      <HintPath>..\..\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     47    </Reference>
     48    <Reference Include="HeuristicLab.Problems.Instances.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     49      <SpecificVersion>False</SpecificVersion>
     50      <HintPath>..\..\bin\HeuristicLab.Problems.Instances.Views-3.3.dll</HintPath>
     51    </Reference>
    4052    <Reference Include="System" />
    4153    <Reference Include="System.Core" />
     54    <Reference Include="System.Data" />
    4255    <Reference Include="System.Drawing" />
    4356    <Reference Include="System.Windows.Forms" />
    4457    <Reference Include="System.Windows.Forms.DataVisualization" />
     58    <Reference Include="System.Xml" />
    4559  </ItemGroup>
    4660  <ItemGroup>
    … …  
    159173      <Name>HeuristicLab.MainForm-3.3</Name>
    160174    </ProjectReference>
     175    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
     176      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
     177      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     178    </ProjectReference>
    161179    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    162180      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    … …  
    179197      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    180198    </ProjectReference>
     199  </ItemGroup>
     200  <ItemGroup>
     201    <EmbeddedResource Include="ComparisonFilterView.resx">
     202      <DependentUpon>ComparisonFilterView.cs</DependentUpon>
     203    </EmbeddedResource>
     204    <EmbeddedResource Include="FilterView.resx">
     205      <DependentUpon>FilterView.cs</DependentUpon>
     206    </EmbeddedResource>
    181207  </ItemGroup>
    182208  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • branches/DataPreprocessing/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r9910 r10589  
    392392    </ProjectReference>
    393393  </ItemGroup>
     394  <ItemGroup>
     395    <EmbeddedResource Include="RunCollectionConstraintViews\RunCollectionComparisonConstraintView.resx">
     396      <DependentUpon>RunCollectionComparisonConstraintView.cs</DependentUpon>
     397    </EmbeddedResource>
     398  </ItemGroup>
    394399  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    395400  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

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

    r9456 r10589  
    4848      this.txtConstraintData = new System.Windows.Forms.TextBox();
    4949      this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
     50      this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
    5051      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5152      this.SuspendLayout();
    … …  
    5354      // txtConstraintData
    5455      //
    55       this.txtConstraintData.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    56                   | System.Windows.Forms.AnchorStyles.Right)));
     56      this.txtConstraintData.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     57            | System.Windows.Forms.AnchorStyles.Right)));
    5758      this.errorProvider.SetIconAlignment(this.txtConstraintData, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    5859      this.errorProvider.SetIconPadding(this.txtConstraintData, 2);
    … …  
    6162      this.txtConstraintData.Size = new System.Drawing.Size(246, 20);
    6263      this.txtConstraintData.TabIndex = 9;
     64      this.txtConstraintData.Validating += new System.ComponentModel.CancelEventHandler(this.txtConstraintData_Validating);
    6365      this.txtConstraintData.Validated += new System.EventHandler(this.txtConstraintData_Validated);
    64       this.txtConstraintData.Validating += new System.ComponentModel.CancelEventHandler(this.txtConstraintData_Validating);
    6566      //
    6667      // errorProvider
    … …  
    6869      this.errorProvider.ContainerControl = this;
    6970      //
     71      // contextMenuStrip1
     72      //
     73      this.contextMenuStrip1.Name = "contextMenuStrip1";
     74      //
    7075      // RunCollectionComparisonConstraintView
    7176      //
    72       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    7377      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    7478      this.Controls.Add(this.txtConstraintData);
    … …  
    8892    private System.Windows.Forms.TextBox txtConstraintData;
    8993    private System.Windows.Forms.ErrorProvider errorProvider;
     94    private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
    9095  }
    9196}
Note: See TracChangeset for help on using the changeset viewer.