Changeset 13954 for stable/HeuristicLab.DataPreprocessing.Views

Timestamp:

06/29/16 14:18:11 (8 years ago)

Author:

mkommend

Message:

#2599: Merged r13796 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs (modified) (4 diffs)

stable/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs

@@ -155 +155 @@
         int count = filteredColumns.Count;
         int columnCount = Content.FilterLogic.PreprocessingData.Columns;
-        lblPreviewColumnsInfo.Text = count + " column" + (count > 1 || count == 0 ? "s" : "") + " of " + columnCount + " (" + string.Format("{0:F2}%", 100d / columnCount * count) + ") were detected with more than " + txtDeleteColumnsInfo.Text + "% missing values.";
-        if (count > 0) {
+        lblPreviewColumnsInfo.Text = string.Format("{0} column{1} of {2} ({3}) were detected with more than {4}% missing values.", count, (count > 1 || count == 0 ? "s" : ""), columnCount, string.Format("{0:F2}%", 100d / columnCount * count), txtDeleteColumnsInfo.Text);
+
+        //only display column names more than 0 and fewer than 50 are affected
+        if (count > 0 && count < 50) {
           StringBuilder sb = new StringBuilder();
           sb.Append(Environment.NewLine);
@@ -170 +172 @@
 
           lblPreviewColumnsInfo.Text += sb.ToString();
-        } else {
-          btnApply.Enabled = false;
-        }
+        }
+
+        btnApply.Enabled = count > 0;
       } else {
         lblPreviewColumnsInfo.Text = "Preview not possible yet - please input the limit above.";
@@ -184 +186 @@
         int count = filteredColumns.Count;
         int columnCount = Content.FilterLogic.PreprocessingData.Columns;
-        lblPreviewColumnsVariance.Text = count + " column" + (count > 1 || count == 0 ? "s" : "") + " of " + columnCount + " (" + string.Format("{0:F2}%", 100d / columnCount * count) + ") were detected with a variance smaller than " + txtDeleteColumnsVariance.Text + ".";
-        if (count > 0) {
+        lblPreviewColumnsVariance.Text = string.Format("{0} column{1} of {2} ({3}) were detected with a variance smaller than {4}.", count, (count > 1 || count == 0 ? "s" : ""), columnCount, string.Format("{0:F2}%", 100d / columnCount * count), txtDeleteColumnsVariance.Text);
+
+        //only display column names more than 0 and fewer than 50 are affected
+        if (count > 0 && count < 50) {
           StringBuilder sb = new StringBuilder();
           sb.Append(Environment.NewLine);
@@ -199 +203 @@
 
           lblPreviewColumnsVariance.Text += sb.ToString();
-        } else {
-          btnApply.Enabled = false;
-        }
+        }
+
+        btnApply.Enabled = count > 0;
       } else {
         lblPreviewColumnsVariance.Text = "Preview not possible yet - please input the limit for the variance above.";