Changeset 12555

Timestamp:

06/30/15 15:45:17 (9 years ago)

Author:

ehopf

Message:

#2335: Removed a redundant check and fixed a validation problem in the Datagrid-View (Defect 9). Additionally changed the validation in the Manipulation-View to disallow the thousands separator as input. This prevents the unintended usage of the thousands separator as comma which would result in a wrong result.

Location:

branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Views/3.4

Files:

• DataGridContentView.cs (modified) (1 diff)
• ManipulationView.cs (modified) (3 diffs)

branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs

@@ -126 +126 @@
 
       string errorMessage;
-      if (Content != null) {
+      if (!String.IsNullOrEmpty(e.FormattedValue.ToString())) {
         if (dataGridView.IsCurrentCellInEditMode && Content.FilterLogic.IsFiltered) {
           errorMessage = "A filter is active, you cannot modify data. Press ESC to exit edit mode.";

branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
+using System.Globalization;
 using System.Linq;
 using System.Text;
@@ -150 +151 @@
     private void validateDeleteColumnsInfo() {
       validateDoubleTextBox(txtDeleteColumnsInfo.Text);
-      if (btnApply.Enabled)
-      {
+      if (btnApply.Enabled) {
         var filteredColumns = Content.ManipulationLogic.ColumnsWithMissingValuesGreater(getDeleteColumnsInfo());
         int count = filteredColumns.Count;
@@ -308 +308 @@
       if (!string.IsNullOrEmpty(text)) {
         double percent;
-        if (Double.TryParse(text, out percent)) {
+        if (Double.TryParse(text, NumberStyles.Number ^ NumberStyles.AllowThousands, CultureInfo.CurrentCulture, out percent)) {
           btnApply.Enabled = true;
         }