Free cookie consent management tool by TermsFeed Policy Generator

Changeset 17433 for branches


Ignore:
Timestamp:
02/10/20 17:29:35 (4 years ago)
Author:
dpiringe
Message:

#3026:

  • added property Description in IJsonItem and updated all construction calls
  • updated UnsupportedJsonItem with unsupported property Description
  • updated JsonItemBaseControl and JsonItemVMBase for new property Description
Location:
branches/3026_IntegrationIntoSymSpace
Files:
31 edited

Legend:

Unmodified
Added
Removed

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/JsonItemBaseControl.Designer.cs

    r17410 r17433  
    3030      this.textBoxName = new System.Windows.Forms.TextBox();
    3131      this.label1 = new System.Windows.Forms.Label();
     32      this.labelDescription = new System.Windows.Forms.Label();
     33      this.textBoxDescription = new System.Windows.Forms.TextBox();
    3234      this.SuspendLayout();
    3335      //
    … …  
    5658      this.textBoxActualName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    5759            | System.Windows.Forms.AnchorStyles.Right)));
    58       this.textBoxActualName.Location = new System.Drawing.Point(92, 49);
     60      this.textBoxActualName.Location = new System.Drawing.Point(92, 75);
    5961      this.textBoxActualName.Name = "textBoxActualName";
    6062      this.textBoxActualName.Size = new System.Drawing.Size(404, 20);
    … …  
    6466      //
    6567      this.labelActualName.AutoSize = true;
    66       this.labelActualName.Location = new System.Drawing.Point(6, 52);
     68      this.labelActualName.Location = new System.Drawing.Point(6, 78);
    6769      this.labelActualName.Name = "labelActualName";
    6870      this.labelActualName.Size = new System.Drawing.Size(65, 13);
    … …  
    9193      this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
    9294      //
     95      // labelDescription
     96      //
     97      this.labelDescription.AutoSize = true;
     98      this.labelDescription.Location = new System.Drawing.Point(6, 52);
     99      this.labelDescription.Name = "labelDescription";
     100      this.labelDescription.Size = new System.Drawing.Size(60, 13);
     101      this.labelDescription.TabIndex = 13;
     102      this.labelDescription.Text = "Description";
     103      //
     104      // textBoxDescription
     105      //
     106      this.textBoxDescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     107            | System.Windows.Forms.AnchorStyles.Right)));
     108      this.textBoxDescription.Location = new System.Drawing.Point(92, 49);
     109      this.textBoxDescription.Name = "textBoxDescription";
     110      this.textBoxDescription.Size = new System.Drawing.Size(404, 20);
     111      this.textBoxDescription.TabIndex = 14;
     112      //
    93113      // JsonItemBaseControl
    94114      //
    95115      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    96116      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     117      this.Controls.Add(this.textBoxDescription);
     118      this.Controls.Add(this.labelDescription);
    97119      this.Controls.Add(this.labelEnable);
    98120      this.Controls.Add(this.checkBoxActive);
    … …  
    117139    private System.Windows.Forms.TextBox textBoxName;
    118140    private System.Windows.Forms.Label label1;
     141    private System.Windows.Forms.Label labelDescription;
     142    private System.Windows.Forms.TextBox textBoxDescription;
    119143  }
    120144}

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/JsonItemBaseControl.cs

    r17431 r17433  
    2424        false, DataSourceUpdateMode.OnPropertyChanged);
    2525      textBoxName.DataBindings.Add("Text", VM, nameof(JsonItemVMBase.Name));
     26      textBoxDescription.DataBindings.Add("Text", VM, nameof(JsonItemVMBase.Description));
    2627      textBoxActualName.DataBindings.Add("Text", VM, nameof(JsonItemVMBase.ActualName));
    2728
    28       //checkBoxActive.Checked = VM.Selected;
    29       //textBoxName.Text = VM.Item.Name;
    3029      if (string.IsNullOrWhiteSpace(VM.Item.ActualName))
    3130        textBoxActualName.ReadOnly = true;

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/ArrayValueVM.cs

    r17431 r17433  
    1515    protected override double MaxTypeValue => double.MaxValue;
    1616
    17     public override JsonItemBaseControl GetControl() => new JsonItemDoubleArrayValueControl(this);
     17    public override JsonItemBaseControl GetControl() =>
     18      new JsonItemDoubleArrayValueControl(this);
    1819   
    1920    public override double[] Value {
    … …  
    3334    protected override int MaxTypeValue => int.MaxValue;
    3435
    35     public override JsonItemBaseControl GetControl() => new JsonItemIntArrayValueControl(this);
     36    public override JsonItemBaseControl GetControl() =>
     37      new JsonItemIntArrayValueControl(this);
    3638   
    3739    public override int[] Value {
    … …  
    4648  public abstract class ArrayValueVM<T> : RangedValueBaseVM<T> {
    4749   
    48     public ArrayValueVM() {
    49       //base.ItemChanged += OnItemChanged;
    50     }
     50    public ArrayValueVM() { }
    5151
    5252    public void SetIndexValue(object obj, int index) {

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/JsonItemVMBase.cs

    r17431 r17433  
    5858    }
    5959
     60    public string Description {
     61      get => Item.Description;
     62      set {
     63        Item.Description = value;
     64        OnPropertyChange(this, nameof(Description));
     65      }
     66    }
     67
    6068    public string ActualName {
    6169      get => Item.ActualName;

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/MatrixValueVM.cs

    r17431 r17433  
    1010  public class DoubleMatrixValueVM : MatrixValueVM<double> {
    1111    public override Type JsonItemType => typeof(DoubleMatrixJsonItem);
    12     public override JsonItemBaseControl GetControl() => new JsonItemDoubleMatrixValueControl(this);
     12    public override JsonItemBaseControl GetControl() =>
     13      new JsonItemDoubleMatrixValueControl(this);
    1314
    1415    public override double[][] Value {

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/SingleValueVM.cs

    r17420 r17433  
    1414    protected override int MaxTypeValue => int.MaxValue;
    1515
    16     public override JsonItemBaseControl GetControl() =>
     16    public override JsonItemBaseControl GetControl() => 
    1717      new JsonItemIntValueControl(this);
    1818  }
    … …  
    2424    protected override double MaxTypeValue => double.MaxValue;
    2525
    26     public override JsonItemBaseControl GetControl() =>
     26    public override JsonItemBaseControl GetControl() => 
    2727       new JsonItemDoubleValueControl(this);
    2828  }

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

    r17410 r17433  
    3333            | System.Windows.Forms.AnchorStyles.Right)));
    3434      this.checkBoxValue.AutoSize = true;
    35       this.checkBoxValue.Location = new System.Drawing.Point(92, 75);
     35      this.checkBoxValue.Location = new System.Drawing.Point(92, 101);
    3636      this.checkBoxValue.Name = "checkBoxValue";
    3737      this.checkBoxValue.Size = new System.Drawing.Size(15, 14);
    … …  
    4242      //
    4343      this.label2.AutoSize = true;
    44       this.label2.Location = new System.Drawing.Point(6, 75);
     44      this.label2.Location = new System.Drawing.Point(6, 101);
    4545      this.label2.Name = "label2";
    4646      this.label2.Size = new System.Drawing.Size(34, 13);
    … …  
    5656      this.Controls.Add(this.checkBoxValue);
    5757      this.Name = "JsonItemBoolControl";
    58       this.Size = new System.Drawing.Size(500, 105);
     58      this.Size = new System.Drawing.Size(500, 140);
    5959      this.Controls.SetChildIndex(this.checkBoxValue, 0);
    6060      this.Controls.SetChildIndex(this.label2, 0);

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

    r17431 r17433  
    3535            | System.Windows.Forms.AnchorStyles.Right)));
    3636      this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
    37       this.dataGridView.Location = new System.Drawing.Point(9, 75);
     37      this.dataGridView.Location = new System.Drawing.Point(9, 101);
    3838      this.dataGridView.Name = "dataGridView";
    39       this.dataGridView.Size = new System.Drawing.Size(487, 171);
     39      this.dataGridView.Size = new System.Drawing.Size(487, 208);
    4040      this.dataGridView.TabIndex = 13;
    4141      //
    … …  
    4444      this.numericRangeControl1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
    4545            | System.Windows.Forms.AnchorStyles.Right)));
    46       this.numericRangeControl1.Location = new System.Drawing.Point(9, 252);
     46      this.numericRangeControl1.Location = new System.Drawing.Point(9, 315);
    4747      this.numericRangeControl1.Name = "numericRangeControl1";
    4848      this.numericRangeControl1.Size = new System.Drawing.Size(487, 128);
    4949      this.numericRangeControl1.TabIndex = 14;
    5050      //
    51       // JsonItemArrayValueControl
     51      // JsonItemMultiValueControl
    5252      //
    5353      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    … …  
    5555      this.Controls.Add(this.numericRangeControl1);
    5656      this.Controls.Add(this.dataGridView);
    57       this.Name = "JsonItemArrayValueControl";
    58       this.Size = new System.Drawing.Size(502, 386);
     57      this.Name = "JsonItemMultiValueControl";
     58      this.Size = new System.Drawing.Size(502, 449);
    5959      this.Controls.SetChildIndex(this.dataGridView, 0);
    6060      this.Controls.SetChildIndex(this.numericRangeControl1, 0);

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

    r17431 r17433  
    1010
    1111namespace HeuristicLab.JsonInterface.OptimizerIntegration {
    12 
     12 
    1313  public class JsonItemDoubleMatrixValueControl : JsonItemMultiValueControl<double> {
    1414
    … …  
    8181    protected abstract void SaveCellData(object data, int col, int row);
    8282
    83     /*
    84 public JsonItemMultiValueControl(JsonItemVMBase vm, object dataSource) : base(vm) {
    85  InitializeComponent();
    86  dataGridView.DataSource = dataSource;
    87 
    88  InitRangeBinding();
    89 }
    90 */
    9183    private void InitRangeBinding() {
    9284      NumericRangeControl = numericRangeControl1;

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

    r17432 r17433  
    4141      this.groupBox1.Controls.Add(this.label4);
    4242      this.groupBox1.Controls.Add(this.label2);
    43       this.groupBox1.Location = new System.Drawing.Point(9, 75);
     43      this.groupBox1.Location = new System.Drawing.Point(9, 101);
    4444      this.groupBox1.Name = "groupBox1";
    4545      this.groupBox1.Size = new System.Drawing.Size(487, 64);
    … …  
    9090      this.numericRangeControl1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    9191            | System.Windows.Forms.AnchorStyles.Right)));
    92       this.numericRangeControl1.Location = new System.Drawing.Point(9, 145);
     92      this.numericRangeControl1.Location = new System.Drawing.Point(9, 171);
    9393      this.numericRangeControl1.Name = "numericRangeControl1";
    9494      this.numericRangeControl1.Size = new System.Drawing.Size(487, 112);
    … …  
    102102      this.Controls.Add(this.groupBox1);
    103103      this.Name = "JsonItemRangeControl";
    104       this.Size = new System.Drawing.Size(500, 262);
     104      this.Size = new System.Drawing.Size(500, 301);
    105105      this.Controls.SetChildIndex(this.groupBox1, 0);
    106106      this.Controls.SetChildIndex(this.numericRangeControl1, 0);

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

    r17417 r17433  
    4444      this.tableOptions.RowCount = 1;
    4545      this.tableOptions.RowStyles.Add(new System.Windows.Forms.RowStyle());
    46       this.tableOptions.Size = new System.Drawing.Size(478, 137);
     46      this.tableOptions.Size = new System.Drawing.Size(478, 417);
    4747      this.tableOptions.TabIndex = 12;
    4848      //
    … …  
    5454      this.groupBoxRange.AutoSize = true;
    5555      this.groupBoxRange.Controls.Add(this.tableOptions);
    56       this.groupBoxRange.Location = new System.Drawing.Point(6, 108);
     56      this.groupBoxRange.Location = new System.Drawing.Point(6, 128);
    5757      this.groupBoxRange.Name = "groupBoxRange";
    58       this.groupBoxRange.Size = new System.Drawing.Size(490, 162);
     58      this.groupBoxRange.Size = new System.Drawing.Size(490, 442);
    5959      this.groupBoxRange.TabIndex = 14;
    6060      this.groupBoxRange.TabStop = false;
    … …  
    6767      this.comboBoxValues.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    6868      this.comboBoxValues.FormattingEnabled = true;
    69       this.comboBoxValues.Location = new System.Drawing.Point(92, 75);
     69      this.comboBoxValues.Location = new System.Drawing.Point(92, 101);
    7070      this.comboBoxValues.Name = "comboBoxValues";
    7171      this.comboBoxValues.Size = new System.Drawing.Size(404, 21);
    … …  
    7575      //
    7676      this.label2.AutoSize = true;
    77       this.label2.Location = new System.Drawing.Point(6, 78);
     77      this.label2.Location = new System.Drawing.Point(6, 104);
    7878      this.label2.Name = "label2";
    7979      this.label2.Size = new System.Drawing.Size(34, 13);
    … …  
    9191      this.ForeColor = System.Drawing.Color.Black;
    9292      this.Name = "JsonItemValidValuesControl";
    93       this.Size = new System.Drawing.Size(500, 276);
     93      this.Size = new System.Drawing.Size(500, 576);
    9494      this.Controls.SetChildIndex(this.groupBoxRange, 0);
    9595      this.Controls.SetChildIndex(this.comboBoxValues, 0);

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

    r17432 r17433  
    3333      this.textBoxValue.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    3434            | System.Windows.Forms.AnchorStyles.Right)));
    35       this.textBoxValue.Location = new System.Drawing.Point(92, 75);
     35      this.textBoxValue.Location = new System.Drawing.Point(92, 101);
    3636      this.textBoxValue.Name = "textBoxValue";
    3737      this.textBoxValue.Size = new System.Drawing.Size(404, 20);
    … …  
    4141      //
    4242      this.label2.AutoSize = true;
    43       this.label2.Location = new System.Drawing.Point(6, 78);
     43      this.label2.Location = new System.Drawing.Point(6, 104);
    4444      this.label2.Name = "label2";
    4545      this.label2.Size = new System.Drawing.Size(34, 13);
    … …  
    4949      // numericRangeControl1
    5050      //
    51       this.numericRangeControl1.Location = new System.Drawing.Point(9, 101);
    52       this.numericRangeControl1.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
     51      this.numericRangeControl1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     52            | System.Windows.Forms.AnchorStyles.Right)));
     53      this.numericRangeControl1.Location = new System.Drawing.Point(9, 127);
    5354      this.numericRangeControl1.Name = "numericRangeControl1";
    5455      this.numericRangeControl1.Size = new System.Drawing.Size(487, 112);
    … …  
    6364      this.Controls.Add(this.textBoxValue);
    6465      this.Name = "JsonItemValueControl";
    65       this.Size = new System.Drawing.Size(500, 220);
     66      this.Size = new System.Drawing.Size(500, 247);
    6667      this.Controls.SetChildIndex(this.textBoxValue, 0);
    6768      this.Controls.SetChildIndex(this.label2, 0);

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

    r17420 r17433  
    1111
    1212namespace HeuristicLab.JsonInterface.OptimizerIntegration {
    13 
     13 
    1414  public class JsonItemIntValueControl : JsonItemValueControl {
    1515
    … …  
    2121      Init();
    2222    }
    23 
    2423  }
    2524
    … …  
    3332      Init();
    3433    }
    35 
    3634  }
    37 
     35 
    3836  public abstract partial class JsonItemValueControl : JsonItemBaseControl {
    3937    #region Protected Properties

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/AlgorithmConverter.cs

    r17420 r17433  
    2727        item.AddChildren(new ResultItem() {
    2828          Name = res.Name,
     29          Description = value.ItemDescription,
    2930          Value = true,
    3031          Range = new object[] { true, false }

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/BaseConverter.cs

    r17410 r17433  
    2929      (IItem)Activator.CreateInstance(type,args);
    3030
    31     protected T Instantiate<T>(params object[] args) => (T)Instantiate(typeof(T), args);
    32 
     31   
    3332    protected object GetMaxValue(Type t) {
    3433      TypeCode typeCode = Type.GetTypeCode(t);
    35 
    3634
    3735      if (t.IsEqualTo(typeof(PercentValue)))

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ConstrainedValueParameterConverter.cs

    r17420 r17433  
    3232      IJsonItem item = new StringJsonItem() {
    3333        Name = parameter.Name,
     34        Description = value.ItemDescription,
    3435        Value = parameter.ActualValue?.ToString(),
    3536        Range = GetValidValues(parameter).Select(x => x.ToString())

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/EnumTypeConverter.cs

    r17410 r17433  
    2222      return new StringJsonItem() {
    2323        Name = value.ItemName,
     24        Description = value.ItemDescription,
    2425        Value = Enum.GetName(enumType, val),
    2526        Range = Enum.GetNames(enumType)

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/LookupParameterConverter.cs

    r17407 r17433  
    1919      IJsonItem item = new JsonItem() {
    2020        Name = parameter.Name,
     21        Description = parameter.Description,
    2122        ActualName = ((ILookupParameter)parameter).ActualName
    2223      };

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/MultiCheckedOperatorConverter.cs

    r17420 r17433  
    2626        item.AddChildren(new BoolJsonItem() {
    2727          Name = op.Name,
     28          Description = op.Description,
    2829          Value = val.Operators.ItemChecked(op),
    2930          Range = new bool[] { false, true }

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ParameterizedItemConverter.cs

    r17420 r17433  
    2222
    2323    public override IJsonItem Extract(IItem value, IJsonItemConverter root) {
    24       IJsonItem item = new JsonItem() { Name = value.ItemName };
     24      var parameterizedItem = value as IParameterizedItem;
    2525
    26       var parameterizedItem = value as IParameterizedItem;
     26      IJsonItem item = new JsonItem() {
     27        Name = value.ItemName,
     28        Description = value.ItemDescription
     29      };
     30
    2731      foreach (var param in parameterizedItem.Parameters) {
    2832        if (!param.Hidden) {

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/RegressionProblemDataConverter.cs

    r17420 r17433  
    2020
    2121    public override IJsonItem Extract(IItem value, IJsonItemConverter root) {
    22       IJsonItem item = new JsonItem() { Name = value.ItemName };
     22      IJsonItem item = new JsonItem() {
     23        Name = value.ItemName,
     24        Description = value.ItemDescription
     25      };
    2326
    2427      dynamic val = (dynamic)value;

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/StringValueConverter.cs

    r17410 r17433  
    1818      new StringJsonItem() {
    1919        Name = value.ItemName,
     20        Description = value.ItemDescription,
    2021        Value = ((StringValue)value).Value
    2122      };

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueLookupParameterConverter.cs

    r17420 r17433  
    2525      if (param.Value != null) {
    2626        IJsonItem tmp = root.Extract(param.Value, root);
    27         /*tmp.Parent = item;
    28         actualValue = tmp.Value;
    29         actualRange = tmp.Range;
    30         */
    3127        item = tmp;
    3228      } else {
    … …  
    3430      }
    3531      item.Name = param.Name;
     32      item.Description = param.Description;
    3633      item.ActualName = param.ActualName;
    3734      return item;

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueParameterConverter.cs

    r17420 r17433  
    2323
    2424      IJsonItem item = new JsonItem() {
    25         Name = parameter.Name
     25        Name = parameter.Name,
     26        Description = parameter.Description
    2627      };
    2728
    … …  
    3132          if (tmp.Name == "[OverridableParamName]") {
    3233            tmp.Name = parameter.Name;
     34            tmp.Description = parameter.Description;
    3335            item = tmp;
    3436            //JsonItem.Merge(item as JsonItem, tmp as JsonItem);

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueRangeConverter.cs

    r17420 r17433  
    2626      return new IntRangeJsonItem() {
    2727        Name = "[OverridableParamName]",
     28        Description = value.ItemDescription,
    2829        Value = new int[] { range.Start, range.End },
    2930        Range = new int[] { int.MinValue, int.MaxValue }
    … …  
    4748      return new DoubleRangeJsonItem() {
    4849        Name = "[OverridableParamName]",
     50        Description = value.ItemDescription,
    4951        Value = new double[] { range.Start, range.End },
    5052        Range = new double[] { double.MinValue, double.MaxValue }

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueTypeArrayConverter.cs

    r17420 r17433  
    2828      new IntArrayJsonItem() {
    2929        Name = "[OverridableParamName]",
     30        Description = value.ItemDescription,
    3031        Value = ((IntArray)value).CloneAsArray(),
    3132        Range = new int[] { int.MinValue, int.MaxValue }
    … …  
    5152      new DoubleArrayJsonItem() {
    5253        Name = "[OverridableParamName]",
     54        Description = value.ItemDescription,
    5355        Value = ((DoubleArray)value).CloneAsArray(),
    5456        Range = new double[] { double.MinValue, double.MaxValue }
    … …  
    7476      new DoubleArrayJsonItem() {
    7577        Name = "[OverridableParamName]",
     78        Description = value.ItemDescription,
    7679        Value = ((PercentArray)value).CloneAsArray(),
    7780        Range = new double[] { 0.0d, 1.0d }
    … …  
    97100      new BoolArrayJsonItem() {
    98101        Name = "[OverridableParamName]",
     102        Description = value.ItemDescription,
    99103        Value = ((BoolArray)value).CloneAsArray(),
    100104        Range = new bool[] { false, true }

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueTypeMatrixConverter.cs

    r17420 r17433  
    2121      new IntMatrixJsonItem() {
    2222        Name = "[OverridableParamName]",
     23        Description = value.ItemDescription,
    2324        Value = Transform((IntMatrix)value),
    2425        Range = new int[] { int.MinValue, int.MaxValue }
    … …  
    3940      new DoubleMatrixJsonItem() {
    4041        Name = "[OverridableParamName]",
     42        Description = value.ItemDescription,
    4143        Value = Transform((DoubleMatrix)value),
    4244        Range = new double[] { double.MinValue, double.MaxValue }
    … …  
    5759      new DoubleMatrixJsonItem() {
    5860        Name = "[OverridableParamName]",
     61        Description = value.ItemDescription,
    5962        Value = Transform((PercentMatrix)value),
    6063        Range = new double[] { 0.0d, 1.0d }
    … …  
    7578      new BoolMatrixJsonItem() {
    7679        Name = "[OverridableParamName]",
     80        Description = value.ItemDescription,
    7781        Value = Transform((BoolMatrix)value),
    7882        Range = new bool[] { false, true }

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueTypeValueConverter.cs

    r17410 r17433  
    1919      new IntJsonItem() {
    2020        Name = "[OverridableParamName]",
     21        Description = value.ItemDescription,
    2122        Value = ((IntValue)value).Value,
    2223        Range = new int[] { int.MinValue, int.MaxValue }
    … …  
    3435      new DoubleJsonItem() {
    3536        Name = "[OverridableParamName]",
     37        Description = value.ItemDescription,
    3638        Value = ((DoubleValue)value).Value,
    3739        Range = new double[] { double.MinValue, double.MaxValue }
    … …  
    4951      new DoubleJsonItem() {
    5052        Name = "[OverridableParamName]",
     53        Description = value.ItemDescription,
    5154        Value = ((PercentValue)value).Value,
    5255        Range = new double[] { double.MinValue, double.MaxValue }
    … …  
    6467      new BoolJsonItem() {
    6568        Name = "[OverridableParamName]",
     69        Description = value.ItemDescription,
    6670        Value = ((BoolValue)value).Value,
    6771        Range = new bool[] { false, true }
    … …  
    7983      new DateTimeJsonItem() {
    8084        Name = "[OverridableParamName]",
     85        Description = value.ItemDescription,
    8186        Value = ((DateTimeValue)value).Value,
    8287        Range = new DateTime[] { DateTime.MinValue, DateTime.MaxValue }

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IJsonItem.cs

    r17420 r17433  
    99  public interface IJsonItem {
    1010    string Name { get; set; }
     11
     12    string Description { get; set; }
    1113
    1214    string Path {

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/JsonItem.cs

    r17420 r17433  
    4141
    4242    public virtual string Name { get; set; }
     43
     44    public virtual string Description { get; set; }
    4345
    4446    public virtual string Path {

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/UnsupportedJsonItem.cs

    r17408 r17433  
    99  public class UnsupportedJsonItem : JsonItem {
    1010    public override string Name {
     11      get => throw new NotSupportedException();
     12      set => throw new NotSupportedException();
     13    }
     14
     15    public override string Description {
    1116      get => throw new NotSupportedException();
    1217      set => throw new NotSupportedException();
Note: See TracChangeset for help on using the changeset viewer.