Ignore:
Timestamp:
07/08/15 12:53:55 (7 years ago)
Author:
mkommend
Message:

#2335: Merged changes into trunk.

Location:
trunk/sources/HeuristicLab.DataPreprocessing.Views
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.DataPreprocessing.Views

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Viewsmergedeligible
      /stable/HeuristicLab.DataPreprocessing.Viewsmergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing.Views10321-10322
      /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing.Views5516-5520
      /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing.Views6917-7005
      /branches/CloningRefactoring/HeuristicLab.DataPreprocessing.Views4656-4721
      /branches/CodeEditor/HeuristicLab.DataPreprocessing.Views11700-11806
      /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing.Views5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing.Views5815-6180
      /branches/DataAnalysis/HeuristicLab.DataPreprocessing.Views4458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views10085-11101
      /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing.Views6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing.Views5060
      /branches/HLScript/HeuristicLab.DataPreprocessing.Views10331-10358
      /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.DataPreprocessing.Views11570-12508
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing.Views6123-9799
      /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing.Views10202-10483
      /branches/NET40/sources/HeuristicLab.DataPreprocessing.Views5138-5162
      /branches/NSGA-II Changes/HeuristicLab.DataPreprocessing.Views12033-12122
      /branches/ParallelEngine/HeuristicLab.DataPreprocessing.Views5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing.Views7568-7810
      /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing.Views6350-6627
      /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing.Views6828
      /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing.Views8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing.Views7787-8333
      /branches/SlaveShutdown/HeuristicLab.DataPreprocessing.Views8944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing.Views10204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing.Views5370-5682
      /branches/Trunk/HeuristicLab.DataPreprocessing.Views6829-6865
      /branches/UnloadJobs/HeuristicLab.DataPreprocessing.Views9168-9215
      /branches/VNS/HeuristicLab.DataPreprocessing.Views5594-5752
      /branches/histogram/HeuristicLab.DataPreprocessing.Views5959-6341
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.Designer.cs

    r11043 r12676  
    2525    private void InitializeComponent() {
    2626      this.optionsBox = new System.Windows.Forms.GroupBox();
     27      this.displayDetailsCheckBox = new System.Windows.Forms.CheckBox();
    2728      this.label1 = new System.Windows.Forms.Label();
    2829      this.classifierComboBox = new System.Windows.Forms.ComboBox();
     
    3334      //
    3435      this.optionsBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     36      this.optionsBox.Controls.Add(this.displayDetailsCheckBox);
    3537      this.optionsBox.Controls.Add(this.label1);
    3638      this.optionsBox.Controls.Add(this.classifierComboBox);
    37       this.optionsBox.Location = new System.Drawing.Point(4, 263);
     39      this.optionsBox.Location = new System.Drawing.Point(5, 324);
     40      this.optionsBox.Margin = new System.Windows.Forms.Padding(4);
    3841      this.optionsBox.Name = "optionsBox";
    39       this.optionsBox.Size = new System.Drawing.Size(152, 134);
     42      this.optionsBox.Padding = new System.Windows.Forms.Padding(4);
     43      this.optionsBox.Size = new System.Drawing.Size(203, 165);
    4044      this.optionsBox.TabIndex = 7;
    4145      this.optionsBox.TabStop = false;
    4246      this.optionsBox.Text = "Options";
    4347      //
     48      // displayDetailsCheckBox
     49      //
     50      this.displayDetailsCheckBox.AutoSize = true;
     51      this.displayDetailsCheckBox.Location = new System.Drawing.Point(7, 71);
     52      this.displayDetailsCheckBox.Name = "displayDetailsCheckBox";
     53      this.displayDetailsCheckBox.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
     54      this.displayDetailsCheckBox.Size = new System.Drawing.Size(153, 21);
     55      this.displayDetailsCheckBox.TabIndex = 3;
     56      this.displayDetailsCheckBox.Text = "Display value count";
     57      this.displayDetailsCheckBox.UseVisualStyleBackColor = true;
     58      this.displayDetailsCheckBox.CheckedChanged += new System.EventHandler(this.displayDetailsCheckBox_CheckedChanged);
     59      //
    4460      // label1
    4561      //
    4662      this.label1.AutoSize = true;
    47       this.label1.Location = new System.Drawing.Point(6, 26);
     63      this.label1.Location = new System.Drawing.Point(4, 19);
     64      this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    4865      this.label1.Name = "label1";
    49       this.label1.Size = new System.Drawing.Size(91, 13);
     66      this.label1.Size = new System.Drawing.Size(108, 17);
    5067      this.label1.TabIndex = 2;
    51       this.label1.Text = "Classifier variable:";
     68      this.label1.Text = "Target variable:";
    5269      //
    5370      // classifierComboBox
     
    5572      this.classifierComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    5673      this.classifierComboBox.FormattingEnabled = true;
    57       this.classifierComboBox.Location = new System.Drawing.Point(9, 52);
     74      this.classifierComboBox.Location = new System.Drawing.Point(7, 40);
     75      this.classifierComboBox.Margin = new System.Windows.Forms.Padding(4);
    5876      this.classifierComboBox.Name = "classifierComboBox";
    59       this.classifierComboBox.Size = new System.Drawing.Size(121, 21);
     77      this.classifierComboBox.Size = new System.Drawing.Size(160, 24);
    6078      this.classifierComboBox.TabIndex = 1;
    6179      this.classifierComboBox.SelectedIndexChanged += new System.EventHandler(this.classifierComboBox_SelectedIndexChanged);
     
    6381      // HistogramView
    6482      //
    65       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
     83      this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
    6684      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    6785      this.Controls.Add(this.optionsBox);
     86      this.Margin = new System.Windows.Forms.Padding(5);
    6887      this.Name = "HistogramView";
    6988      this.Controls.SetChildIndex(this.optionsBox, 0);
     
    7998    private System.Windows.Forms.ComboBox classifierComboBox;
    8099    private System.Windows.Forms.Label label1;
     100    private System.Windows.Forms.CheckBox displayDetailsCheckBox;
    81101
    82102  }
Note: See TracChangeset for help on using the changeset viewer.