Changeset 10762


Ignore:
Timestamp:
04/23/14 10:48:19 (8 years ago)
Author:
rstoll
Message:
  • Renamed FindAndReplace to SearchAndReplace
  • Added "Search" and "Replace" buttons to DataGrid
Location:
branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3
Files:
1 added
3 edited
2 moved

Legend:

Unmodified
Added
Removed
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.Designer.cs

    r10558 r10762  
    5454      this.mostCommonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    5555      this.interpolationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
     56      this.btnSearch = new System.Windows.Forms.Button();
     57      this.btnReplace = new System.Windows.Forms.Button();
     58      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
    5659      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5760      this.contextMenuCell.SuspendLayout();
     
    8083      // btnApplySort
    8184      //
    82       this.btnApplySort.Location = new System.Drawing.Point(241, 19);
     85      this.btnApplySort.Location = new System.Drawing.Point(349, 19);
    8386      this.btnApplySort.Name = "btnApplySort";
    8487      this.btnApplySort.Size = new System.Drawing.Size(75, 23);
    8588      this.btnApplySort.TabIndex = 7;
    8689      this.btnApplySort.Text = "Apply Sort";
     90      this.toolTip.SetToolTip(this.btnApplySort, "The current sorting is applied on the data itself.");
    8791      this.btnApplySort.UseVisualStyleBackColor = true;
    8892      this.btnApplySort.Click += new System.EventHandler(this.btnApplySort_Click);
     
    9397            this.replaceValueToolStripMenuItem});
    9498      this.contextMenuCell.Name = "contextMenuCell";
    95       this.contextMenuCell.Size = new System.Drawing.Size(153, 48);
     99      this.contextMenuCell.Size = new System.Drawing.Size(148, 26);
    96100      //
    97101      // replaceValueToolStripMenuItem
     
    104108            this.interpolationToolStripMenuItem});
    105109      this.replaceValueToolStripMenuItem.Name = "replaceValueToolStripMenuItem";
    106       this.replaceValueToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
     110      this.replaceValueToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
    107111      this.replaceValueToolStripMenuItem.Text = "Replace Value";
    108112      //
     
    142146      this.interpolationToolStripMenuItem.Click += new System.EventHandler(this.ReplaceWithInterpolation_Click);
    143147      //
     148      // btnSearch
     149      //
     150      this.btnSearch.Location = new System.Drawing.Point(201, 19);
     151      this.btnSearch.Name = "btnSearch";
     152      this.btnSearch.Size = new System.Drawing.Size(53, 23);
     153      this.btnSearch.TabIndex = 8;
     154      this.btnSearch.Text = "Search";
     155      this.toolTip.SetToolTip(this.btnSearch, "Opens the Search dialog");
     156      this.btnSearch.UseVisualStyleBackColor = true;
     157      this.btnSearch.Click += new System.EventHandler(this.button1_Click);
     158      //
     159      // btnReplace
     160      //
     161      this.btnReplace.Location = new System.Drawing.Point(260, 19);
     162      this.btnReplace.Name = "btnReplace";
     163      this.btnReplace.Size = new System.Drawing.Size(55, 23);
     164      this.btnReplace.TabIndex = 9;
     165      this.btnReplace.Text = "Replace";
     166      this.toolTip.SetToolTip(this.btnReplace, "Opens the Search & Replace dialog");
     167      this.btnReplace.UseVisualStyleBackColor = true;
     168      this.btnReplace.Click += new System.EventHandler(this.btnReplace_Click);
     169      //
    144170      // DataGridContentView
    145171      //
    146172      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    147173      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     174      this.Controls.Add(this.btnReplace);
     175      this.Controls.Add(this.btnSearch);
    148176      this.Controls.Add(this.btnApplySort);
    149177      this.Name = "DataGridContentView";
     
    155183      this.Controls.SetChildIndex(this.columnsTextBox, 0);
    156184      this.Controls.SetChildIndex(this.btnApplySort, 0);
     185      this.Controls.SetChildIndex(this.btnSearch, 0);
     186      this.Controls.SetChildIndex(this.btnReplace, 0);
    157187      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    158188      this.contextMenuCell.ResumeLayout(false);
     
    172202    private System.Windows.Forms.ToolStripMenuItem mostCommonToolStripMenuItem;
    173203    private System.Windows.Forms.ToolStripMenuItem interpolationToolStripMenuItem;
     204    private System.Windows.Forms.Button btnSearch;
     205    private System.Windows.Forms.Button btnReplace;
     206    private System.Windows.Forms.ToolTip toolTip;
    174207  }
    175208}
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs

    r10739 r10762  
    3535
    3636    private bool notOwnEvent = true;
    37     private FindAndReplaceDialog findAndReplaceDialog;
     37    private SearchAndReplaceDialog findAndReplaceDialog;
    3838    private IFindPreprocessingItemsIterator searchIterator;
    3939    private string currentSearchText;
     
    159159
    160160    private void CreateFindAndReplaceDialog() {
    161       findAndReplaceDialog = new FindAndReplaceDialog();
     161      findAndReplaceDialog = new SearchAndReplaceDialog();
    162162      findAndReplaceDialog.Show(this);
    163163      HightlightedCellsBackground = GetSelectedCells();
     
    399399      Content.PreprocessingDataManipulation.ReplaceIndicesByLinearInterpolationOfNeighbours(GetSelectedCells());
    400400    }
     401
     402    private void button1_Click(object sender, EventArgs e) {
     403      CreateFindAndReplaceDialog();
     404      findAndReplaceDialog.ActivateSearch();
     405    }
     406
     407    private void btnReplace_Click(object sender, EventArgs e) {
     408      CreateFindAndReplaceDialog();
     409      findAndReplaceDialog.ActivateReplace();
     410    }
    401411  }
    402412}
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj

    r10738 r10762  
    8989      <DependentUpon>FilterView.cs</DependentUpon>
    9090    </Compile>
    91     <Compile Include="FindAndReplaceDialog.cs">
     91    <Compile Include="SearchAndReplaceDialog.cs">
    9292      <SubType>Form</SubType>
    9393    </Compile>
    94     <Compile Include="FindAndReplaceDialog.Designer.cs">
    95       <DependentUpon>FindAndReplaceDialog.cs</DependentUpon>
     94    <Compile Include="SearchAndReplaceDialog.Designer.cs">
     95      <DependentUpon>SearchAndReplaceDialog.cs</DependentUpon>
    9696    </Compile>
    9797    <Compile Include="HistogramView.cs">
     
    242242      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    243243    </ProjectReference>
     244  </ItemGroup>
     245  <ItemGroup>
     246    <EmbeddedResource Include="DataGridContentView.resx">
     247      <DependentUpon>DataGridContentView.cs</DependentUpon>
     248    </EmbeddedResource>
    244249  </ItemGroup>
    245250  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/SearchAndReplaceDialog.Designer.cs

    r10761 r10762  
    11namespace HeuristicLab.DataPreprocessing.Views {
    2   partial class FindAndReplaceDialog {
     2  partial class SearchAndReplaceDialog {
    33    /// <summary>
    44    /// Required designer variable.
     
    172172      this.label1.Text = "Replace with";
    173173      //
    174       // FindAndReplaceDialog
     174      // SearchAndReplaceDialog
    175175      //
    176176      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
     
    180180      this.MaximizeBox = false;
    181181      this.MinimizeBox = false;
    182       this.Name = "FindAndReplaceDialog";
     182      this.Name = "SearchAndReplaceDialog";
    183183      this.ShowIcon = false;
    184184      this.ShowInTaskbar = false;
    185       this.Text = "Find and Replace";
     185      this.Text = "Search and Replace";
    186186      this.tabSearchReplace.ResumeLayout(false);
    187187      this.tabReplace.ResumeLayout(false);
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/SearchAndReplaceDialog.cs

    r10761 r10762  
    1313  }
    1414
    15   public partial class FindAndReplaceDialog : Form {
     15  public partial class SearchAndReplaceDialog : Form {
    1616    private string[] cmbItemsText = { "Value", "Average", "Median", "Random", "Most Common", "Interpolation" };
    1717
    18     public FindAndReplaceDialog() {
     18    public SearchAndReplaceDialog() {
    1919      InitializeComponent();
    2020      cmbReplaceWith.Items.AddRange(cmbItemsText);
Note: See TracChangeset for help on using the changeset viewer.