Changeset 10219


Ignore:
Timestamp:
12/11/13 15:56:17 (6 years ago)
Author:
pfleck
Message:
  • Added PreprocessingContext
  • Changed content type of DataPreprocessingView to PreprocessingContext
Location:
branches/DataPreprocessing
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/DataPreprocessingView.cs

    r10134 r10219  
    33using HeuristicLab.MainForm;
    44using HeuristicLab.MainForm.WindowsForms;
    5 using HeuristicLab.Problems.DataAnalysis;
    65
    76namespace HeuristicLab.DataPreprocessing {
    87  [View("Data Preprocessing View")]
    9   [Content(typeof(DataAnalysisProblemData), false)]
     8  [Content(typeof(IPreprocessingContext), false)]
     9  [Content(typeof(PreprocessingContext), true)]
    1010  public partial class DataPreprocessingView : ItemView {
    1111
    12     public new DataAnalysisProblemData Content {
    13       get { return (DataAnalysisProblemData)base.Content; }
     12    public new IPreprocessingContext Content {
     13      get { return (IPreprocessingContext)base.Content; }
    1414      set { base.Content = value; }
    1515    }
     
    2121    protected override void OnContentChanged() {
    2222      base.OnContentChanged();
    23 
    24 
    25 
    2623    }
    2724
    2825    private void button1_Click(object sender, System.EventArgs e) {
     26
     27
     28      /*
    2929      DataAnalysisProblemData problemData = Content;
    3030      Dataset ds = problemData.Dataset;
     
    3636
    3737      MessageBox.Show("Success ;)");
     38      */
    3839    }
    3940  }
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

    r10193 r10219  
    8484      <DependentUpon>DataPreprocessingView.cs</DependentUpon>
    8585    </Compile>
     86    <Compile Include="Implementations\PreprocessingContext.cs" />
    8687    <Compile Include="Implementations\PreprocessingData.cs" />
    8788    <Compile Include="Implementations\PreprocessingDataManipulation.cs" />
    8889    <Compile Include="Implementations\StatisticInfo.cs" />
     90    <Compile Include="Interfaces\IPreprocessingContext.cs" />
    8991    <Compile Include="Interfaces\IStatisticInfo.cs" />
    9092    <Compile Include="Interfaces\IPreprocessingData.cs" />
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Views/3.4/Plugin.cs.frame

    r10037 r10219  
    4444  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    4545  [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]
     46  [PluginDependency("HeuristicLab.DataPreprocessing", "3.3")]
    4647  public class HeuristicLabProblemsDataAnalysisViewsPlugin : PluginBase {
    4748  }
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataView.cs

    r10217 r10219  
    104104
    105105    private void DataPreprocessingButton_Click(object sender, EventArgs e) {
    106       // IItem i = GetAlgorithmOrProblemContent();
    107       Type viewType = MainFormManager.GetViewTypes(this.Content.GetType(), true).FirstOrDefault(t => typeof(DataPreprocessingView).IsAssignableFrom(t));
    108       MainFormManager.MainForm.ShowContent(Content, viewType);
     106      IItem parentItem = GetAlgorithmOrProblem();
     107      var preprocessingData = new PreprocessingData(Content);
     108
     109      // TODO: ProblemDataView depends on DataPreprocessing
     110      var context = new PreprocessingContext(preprocessingData, parentItem);
     111      MainFormManager.MainForm.ShowContent(context);
     112
     113      //Type viewType = MainFormManager.GetViewTypes(this.Content.GetType(), true).FirstOrDefault(t => typeof(DataPreprocessingView).IsAssignableFrom(t));
     114      //MainFormManager.MainForm.ShowContent(Content, viewType);
    109115    }
    110116
    111     private IItem GetAlgorithmOrProblemContent() {
     117    private IItem GetAlgorithmOrProblem() {
    112118      Control a = this;
    113119      IItem i = null;
Note: See TracChangeset for help on using the changeset viewer.