Changeset 17420 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValueControl.cs

Timestamp:

02/03/20 17:32:50 (4 years ago)

Author:

dpiringe

Message:

#3026:

• refactored ranged based VMs -> created new 'base' class for ranged based VMs RangedValueBaseVM
• renamed AddChilds to AddChildren
• implemented ArrayValueVM and JsonItemArrayValueControl
• added ranges for array and matrix values

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValueControl.cs (modified) (4 diffs)

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

@@ -16 +16 @@
     #region Overriden Properties
     protected override string ValuePropertyId => nameof(IntValueVM.Value);
-    protected override string MinRangePropertyId => nameof(IntValueVM.MinRange);
-    protected override string MaxRangePropertyId => nameof(IntValueVM.MaxRange);
-    protected override string EnableMinRangePropertyId => nameof(IntValueVM.EnableMinRange);
-    protected override string EnableMaxRangePropertyId => nameof(IntValueVM.EnableMaxRange);
     #endregion
 
@@ -32 +28 @@
     #region Overriden Properties
     protected override string ValuePropertyId => nameof(DoubleValueVM.Value);
-    protected override string MinRangePropertyId => nameof(DoubleValueVM.MinRange);
-    protected override string MaxRangePropertyId => nameof(DoubleValueVM.MaxRange);
-    protected override string EnableMinRangePropertyId => nameof(DoubleValueVM.EnableMinRange);
-    protected override string EnableMaxRangePropertyId => nameof(DoubleValueVM.EnableMaxRange);
     #endregion
 
@@ -52 +44 @@
     #region Abstract Properties
     protected abstract string ValuePropertyId { get; }
-    protected abstract string MinRangePropertyId { get; }
-    protected abstract string MaxRangePropertyId { get; }
-    protected abstract string EnableMinRangePropertyId { get; }
-    protected abstract string EnableMaxRangePropertyId { get; }
     #endregion
 
@@ -66 +54 @@
     protected void Init() {
       TBValue.DataBindings.Add("Text", base.VM, ValuePropertyId);
-      NumericRangeControl.TBMinRange.DataBindings.Add("Text", VM, MinRangePropertyId);
-      NumericRangeControl.TBMaxRange.DataBindings.Add("Text", VM, MaxRangePropertyId);
-      NumericRangeControl.EnableMinRange.DataBindings.Add("Checked", VM, EnableMinRangePropertyId,
+      NumericRangeControl.TBMinRange.DataBindings.Add("Text", VM, nameof(RangedValueBaseVM.MinRange));
+      NumericRangeControl.TBMaxRange.DataBindings.Add("Text", VM, nameof(RangedValueBaseVM.MaxRange));
+      NumericRangeControl.EnableMinRange.DataBindings.Add("Checked", VM, nameof(RangedValueBaseVM.EnableMinRange),
         false, DataSourceUpdateMode.OnPropertyChanged);
-      NumericRangeControl.EnableMaxRange.DataBindings.Add("Checked", VM, EnableMaxRangePropertyId,
+      NumericRangeControl.EnableMaxRange.DataBindings.Add("Checked", VM, nameof(RangedValueBaseVM.EnableMaxRange),
         false, DataSourceUpdateMode.OnPropertyChanged);
     }