Changeset 8881


Ignore:
Timestamp:
11/08/12 12:17:54 (10 years ago)
Author:
sforsten
Message:

#1292: renamed some controls

Location:
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/AbstractFeatureCorrelationView.Designer.cs

    r8880 r8881  
    4949      this.components = new System.ComponentModel.Container();
    5050      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AbstractFeatureCorrelationView));
    51       this.heatMapProgressBar = new System.Windows.Forms.ProgressBar();
     51      this.progressBar = new System.Windows.Forms.ProgressBar();
    5252      this.partitionComboBox = new System.Windows.Forms.ComboBox();
    5353      this.correlationCalcLabel = new System.Windows.Forms.Label();
     
    5858      this.pictureBox = new System.Windows.Forms.PictureBox();
    5959      this.splitContainer = new System.Windows.Forms.SplitContainer();
    60       this.calculatingPanel = new System.Windows.Forms.Panel();
    61       this.calculatingLabel = new System.Windows.Forms.Label();
     60      this.progressPanel = new System.Windows.Forms.Panel();
     61      this.progressLabel = new System.Windows.Forms.Label();
    6262      this.dataView = new HeuristicLab.Problems.DataAnalysis.Views.EnhancedStringConvertibleMatrixView();
    6363      ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
     
    6666      this.splitContainer.Panel2.SuspendLayout();
    6767      this.splitContainer.SuspendLayout();
    68       this.calculatingPanel.SuspendLayout();
     68      this.progressPanel.SuspendLayout();
    6969      this.SuspendLayout();
    7070      //
    7171      // HeatMapProgressBar
    7272      //
    73       this.heatMapProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
    74       this.heatMapProgressBar.Location = new System.Drawing.Point(25, 46);
    75       this.heatMapProgressBar.Name = "HeatMapProgressBar";
    76       this.heatMapProgressBar.RightToLeft = System.Windows.Forms.RightToLeft.No;
    77       this.heatMapProgressBar.Size = new System.Drawing.Size(154, 21);
    78       this.heatMapProgressBar.TabIndex = 9;
     73      this.progressBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
     74      this.progressBar.Location = new System.Drawing.Point(25, 46);
     75      this.progressBar.Name = "HeatMapProgressBar";
     76      this.progressBar.RightToLeft = System.Windows.Forms.RightToLeft.No;
     77      this.progressBar.Size = new System.Drawing.Size(154, 21);
     78      this.progressBar.TabIndex = 9;
    7979      //
    8080      // PartitionComboBox
     
    171171      // SplitContainer.Panel2
    172172      //
    173       this.splitContainer.Panel2.Controls.Add(this.calculatingPanel);
     173      this.splitContainer.Panel2.Controls.Add(this.progressPanel);
    174174      this.splitContainer.Panel2.Controls.Add(this.dataView);
    175175      this.splitContainer.Size = new System.Drawing.Size(475, 330);
     
    179179      // CalculatingPanel
    180180      //
    181       this.calculatingPanel.Anchor = System.Windows.Forms.AnchorStyles.None;
    182       this.calculatingPanel.Controls.Add(this.calculatingLabel);
    183       this.calculatingPanel.Controls.Add(this.heatMapProgressBar);
    184       this.calculatingPanel.Location = new System.Drawing.Point(138, 95);
    185       this.calculatingPanel.Name = "CalculatingPanel";
    186       this.calculatingPanel.Size = new System.Drawing.Size(200, 81);
    187       this.calculatingPanel.TabIndex = 10;
     181      this.progressPanel.Anchor = System.Windows.Forms.AnchorStyles.None;
     182      this.progressPanel.Controls.Add(this.progressLabel);
     183      this.progressPanel.Controls.Add(this.progressBar);
     184      this.progressPanel.Location = new System.Drawing.Point(138, 95);
     185      this.progressPanel.Name = "CalculatingPanel";
     186      this.progressPanel.Size = new System.Drawing.Size(200, 81);
     187      this.progressPanel.TabIndex = 10;
    188188      //
    189189      // CalculatingLabel
    190190      //
    191       this.calculatingLabel.AutoSize = true;
    192       this.calculatingLabel.Location = new System.Drawing.Point(42, 19);
    193       this.calculatingLabel.Name = "CalculatingLabel";
    194       this.calculatingLabel.Size = new System.Drawing.Size(120, 13);
    195       this.calculatingLabel.TabIndex = 10;
    196       this.calculatingLabel.Text = "Calculating correlation...";
     191      this.progressLabel.AutoSize = true;
     192      this.progressLabel.Location = new System.Drawing.Point(42, 19);
     193      this.progressLabel.Name = "CalculatingLabel";
     194      this.progressLabel.Size = new System.Drawing.Size(120, 13);
     195      this.progressLabel.TabIndex = 10;
     196      this.progressLabel.Text = "Calculating correlation...";
    197197      //
    198198      // DataGridView
     
    221221      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
    222222      this.splitContainer.ResumeLayout(false);
    223       this.calculatingPanel.ResumeLayout(false);
    224       this.calculatingPanel.PerformLayout();
     223      this.progressPanel.ResumeLayout(false);
     224      this.progressPanel.PerformLayout();
    225225      this.ResumeLayout(false);
    226226
     
    229229    #endregion
    230230
    231     protected System.Windows.Forms.ProgressBar heatMapProgressBar;
     231    protected System.Windows.Forms.ProgressBar progressBar;
    232232    protected System.Windows.Forms.ComboBox partitionComboBox;
    233233    protected System.Windows.Forms.Label correlationCalcLabel;
     
    238238    protected System.Windows.Forms.PictureBox pictureBox;
    239239    protected System.Windows.Forms.SplitContainer splitContainer;
    240     protected System.Windows.Forms.Panel calculatingPanel;
    241     protected System.Windows.Forms.Label calculatingLabel;
     240    protected System.Windows.Forms.Panel progressPanel;
     241    protected System.Windows.Forms.Label progressLabel;
    242242    protected HeuristicLab.Problems.DataAnalysis.Views.EnhancedStringConvertibleMatrixView dataView;
    243243
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/AbstractFeatureCorrelationView.cs

    r8880 r8881  
    118118
    119119    protected void Content_ProgressCalculation(object sender, ProgressChangedEventArgs e) {
    120       if (!calculatingPanel.Visible && e.ProgressPercentage != heatMapProgressBar.Maximum) {
    121         calculatingPanel.Show();
    122       } else if (e.ProgressPercentage == heatMapProgressBar.Maximum) {
    123         calculatingPanel.Hide();
     120      if (!progressPanel.Visible && e.ProgressPercentage != progressBar.Maximum) {
     121        progressPanel.Show();
     122      } else if (e.ProgressPercentage == progressBar.Maximum) {
     123        progressPanel.Hide();
    124124      }
    125       heatMapProgressBar.Value = e.ProgressPercentage;
     125      progressBar.Value = e.ProgressPercentage;
    126126    }
    127127  }
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/TimeframeFeatureCorrelationView.Designer.cs

    r8880 r8881  
    5959      this.splitContainer.Panel2.SuspendLayout();
    6060      this.splitContainer.SuspendLayout();
    61       this.calculatingPanel.SuspendLayout();
     61      this.progressPanel.SuspendLayout();
    6262      this.SuspendLayout();
    6363      //
     
    9494      // CalculatingPanel
    9595      //
    96       this.calculatingPanel.Location = new System.Drawing.Point(138, 82);
     96      this.progressPanel.Location = new System.Drawing.Point(138, 82);
    9797      //
    9898      // VariableSelectionLabel
     
    147147      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
    148148      this.splitContainer.ResumeLayout(false);
    149       this.calculatingPanel.ResumeLayout(false);
    150       this.calculatingPanel.PerformLayout();
     149      this.progressPanel.ResumeLayout(false);
     150      this.progressPanel.PerformLayout();
    151151      this.ResumeLayout(false);
    152152
Note: See TracChangeset for help on using the changeset viewer.