Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/02/20 15:53:52 (4 years ago)
Author:
dpiringe
Message:

#3026:

  • Runner now uses SymbolicDataAnalysisExpressionMATLABFormatter to save instances of ISymbolicRegressionSolution
  • refactored user controls for detail view of json items, now they do not inherit from JsonItemBaseControl -> JsonItemBaseControl uses now an extra control
    • this change was made for fluid repositioning of controls (e.g. when no ActualName is present)
Location:
branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemBoolControl.Designer.cs

    r17446 r17464  
    2626      this.checkBoxValue = new System.Windows.Forms.CheckBox();
    2727      this.label2 = new System.Windows.Forms.Label();
    28       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    2928      this.SuspendLayout();
    3029      //
    … …  
    3433            | System.Windows.Forms.AnchorStyles.Right)));
    3534      this.checkBoxValue.AutoSize = true;
    36       this.checkBoxValue.Location = new System.Drawing.Point(92, 101);
     35      this.checkBoxValue.Location = new System.Drawing.Point(89, 1);
    3736      this.checkBoxValue.Name = "checkBoxValue";
    3837      this.checkBoxValue.Size = new System.Drawing.Size(15, 14);
    … …  
    4342      //
    4443      this.label2.AutoSize = true;
    45       this.label2.Location = new System.Drawing.Point(6, 102);
     44      this.label2.Location = new System.Drawing.Point(3, 1);
    4645      this.label2.Name = "label2";
    4746      this.label2.Size = new System.Drawing.Size(34, 13);
    … …  
    5352      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    5453      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     54      this.Controls.Add(this.checkBoxValue);
    5555      this.Controls.Add(this.label2);
    56       this.Controls.Add(this.checkBoxValue);
    57       this.errorProvider.SetIconAlignment(this, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    5856      this.Name = "JsonItemBoolControl";
    59       this.Size = new System.Drawing.Size(500, 121);
    60       this.Controls.SetChildIndex(this.checkBoxValue, 0);
    61       this.Controls.SetChildIndex(this.label2, 0);
    62       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
     57      this.Size = new System.Drawing.Size(500, 15);
    6358      this.ResumeLayout(false);
    6459      this.PerformLayout();

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemBoolControl.cs

    r17412 r17464  
    1010
    1111namespace HeuristicLab.JsonInterface.OptimizerIntegration {
    12   public partial class JsonItemBoolControl : JsonItemBaseControl {
    13     private BoolValueVM VM { get; set; }
    14 
    15     public JsonItemBoolControl(BoolValueVM vm) : base(vm) {
     12  public partial class JsonItemBoolControl : UserControl {
     13    public JsonItemBoolControl(BoolValueVM vm) {
    1614      InitializeComponent();
    17       VM = vm;
    18       checkBoxValue.DataBindings.Add("Checked", VM, nameof(BoolValueVM.Value));
     15      checkBoxValue.DataBindings.Add("Checked", vm, nameof(BoolValueVM.Value));
    1916    }
    2017  }

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemBoolControl.resx

    r17446 r17464  
    118118    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    119119  </resheader>
    120   <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    121     <value>17, 17</value>
    122   </metadata>
    123120</root>

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemMultiValueControl.Designer.cs

    r17446 r17464  
    2424    /// </summary>
    2525    private void InitializeComponent() {
     26      this.components = new System.ComponentModel.Container();
    2627      this.dataGridView = new System.Windows.Forms.DataGridView();
    2728      this.numericRangeControl1 = new HeuristicLab.JsonInterface.OptimizerIntegration.NumericRangeControl();
    2829      this.groupBox1 = new System.Windows.Forms.GroupBox();
     30      this.textBoxColumns = new System.Windows.Forms.TextBox();
    2931      this.textBoxRows = new System.Windows.Forms.TextBox();
    3032      this.checkBoxColumns = new System.Windows.Forms.CheckBox();
    3133      this.checkBoxRows = new System.Windows.Forms.CheckBox();
    32       this.textBoxColumns = new System.Windows.Forms.TextBox();
    33       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
     34      this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
    3435      ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
    3536      this.groupBox1.SuspendLayout();
     37      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    3638      this.SuspendLayout();
    3739      //
    … …  
    4648            | System.Windows.Forms.AnchorStyles.Right)));
    4749      this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
    48       this.dataGridView.Location = new System.Drawing.Point(6, 67);
     50      this.dataGridView.Location = new System.Drawing.Point(9, 70);
    4951      this.dataGridView.Name = "dataGridView";
    50       this.dataGridView.Size = new System.Drawing.Size(473, 192);
     52      this.dataGridView.Size = new System.Drawing.Size(487, 143);
    5153      this.dataGridView.TabIndex = 13;
    5254      //
    … …  
    5557      this.numericRangeControl1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
    5658            | System.Windows.Forms.AnchorStyles.Right)));
    57       this.numericRangeControl1.Location = new System.Drawing.Point(9, 372);
     59      this.numericRangeControl1.Location = new System.Drawing.Point(0, 225);
    5860      this.numericRangeControl1.Name = "numericRangeControl1";
    59       this.numericRangeControl1.Size = new System.Drawing.Size(487, 71);
     61      this.numericRangeControl1.Size = new System.Drawing.Size(502, 71);
    6062      this.numericRangeControl1.TabIndex = 14;
    6163      //
    6264      // groupBox1
    6365      //
     66      this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     67            | System.Windows.Forms.AnchorStyles.Left)
     68            | System.Windows.Forms.AnchorStyles.Right)));
    6469      this.groupBox1.Controls.Add(this.textBoxColumns);
    6570      this.groupBox1.Controls.Add(this.textBoxRows);
    … …  
    6772      this.groupBox1.Controls.Add(this.checkBoxRows);
    6873      this.groupBox1.Controls.Add(this.dataGridView);
    69       this.groupBox1.Location = new System.Drawing.Point(9, 101);
     74      this.groupBox1.Location = new System.Drawing.Point(0, 0);
     75      this.groupBox1.Margin = new System.Windows.Forms.Padding(0);
    7076      this.groupBox1.Name = "groupBox1";
    71       this.groupBox1.Size = new System.Drawing.Size(485, 265);
     77      this.groupBox1.Size = new System.Drawing.Size(502, 222);
    7278      this.groupBox1.TabIndex = 15;
    7379      this.groupBox1.TabStop = false;
    7480      this.groupBox1.Text = "Value";
    75       this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    76             | System.Windows.Forms.AnchorStyles.Left)
     81      //
     82      // textBoxColumns
     83      //
     84      this.textBoxColumns.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    7785            | System.Windows.Forms.AnchorStyles.Right)));
     86      this.errorProvider.SetIconAlignment(this.textBoxRows, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     87      this.textBoxColumns.Location = new System.Drawing.Point(86, 46);
     88      this.textBoxColumns.Name = "textBoxColumns";
     89      this.textBoxColumns.ReadOnly = true;
     90      this.textBoxColumns.Size = new System.Drawing.Size(410, 20);
     91      this.textBoxColumns.TabIndex = 17;
     92      this.textBoxColumns.TextChanged += new System.EventHandler(this.textBoxColumns_TextChanged);
     93      this.textBoxColumns.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxColumns_Validating);
    7894      //
    7995      // textBoxRows
    8096      //
    8197      this.textBoxRows.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    82             | System.Windows.Forms.AnchorStyles.Right)));
    83       this.errorProvider.SetIconAlignment(this.textBoxRows, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    84       this.textBoxRows.Location = new System.Drawing.Point(83, 17);
     98            | System.Windows.Forms.AnchorStyles.Right))); 
     99      this.errorProvider.SetIconAlignment(this.textBoxColumns, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     100      this.textBoxRows.Location = new System.Drawing.Point(86, 20);
    85101      this.textBoxRows.Name = "textBoxRows";
    86102      this.textBoxRows.ReadOnly = true;
    87       this.textBoxRows.Size = new System.Drawing.Size(396, 20);
     103      this.textBoxRows.Size = new System.Drawing.Size(410, 20);
    88104      this.textBoxRows.TabIndex = 16;
    89105      this.textBoxRows.TextChanged += new System.EventHandler(this.textBoxRows_TextChanged);
    … …  
    93109      //
    94110      this.checkBoxColumns.AutoSize = true;
    95       this.checkBoxColumns.Location = new System.Drawing.Point(7, 43);
     111      this.checkBoxColumns.Location = new System.Drawing.Point(10, 46);
    96112      this.checkBoxColumns.Name = "checkBoxColumns";
    97113      this.checkBoxColumns.Size = new System.Drawing.Size(69, 17);
    … …  
    103119      //
    104120      this.checkBoxRows.AutoSize = true;
    105       this.checkBoxRows.Location = new System.Drawing.Point(7, 20);
     121      this.checkBoxRows.Location = new System.Drawing.Point(10, 23);
    106122      this.checkBoxRows.Name = "checkBoxRows";
    107123      this.checkBoxRows.Size = new System.Drawing.Size(56, 17);
    … …  
    110126      this.checkBoxRows.UseVisualStyleBackColor = true;
    111127      //
    112       // textBoxColumns
     128      // errorProvider
    113129      //
    114       this.textBoxColumns.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    115             | System.Windows.Forms.AnchorStyles.Right)));
    116       this.errorProvider.SetIconAlignment(this.textBoxColumns, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    117       this.textBoxColumns.Location = new System.Drawing.Point(83, 43);
    118       this.textBoxColumns.Name = "textBoxColumns";
    119       this.textBoxColumns.ReadOnly = true;
    120       this.textBoxColumns.Size = new System.Drawing.Size(396, 20);
    121       this.textBoxColumns.TabIndex = 17;
    122       this.textBoxColumns.TextChanged += new System.EventHandler(this.textBoxColumns_TextChanged);
    123       this.textBoxColumns.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxColumns_Validating);
     130      this.errorProvider.ContainerControl = this;
    124131      //
    125132      // JsonItemMultiValueControl
    … …  
    131138      this.errorProvider.SetIconAlignment(this, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    132139      this.Name = "JsonItemMultiValueControl";
    133       this.Size = new System.Drawing.Size(502, 449);
    134       this.Controls.SetChildIndex(this.numericRangeControl1, 0);
    135       this.Controls.SetChildIndex(this.groupBox1, 0);
    136       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
     140      this.Size = new System.Drawing.Size(502, 296);
    137141      ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
    138142      this.groupBox1.ResumeLayout(false);
    139143      this.groupBox1.PerformLayout();
     144      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    140145      this.ResumeLayout(false);
    141       this.PerformLayout();
    142146
    143147    }
    … …  
    152156    private System.Windows.Forms.TextBox textBoxRows;
    153157    private System.Windows.Forms.TextBox textBoxColumns;
     158    private System.Windows.Forms.ErrorProvider errorProvider;
    154159  }
    155160}

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemMultiValueControl.cs

    r17451 r17464  
    1010
    1111namespace HeuristicLab.JsonInterface.OptimizerIntegration {
    12 
     12 
    1313  public class JsonItemDoubleNamedMatrixValueControl : JsonItemMultiValueControl<double> {
    1414    protected override IEnumerable<string> RowNames {
    … …  
    6565  }
    6666 
    67   public abstract partial class JsonItemMultiValueControl<T> : JsonItemBaseControl {
     67  public abstract partial class JsonItemMultiValueControl<T> : UserControl {
     68    protected IJsonItemVM VM { get; set; }
    6869    protected NumericRangeControl NumericRangeControl { get; set; }
    6970    private int _rows;
    … …  
    9091    protected abstract IEnumerable<string> ColumnNames { get; set; }
    9192
    92     public JsonItemMultiValueControl(IMatrixJsonItemVM vm, T[][] matrix) : base(vm) {
     93    public JsonItemMultiValueControl(IMatrixJsonItemVM vm, T[][] matrix) /*: base(vm)*/ {
    9394      InitializeComponent();
    94 
     95      VM = vm;
    9596      checkBoxRows.DataBindings.Add("Checked", vm, nameof(IMatrixJsonItemVM.RowsResizable));
    9697      checkBoxColumns.DataBindings.Add("Checked", vm, nameof(IMatrixJsonItemVM.ColumnsResizable));
    … …  
    108109    }
    109110   
    110     public JsonItemMultiValueControl(IArrayJsonItemVM vm, T[] array) : base(vm) {
     111    public JsonItemMultiValueControl(IArrayJsonItemVM vm, T[] array) /*: base(vm)*/ {
    111112      InitializeComponent();
    112 
     113      VM = vm;
    113114      checkBoxRows.DataBindings.Add("Checked", vm, nameof(IArrayJsonItemVM.Resizable));
    114115
    … …  
    117118      Matrix = new T[1][];
    118119      Matrix[0] = array;
    119       /*
    120       for (int r = 0; r < length; ++r) {
    121         Matrix[r] = new T[1];
    122         Matrix[r][0] = array[r];
    123       }
    124       */
    125120      _cols = 1;
    126121      _rows = length;
    … …  
    158153      T[][] tmp = Matrix;
    159154      Matrix = new T[Columns][];
    160 
     155     
    161156      // columns must added first
    162157      if(RowNames != null && RowNames.Count() == Columns) {
    … …  
    191186      }
    192187      dataGridView.RowHeadersWidth = 100;
     188     
    193189    }
    194190

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemRangeControl.Designer.cs

    r17454 r17464  
    2424    /// </summary>
    2525    private void InitializeComponent() {
     26      this.components = new System.ComponentModel.Container();
    2627      this.groupBox1 = new System.Windows.Forms.GroupBox();
    2728      this.textBoxValueTo = new System.Windows.Forms.TextBox();
    … …  
    3031      this.label2 = new System.Windows.Forms.Label();
    3132      this.numericRangeControl = new HeuristicLab.JsonInterface.OptimizerIntegration.NumericRangeControl();
     33      this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
     34      this.groupBox1.SuspendLayout();
    3235      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    33       this.groupBox1.SuspendLayout();
    3436      this.SuspendLayout();
    3537      //
    … …  
    4244      this.groupBox1.Controls.Add(this.label4);
    4345      this.groupBox1.Controls.Add(this.label2);
    44       this.groupBox1.Location = new System.Drawing.Point(7, 101);
     46      this.groupBox1.Location = new System.Drawing.Point(0, 0);
     47      this.groupBox1.Margin = new System.Windows.Forms.Padding(0);
    4548      this.groupBox1.Name = "groupBox1";
    46       this.groupBox1.Size = new System.Drawing.Size(487, 65);
     49      this.groupBox1.Size = new System.Drawing.Size(500, 68);
    4750      this.groupBox1.TabIndex = 17;
    4851      this.groupBox1.TabStop = false;
    … …  
    5356      this.textBoxValueTo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    5457            | System.Windows.Forms.AnchorStyles.Right)));
    55       this.textBoxValueTo.Location = new System.Drawing.Point(83, 39);
     58      this.textBoxValueTo.Location = new System.Drawing.Point(85, 39);
    5659      this.textBoxValueTo.Name = "textBoxValueTo";
    57       this.textBoxValueTo.Size = new System.Drawing.Size(398, 20);
     60      this.textBoxValueTo.Size = new System.Drawing.Size(409, 20);
    5861      this.textBoxValueTo.TabIndex = 3;
    5962      //
    6063      // textBoxValueFrom
    6164      //
    62       this.textBoxValueFrom.Location = new System.Drawing.Point(83, 13);
     65      this.textBoxValueFrom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     66            | System.Windows.Forms.AnchorStyles.Right)));
     67      this.textBoxValueFrom.Location = new System.Drawing.Point(85, 13);
    6368      this.textBoxValueFrom.Name = "textBoxValueFrom";
    64       this.textBoxValueFrom.Size = new System.Drawing.Size(398, 20);
     69      this.textBoxValueFrom.Size = new System.Drawing.Size(409, 20);
    6570      this.textBoxValueFrom.TabIndex = 2;
    6671      //
    … …  
    9196      this.numericRangeControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    9297            | System.Windows.Forms.AnchorStyles.Right)));
    93       this.numericRangeControl.Location = new System.Drawing.Point(7, 172);
     98      this.numericRangeControl.Location = new System.Drawing.Point(0, 71);
    9499      this.numericRangeControl.Name = "numericRangeControl";
    95       this.numericRangeControl.Size = new System.Drawing.Size(487, 74);
     100      this.numericRangeControl.Size = new System.Drawing.Size(500, 74);
    96101      this.numericRangeControl.TabIndex = 18;
     102      //
     103      // errorProvider
     104      //
     105      this.errorProvider.ContainerControl = this;
    97106      //
    98107      // JsonItemRangeControl
    … …  
    104113      this.errorProvider.SetIconAlignment(this, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    105114      this.Name = "JsonItemRangeControl";
    106       this.Size = new System.Drawing.Size(500, 252);
    107       this.Controls.SetChildIndex(this.groupBox1, 0);
    108       this.Controls.SetChildIndex(this.numericRangeControl, 0);
    109       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
     115      this.Size = new System.Drawing.Size(500, 146);
    110116      this.groupBox1.ResumeLayout(false);
    111117      this.groupBox1.PerformLayout();
     118      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    112119      this.ResumeLayout(false);
    113       this.PerformLayout();
    114120
    115121    }
    … …  
    123129    private System.Windows.Forms.Label label2;
    124130    private NumericRangeControl numericRangeControl;
     131    private System.Windows.Forms.ErrorProvider errorProvider;
    125132  }
    126133}

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemRangeControl.cs

    r17454 r17464  
    1111
    1212namespace HeuristicLab.JsonInterface.OptimizerIntegration {
    13   public partial class JsonItemRangeControl : JsonItemBaseControl {
     13  public partial class JsonItemRangeControl : UserControl {
     14    IJsonItemVM VM { get; set; }
    1415
    15     public JsonItemRangeControl(DoubleRangeVM vm) : base(vm) {
     16
     17    public JsonItemRangeControl(DoubleRangeVM vm) {
    1618      InitializeComponent();
     19      VM = vm;
    1720      textBoxValueFrom.DataBindings.Add("Text", vm, nameof(vm.MinValue));
    1821      textBoxValueTo.DataBindings.Add("Text", vm, nameof(vm.MaxValue));
    … …  
    2023
    2124    }
    22     public JsonItemRangeControl(IntRangeVM vm) : base(vm) {
     25    public JsonItemRangeControl(IntRangeVM vm) {
    2326      InitializeComponent();
     27      VM = vm;
    2428      textBoxValueFrom.DataBindings.Add("Text", vm, nameof(vm.MinValue));
    2529      textBoxValueTo.DataBindings.Add("Text", vm, nameof(vm.MaxValue));

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValidValuesControl.Designer.cs

    r17446 r17464  
    2424    /// </summary>
    2525    private void InitializeComponent() {
     26      this.components = new System.ComponentModel.Container();
    2627      this.tableOptions = new System.Windows.Forms.TableLayoutPanel();
    2728      this.comboBoxValues = new System.Windows.Forms.ComboBox();
    2829      this.label2 = new System.Windows.Forms.Label();
    2930      this.groupBoxRange = new System.Windows.Forms.GroupBox();
     31      this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
    3032      this.groupBoxRange.SuspendLayout();
     33      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    3134      this.SuspendLayout();
    3235      //
    … …  
    4447      this.tableOptions.RowCount = 1;
    4548      this.tableOptions.RowStyles.Add(new System.Windows.Forms.RowStyle());
    46       this.tableOptions.Size = new System.Drawing.Size(482, 170);
     49      this.tableOptions.Size = new System.Drawing.Size(491, 190);
    4750      this.tableOptions.TabIndex = 12;
    4851      //
    … …  
    5356      this.comboBoxValues.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    5457      this.comboBoxValues.FormattingEnabled = true;
    55       this.comboBoxValues.Location = new System.Drawing.Point(92, 101);
     58      this.comboBoxValues.Location = new System.Drawing.Point(89, 1);
     59      this.comboBoxValues.Margin = new System.Windows.Forms.Padding(0);
    5660      this.comboBoxValues.Name = "comboBoxValues";
    57       this.comboBoxValues.Size = new System.Drawing.Size(402, 21);
     61      this.comboBoxValues.Size = new System.Drawing.Size(408, 21);
    5862      this.comboBoxValues.TabIndex = 15;
    5963      //
    … …  
    6165      //
    6266      this.label2.AutoSize = true;
    63       this.label2.Location = new System.Drawing.Point(6, 104);
     67      this.label2.Location = new System.Drawing.Point(3, 1);
    6468      this.label2.Name = "label2";
    6569      this.label2.Size = new System.Drawing.Size(34, 13);
    … …  
    7377            | System.Windows.Forms.AnchorStyles.Right)));
    7478      this.groupBoxRange.Controls.Add(this.tableOptions);
    75       this.groupBoxRange.Location = new System.Drawing.Point(6, 128);
     79      this.groupBoxRange.Location = new System.Drawing.Point(0, 22);
     80      this.groupBoxRange.Margin = new System.Windows.Forms.Padding(0, 3, 0, 0);
    7681      this.groupBoxRange.Name = "groupBoxRange";
    77       this.groupBoxRange.Size = new System.Drawing.Size(488, 189);
     82      this.groupBoxRange.Size = new System.Drawing.Size(497, 209);
    7883      this.groupBoxRange.TabIndex = 17;
    7984      this.groupBoxRange.TabStop = false;
    8085      this.groupBoxRange.Text = "Range";
     86      //
     87      // errorProvider
     88      //
     89      this.errorProvider.ContainerControl = this;
    8190      //
    8291      // JsonItemValidValuesControl
    … …  
    8897      this.Controls.Add(this.comboBoxValues);
    8998      this.ForeColor = System.Drawing.Color.Black;
     99      this.errorProvider.SetIconAlignment(this, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    90100      this.Name = "JsonItemValidValuesControl";
    91       this.Size = new System.Drawing.Size(500, 323);
    92       this.Controls.SetChildIndex(this.comboBoxValues, 0);
    93       this.Controls.SetChildIndex(this.label2, 0);
    94       this.Controls.SetChildIndex(this.groupBoxRange, 0);
     101      this.Size = new System.Drawing.Size(500, 231);
    95102      this.groupBoxRange.ResumeLayout(false);
     103      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    96104      this.ResumeLayout(false);
    97105      this.PerformLayout();
    … …  
    104112    private System.Windows.Forms.Label label2;
    105113    private System.Windows.Forms.GroupBox groupBoxRange;
     114    private System.Windows.Forms.ErrorProvider errorProvider;
    106115  }
    107116}

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValidValuesControl.cs

    r17443 r17464  
    1010
    1111namespace HeuristicLab.JsonInterface.OptimizerIntegration {
    12   public partial class JsonItemValidValuesControl : JsonItemBaseControl {
     12  public partial class JsonItemValidValuesControl : UserControl {
    1313
    14     public JsonItemValidValuesControl(StringValueVM vm) : base(vm) {
     14    IJsonItemVM VM { get; set; }
     15
     16    public JsonItemValidValuesControl(StringValueVM vm) {
    1517      InitializeComponent();
     18      VM = vm;
    1619      if (VM.Item.Range != null) {
    1720        foreach (var i in VM.Item.Range)

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValidValuesControl.resx

    r17404 r17464  
    118118    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    119119  </resheader>
     120  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     121    <value>17, 17</value>
     122  </metadata>
    120123</root>

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValueControl.Designer.cs

    r17444 r17464  
    2424    /// </summary>
    2525    private void InitializeComponent() {
     26      this.components = new System.ComponentModel.Container();
    2627      this.textBoxValue = new System.Windows.Forms.TextBox();
    2728      this.label2 = new System.Windows.Forms.Label();
    2829      this.numericRangeControl1 = new HeuristicLab.JsonInterface.OptimizerIntegration.NumericRangeControl();
     30      this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
     31      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    2932      this.SuspendLayout();
    3033      //
    … …  
    3336      this.textBoxValue.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    3437            | System.Windows.Forms.AnchorStyles.Right)));
    35       this.textBoxValue.Location = new System.Drawing.Point(92, 101);
     38      this.textBoxValue.Location = new System.Drawing.Point(89, 1);
     39      this.textBoxValue.Margin = new System.Windows.Forms.Padding(0);
    3640      this.textBoxValue.Name = "textBoxValue";
    37       this.textBoxValue.Size = new System.Drawing.Size(402, 20);
     41      this.textBoxValue.Size = new System.Drawing.Size(408, 20);
    3842      this.textBoxValue.TabIndex = 14;
    3943      this.textBoxValue.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxValue_Validating);
    … …  
    4246      //
    4347      this.label2.AutoSize = true;
    44       this.label2.Location = new System.Drawing.Point(6, 104);
     48      this.label2.Location = new System.Drawing.Point(3, 1);
    4549      this.label2.Name = "label2";
    4650      this.label2.Size = new System.Drawing.Size(34, 13);
    … …  
    5256      this.numericRangeControl1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    5357            | System.Windows.Forms.AnchorStyles.Right)));
    54       this.numericRangeControl1.Location = new System.Drawing.Point(9, 125);
     58      this.numericRangeControl1.Location = new System.Drawing.Point(0, 24);
     59      this.numericRangeControl1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 0);
    5560      this.numericRangeControl1.Name = "numericRangeControl1";
    56       this.numericRangeControl1.Size = new System.Drawing.Size(485, 72);
     61      this.numericRangeControl1.Size = new System.Drawing.Size(497, 72);
    5762      this.numericRangeControl1.TabIndex = 16;
     63      //
     64      // errorProvider
     65      //
     66      this.errorProvider.ContainerControl = this;
    5867      //
    5968      // JsonItemValueControl
    … …  
    6473      this.Controls.Add(this.label2);
    6574      this.Controls.Add(this.textBoxValue);
     75      this.errorProvider.SetIconAlignment(this, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    6676      this.Name = "JsonItemValueControl";
    67       this.Size = new System.Drawing.Size(500, 199);
    68       this.Controls.SetChildIndex(this.textBoxValue, 0);
    69       this.Controls.SetChildIndex(this.label2, 0);
    70       this.Controls.SetChildIndex(this.numericRangeControl1, 0);
     77      this.Size = new System.Drawing.Size(500, 97);
     78      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    7179      this.ResumeLayout(false);
    7280      this.PerformLayout();
    … …  
    7987    private System.Windows.Forms.Label label2;
    8088    private NumericRangeControl numericRangeControl1;
     89    private System.Windows.Forms.ErrorProvider errorProvider;
    8190  }
    8291}

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValueControl.cs

    r17444 r17464  
    3434  }
    3535 
    36   public abstract partial class JsonItemValueControl : JsonItemBaseControl {
     36  public abstract partial class JsonItemValueControl : UserControl {
    3737    #region Protected Properties
     38    protected IJsonItemVM VM { get; set; }
    3839    protected TextBox TBValue { get; set; }
    3940    protected NumericRangeControl NumericRangeControl { get; set; }
    … …  
    4445    #endregion
    4546
    46     public JsonItemValueControl(JsonItemVMBase vm) : base(vm) {
     47    public JsonItemValueControl(JsonItemVMBase vm) {
    4748      InitializeComponent();
     49      VM = vm;
    4850      TBValue = textBoxValue;
    4951      NumericRangeControl = numericRangeControl1;
    … …  
    5153   
    5254    protected void Init() {
    53       TBValue.DataBindings.Add("Text", base.VM, ValuePropertyId);
     55      TBValue.DataBindings.Add("Text", VM, ValuePropertyId);
    5456      NumericRangeControl.TBMinRange.DataBindings.Add("Text", VM, nameof(RangedValueBaseVM.MinRange));
    5557      NumericRangeControl.TBMaxRange.DataBindings.Add("Text", VM, nameof(RangedValueBaseVM.MaxRange));

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValueControl.resx

    r17404 r17464  
    118118    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    119119  </resheader>
     120  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     121    <value>17, 17</value>
     122  </metadata>
    120123</root>
Note: See TracChangeset for help on using the changeset viewer.