Ignore:
Timestamp:
11/11/14 12:56:55 (8 years ago)
Author:
mkommend
Message:

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

Location:
stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable

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

    r11170 r11537  
    5151        ()=>validateDeleteRowsInfo(),
    5252        ()=>validateReplaceWith(),
    53         ()=>{btnApply.Enabled = true; lblPreviewShuffle.Text = "Data will be shuffled randomly - preview not possible";} //shuffle
     53        ()=>validateShuffle()
    5454      };
    5555
     
    5959        ()=>Content.ManipulationLogic.DeleteRowsWithMissingValuesGreater(getRowsColumnsInfo()),
    6060        ()=>replaceMissingValues(),
    61         ()=>Content.ManipulationLogic.ShuffleWithRanges()
     61        ()=>Content.ManipulationLogic.Shuffle(shuffleSeparatelyCheckbox.Checked)
    6262      };
    63 
    6463    }
    6564
     
    228227    }
    229228
     229    private void validateShuffle() {
     230      btnApply.Enabled = true;
     231      lblShuffleProperties.Enabled = false;
     232      lblShuffleProperties.Visible = false;
     233      shuffleSeparatelyCheckbox.Enabled = true;
     234      shuffleSeparatelyCheckbox.Visible = true;
     235    }
     236
    230237    public new ManipulationContent Content {
    231238      get { return (ManipulationContent)base.Content; }
Note: See TracChangeset for help on using the changeset viewer.