Changeset 11537 for stable/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs

Timestamp:

11/11/14 12:56:55 (9 years ago)

Author:

mkommend

Message:

#2245: Merged r11380, r11381 & r11403 into stable.

Location:

stable

Files:

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

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

@@ -51 +51 @@
         ()=>validateDeleteRowsInfo(),
         ()=>validateReplaceWith(),
-        ()=>{btnApply.Enabled = true; lblPreviewShuffle.Text = "Data will be shuffled randomly - preview not possible";} //shuffle
+        ()=>validateShuffle()
       };
 
@@ -59 +59 @@
         ()=>Content.ManipulationLogic.DeleteRowsWithMissingValuesGreater(getRowsColumnsInfo()),
         ()=>replaceMissingValues(),
-        ()=>Content.ManipulationLogic.ShuffleWithRanges()
+        ()=>Content.ManipulationLogic.Shuffle(shuffleSeparatelyCheckbox.Checked)
       };
-
     }
 
@@ -228 +227 @@
     }
 
+    private void validateShuffle() {
+      btnApply.Enabled = true;
+      lblShuffleProperties.Enabled = false;
+      lblShuffleProperties.Visible = false;
+      shuffleSeparatelyCheckbox.Enabled = true;
+      shuffleSeparatelyCheckbox.Visible = true;
+    }
+
     public new ManipulationContent Content {
       get { return (ManipulationContent)base.Content; }