Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/12/17 21:59:49 (7 years ago)
Author:
abeham
Message:

#2634, #2744, #745: merged revisions 14102, 14647, 14652, 14654, 14734, 14737, 14775, 15048, 15125, 15126 to stable, reverted changes from revision 15153

Location:
stable
Files:
2 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Optimization.Views

  • stable/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionRLDView.Designer.cs

    r14102 r15220  
    4545    private void InitializeComponent() {
    4646      this.components = new System.ComponentModel.Container();
    47       System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
    48       System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
     47      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
     48      System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
    4949      this.dataTableComboBox = new System.Windows.Forms.ComboBox();
    5050      this.dataTableLabel = new System.Windows.Forms.Label();
     
    6464      this.tabControl = new System.Windows.Forms.TabControl();
    6565      this.byTargetTabPage = new System.Windows.Forms.TabPage();
     66      this.relativeOrAbsoluteComboBox = new System.Windows.Forms.ComboBox();
    6667      this.targetChart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
     68      this.showLabelsCheckBox = new System.Windows.Forms.CheckBox();
     69      this.markerCheckBox = new System.Windows.Forms.CheckBox();
    6770      this.boundShadingCheckBox = new System.Windows.Forms.CheckBox();
    6871      this.byCostTabPage = new System.Windows.Forms.TabPage();
    6972      this.byCostViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    7073      this.budgetLogScalingCheckBox = new System.Windows.Forms.CheckBox();
    71       this.eachOrAllBudgetsCheckBox = new System.Windows.Forms.CheckBox();
    7274      this.generateBudgetsButton = new System.Windows.Forms.Button();
    7375      this.byTableTabPage = new System.Windows.Forms.TabPage();
     
    143145      this.targetsTextBox.Location = new System.Drawing.Point(59, 8);
    144146      this.targetsTextBox.Name = "targetsTextBox";
    145       this.targetsTextBox.Size = new System.Drawing.Size(287, 20);
     147      this.targetsTextBox.Size = new System.Drawing.Size(204, 20);
    146148      this.targetsTextBox.TabIndex = 1;
    147149      this.toolTip.SetToolTip(this.targetsTextBox, "The order of the targets is important, first to-hit targets\r\nshould be given firs" +
     
    200202      this.budgetsTextBox.Location = new System.Drawing.Point(59, 8);
    201203      this.budgetsTextBox.Name = "budgetsTextBox";
    202       this.budgetsTextBox.Size = new System.Drawing.Size(326, 20);
     204      this.budgetsTextBox.Size = new System.Drawing.Size(391, 20);
    203205      this.budgetsTextBox.TabIndex = 6;
    204206      this.budgetsTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.budgetsTextBox_Validating);
     
    221223      this.aggregateTargetsCheckBox.Checked = true;
    222224      this.aggregateTargetsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
    223       this.aggregateTargetsCheckBox.Location = new System.Drawing.Point(352, 10);
     225      this.aggregateTargetsCheckBox.Location = new System.Drawing.Point(374, 10);
    224226      this.aggregateTargetsCheckBox.Name = "aggregateTargetsCheckBox";
    225227      this.aggregateTargetsCheckBox.Size = new System.Drawing.Size(74, 17);
     
    245247      // byTargetTabPage
    246248      //
     249      this.byTargetTabPage.Controls.Add(this.relativeOrAbsoluteComboBox);
    247250      this.byTargetTabPage.Controls.Add(this.targetChart);
     251      this.byTargetTabPage.Controls.Add(this.showLabelsCheckBox);
     252      this.byTargetTabPage.Controls.Add(this.markerCheckBox);
    248253      this.byTargetTabPage.Controls.Add(this.boundShadingCheckBox);
    249254      this.byTargetTabPage.Controls.Add(this.targetLogScalingCheckBox);
     
    261266      this.byTargetTabPage.UseVisualStyleBackColor = true;
    262267      //
     268      // relativeOrAbsoluteComboBox
     269      //
     270      this.relativeOrAbsoluteComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
     271      this.relativeOrAbsoluteComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     272      this.relativeOrAbsoluteComboBox.FormattingEnabled = true;
     273      this.relativeOrAbsoluteComboBox.Items.AddRange(new object[] {
     274            "relative",
     275            "absolute"});
     276      this.relativeOrAbsoluteComboBox.Location = new System.Drawing.Point(269, 8);
     277      this.relativeOrAbsoluteComboBox.Name = "relativeOrAbsoluteComboBox";
     278      this.relativeOrAbsoluteComboBox.Size = new System.Drawing.Size(99, 21);
     279      this.relativeOrAbsoluteComboBox.TabIndex = 8;
     280      this.relativeOrAbsoluteComboBox.SelectedIndexChanged += new System.EventHandler(this.relativeOrAbsoluteComboBox_SelectedIndexChanged);
     281      //
    263282      // targetChart
    264283      //
     
    266285            | System.Windows.Forms.AnchorStyles.Left)
    267286            | System.Windows.Forms.AnchorStyles.Right)));
    268       chartArea1.AxisX.IsStartedFromZero = false;
    269       chartArea1.AxisX.MinorGrid.Enabled = true;
    270       chartArea1.AxisX.MinorGrid.LineColor = System.Drawing.Color.WhiteSmoke;
    271       chartArea1.AxisX.MinorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Dash;
    272       chartArea1.AxisY.Maximum = 1D;
    273       chartArea1.AxisY.Minimum = 0D;
    274       chartArea1.AxisY.MinorGrid.Enabled = true;
    275       chartArea1.AxisY.MinorGrid.LineColor = System.Drawing.Color.WhiteSmoke;
    276       chartArea1.AxisY.MinorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Dash;
    277       chartArea1.Name = "ChartArea1";
    278       this.targetChart.ChartAreas.Add(chartArea1);
    279       legend1.Alignment = System.Drawing.StringAlignment.Center;
    280       legend1.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Top;
    281       legend1.Name = "Legend1";
    282       this.targetChart.Legends.Add(legend1);
     287      chartArea2.AxisX.IsStartedFromZero = false;
     288      chartArea2.AxisX.MinorGrid.Enabled = true;
     289      chartArea2.AxisX.MinorGrid.LineColor = System.Drawing.Color.WhiteSmoke;
     290      chartArea2.AxisX.MinorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Dash;
     291      chartArea2.AxisY.Maximum = 1D;
     292      chartArea2.AxisY.Minimum = 0D;
     293      chartArea2.AxisY.MinorGrid.Enabled = true;
     294      chartArea2.AxisY.MinorGrid.LineColor = System.Drawing.Color.WhiteSmoke;
     295      chartArea2.AxisY.MinorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Dash;
     296      chartArea2.Name = "ChartArea1";
     297      this.targetChart.ChartAreas.Add(chartArea2);
     298      legend2.Alignment = System.Drawing.StringAlignment.Center;
     299      legend2.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Top;
     300      legend2.Name = "Legend1";
     301      this.targetChart.Legends.Add(legend2);
    283302      this.targetChart.Location = new System.Drawing.Point(6, 34);
    284303      this.targetChart.Name = "targetChart";
     
    290309      this.targetChart.MouseDown += new System.Windows.Forms.MouseEventHandler(this.chart_MouseDown);
    291310      this.targetChart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove);
     311      //
     312      // showLabelsCheckBox
     313      //
     314      this.showLabelsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     315      this.showLabelsCheckBox.AutoSize = true;
     316      this.showLabelsCheckBox.Checked = true;
     317      this.showLabelsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
     318      this.showLabelsCheckBox.Location = new System.Drawing.Point(329, 364);
     319      this.showLabelsCheckBox.Name = "showLabelsCheckBox";
     320      this.showLabelsCheckBox.Size = new System.Drawing.Size(81, 17);
     321      this.showLabelsCheckBox.TabIndex = 6;
     322      this.showLabelsCheckBox.Text = "show labels";
     323      this.showLabelsCheckBox.UseVisualStyleBackColor = true;
     324      this.showLabelsCheckBox.CheckedChanged += new System.EventHandler(this.showLabelsCheckBox_CheckedChanged);
     325      //
     326      // markerCheckBox
     327      //
     328      this.markerCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     329      this.markerCheckBox.AutoSize = true;
     330      this.markerCheckBox.Location = new System.Drawing.Point(229, 364);
     331      this.markerCheckBox.Name = "markerCheckBox";
     332      this.markerCheckBox.Size = new System.Drawing.Size(91, 17);
     333      this.markerCheckBox.TabIndex = 6;
     334      this.markerCheckBox.Text = "show markers";
     335      this.markerCheckBox.UseVisualStyleBackColor = true;
     336      this.markerCheckBox.CheckedChanged += new System.EventHandler(this.markerCheckBox_CheckedChanged);
    292337      //
    293338      // boundShadingCheckBox
     
    309354      this.byCostTabPage.Controls.Add(this.byCostViewHost);
    310355      this.byCostTabPage.Controls.Add(this.budgetLogScalingCheckBox);
    311       this.byCostTabPage.Controls.Add(this.eachOrAllBudgetsCheckBox);
    312356      this.byCostTabPage.Controls.Add(this.generateBudgetsButton);
    313357      this.byCostTabPage.Controls.Add(this.budgetsLabel);
     
    349393      this.budgetLogScalingCheckBox.UseVisualStyleBackColor = true;
    350394      this.budgetLogScalingCheckBox.CheckedChanged += new System.EventHandler(this.logScalingCheckBox_CheckedChanged);
    351       //
    352       // eachOrAllBudgetsCheckBox
    353       //
    354       this.eachOrAllBudgetsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    355       this.eachOrAllBudgetsCheckBox.AutoSize = true;
    356       this.eachOrAllBudgetsCheckBox.Location = new System.Drawing.Point(414, 10);
    357       this.eachOrAllBudgetsCheckBox.Name = "eachOrAllBudgetsCheckBox";
    358       this.eachOrAllBudgetsCheckBox.Size = new System.Drawing.Size(36, 17);
    359       this.eachOrAllBudgetsCheckBox.TabIndex = 10;
    360       this.eachOrAllBudgetsCheckBox.Text = "all";
    361       this.eachOrAllBudgetsCheckBox.UseVisualStyleBackColor = true;
    362       this.eachOrAllBudgetsCheckBox.CheckedChanged += new System.EventHandler(this.eachOrAllBudgetsCheckBox_CheckedChanged);
    363395      //
    364396      // generateBudgetsButton
     
    464496    private System.Windows.Forms.TabPage byCostTabPage;
    465497    private System.Windows.Forms.TabPage byTableTabPage;
    466     private System.Windows.Forms.CheckBox eachOrAllBudgetsCheckBox;
    467498    private System.Windows.Forms.Button generateBudgetsButton;
    468499    private System.Windows.Forms.CheckBox budgetLogScalingCheckBox;
     
    473504    private MainForm.WindowsForms.ViewHost byCostViewHost;
    474505    private System.Windows.Forms.CheckBox boundShadingCheckBox;
     506    private System.Windows.Forms.CheckBox markerCheckBox;
     507    private System.Windows.Forms.ComboBox relativeOrAbsoluteComboBox;
     508    private System.Windows.Forms.CheckBox showLabelsCheckBox;
    475509  }
    476510}
Note: See TracChangeset for help on using the changeset viewer.