Changeset 17828 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/StringValueVM.cs

Timestamp:

02/01/21 14:37:18 (3 years ago)

Author:

dpiringe

Message:

#3026

• removed the option to set the value for JsonItems via exporter
  • reworked some base controls
  • added new controls for JsonItem specific properties (e.g. ArrayResizable)
  • deleted a lot of obsolet controls
• removed the Enable checkbox in the detail view of JsonItems
• exporter now clones the IOptimizer object
• added a check + message for unsupported exports
• list of JsonItems now includes unsupported JsonItems (disabled and marked with 'unsupported')
• refactored the converter type check
  • now every converter has to specify its supported type(s)

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/StringValueVM.cs (modified) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/StringValueVM.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+using System.Linq;
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
-  public class StringValueVM : JsonItemVMBase<StringJsonItem> {
-    public override UserControl Control =>
-       new JsonItemValidValuesControl(this);
 
-    public string Value {
-      get => Item.Value?.ToString();
-      set {
-        Item.Value = value;
-        OnPropertyChange(this, nameof(Value));
-      }
-    }
+  public class StringValueVM : ConcreteRestrictedJsonItemVM<StringJsonItem, string, string> {
+    protected override string GetDefaultValue() => Range.FirstOrDefault();
 
-    public IEnumerable<string> Range {
-      get => Item.ConcreteRestrictedItems;
-      set {
-        Item.ConcreteRestrictedItems = value;
-        //check if value is still in range
-        if (!Range.Contains(Value)) {
-          Value = Range.FirstOrDefault();
-          if (Range.Count() == 0)
-            //if no elements exists -> deselect item
-            base.Selected = false;
-          OnPropertyChange(this, nameof(Value));
-        }
-        
-        OnPropertyChange(this, nameof(Range));
-      }
-    }
+    protected override bool RangeContainsValue() => Range.Contains(Value);
   }
 
-  public class StringArrayVM : JsonItemVMBase<StringArrayJsonItem> {
-    public override UserControl Control =>
-       new JsonItemConcreteItemArrayControl(this);
+  public class StringArrayVM : ConcreteRestrictedJsonItemVM<StringArrayJsonItem, string, string[]> {
+    protected override string[] GetDefaultValue() => Range.ToArray();
 
-    public string[] Value {
-      get => Item.Value;
-      set {
-        Item.Value = value;
-        OnPropertyChange(this, nameof(Value));
-      }
-    }
-
-    public IEnumerable<string> Range {
-      get => Item.ConcreteRestrictedItems;
-      set {
-        Item.ConcreteRestrictedItems = value;
-        OnPropertyChange(this, nameof(Range));
-      }
-    }
+    protected override bool RangeContainsValue() => Value.All(x => Range.Any(y => x == y));
   }
 }