Changeset 3402

Timestamp:

04/18/10 22:16:08 (15 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#893)

Location:

trunk/sources

Files:

• HeuristicLab.Data.Views/3.3/StringConvertibleValueView.cs (modified) (1 diff)
• HeuristicLab.Data/3.3/PercentValue.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleValueView.cs

@@ -105 +105 @@
       Content.SetValue(valueTextBox.Text);
       errorProvider.SetError(valueTextBox, string.Empty);
+      valueTextBox.Text = Content.GetValue();
     }
   }

trunk/sources/HeuristicLab.Data/3.3/PercentValue.cs

@@ -40 +40 @@
 
     public override string ToString() {
-      return (Value * 100).ToString("r") + " %";  // round-trip format
+      return Value.ToString("#0.#################### %");  // percent format
     }
 
     protected override bool Validate(string value, out string errorMessage) {
-      value = value.Replace("%", string.Empty);
+      value = value.Replace("%", " ");
       return base.Validate(value, out errorMessage);
     }
     protected override string GetValue() {
-      return (Value * 100).ToString("r") + " %";  // round-trip format
+      return Value.ToString("#0.#################### %");  // percent format
     }
     protected override bool SetValue(string value) {
-      value = value.Replace("%", string.Empty);
+      bool percent = value.Contains("%");
+      value = value.Replace("%", " ");
       double val;
       if (double.TryParse(value, out val)) {
-        Value = val == 0 ? 0 : val / 100;
+        if (percent) {
+          if (!(val).IsAlmost(Value * 100.0))
+            Value = val == 0 ? 0 : val / 100.0;
+        } else {
+          Value = val;
+        }
         return true;
       } else {