Changeset 18201 for branches/3040_VectorBasedGP

Timestamp:

01/17/22 13:25:15 (2 years ago)

Author:

pfleck

Message:

#3040 Improved handling of "None" Enum flags.

File:

• branches/3040_VectorBasedGP/HeuristicLab.Data.Views/3.3/EnumValueView.cs (modified) (5 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Data.Views/3.3/EnumValueView.cs

@@ -85 +85 @@
       } else {
         valueComboBox.SelectedItem = Content.Value;
+        var value = (Enum)(object)Content.Value;
+
+        var zeroValue = Enum.ToObject(value.GetType(), Convert.ChangeType(0, value.GetTypeCode()));
+        var hasZeroValue = Enum.IsDefined(value.GetType(), zeroValue);
+
         foreach (ListViewItem item in flagsListView.Items) {
           var flag = (Enum)item.Tag;
-          item.Checked = ((Enum)(object)Content.Value).HasFlag(flag);
+          if (hasZeroValue && flag.Equals(zeroValue)) { // only show the zero-value if the whole value is zero, otherwise the zero-value would always be checked
+            item.Checked = value.Equals(zeroValue);
+          } else {
+            item.Checked = value.HasFlag(flag);
+          }
         }
       }
@@ -108 +117 @@
       else {
         valueComboBox.SelectedItem = Content.Value;
+        var value = (Enum)(object)Content.Value;
+
+        var zeroValue = value.GetZeroValue<T>();
+        var hasZeroValue = Enum.IsDefined(value.GetType(), zeroValue);
+
         foreach (ListViewItem item in flagsListView.Items) {
           var flag = (Enum)item.Tag;
-          item.Checked = ((Enum)(object)Content.Value).HasFlag(flag);
+          if (hasZeroValue && flag.Equals(zeroValue)) { // only show the zero-value if the whole value is zero, otherwise the zero-value would always be checked
+            item.Checked = value.Equals(zeroValue);
+          } else {
+            item.Checked = value.HasFlag(flag);
+          }
         }
       }
@@ -116 +134 @@
 
     private void valueComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-      if ((Content != null) && !Content.ReadOnly)
+      if (Content != null && !Content.ReadOnly)
         Content.Value = (T)valueComboBox.SelectedItem;
     }
@@ -122 +140 @@
     private void flagsListView_ItemChecked(object sender, ItemCheckedEventArgs e) {
       var flag = (T)e.Item.Tag;
-      if ((Content != null) && !Content.ReadOnly)
-        Content.Value = ((Enum)(object)Content.Value).SetFlag(flag, e.Item.Checked);
+      if (Content != null && !Content.ReadOnly) {
+        var value = (Enum)(object)Content.Value;
+
+        var zeroValue = value.GetZeroValue<T>();
+        var hasZeroValue = Enum.IsDefined(value.GetType(), zeroValue);
+
+        if (hasZeroValue && flag.Equals(zeroValue)) {
+          if (e.Item.Checked) { // Checking zero-value => set zero-value
+            Content.Value = value.GetZeroValue<T>();
+          } else if (value.Equals(zeroValue)) { // Un-checking zero-value => set all-value
+            Content.Value = value.GetAllValue<T>();
+          }
+        } else {
+          Content.Value = value.SetFlag(flag, e.Item.Checked);
+        }
+      }
     }
   }
@@ -139 +171 @@
       return (T)valueAsBase;
     }
+
+    public static T GetZeroValue<T>(this Enum value) {
+      return (T)Enum.ToObject(value.GetType(), Convert.ChangeType(0, value.GetTypeCode()));
+    }
+
+    public static T GetAllValue<T>(this Enum value) {
+      var allValues = (Enum)(object)value.GetZeroValue<T>();
+      foreach (T fl in Enum.GetValues(value.GetType()))
+        allValues = (Enum)(object)allValues.SetFlag(fl, true);
+      return (T)(object)allValues;
+    }
   }
 }