Changeset 7399


Ignore:
Timestamp:
01/23/12 17:14:54 (9 years ago)
Author:
sforsten
Message:

#1758:

  • implemented SetEnabledStateOfControls in RegressionSolutionView
  • fixed bug in NamedDataAnalysisSolutionView (If OnContentChanged creates a new DataAnalysisSolutionView, it sets Locked and ReadOnly as it is set in the current view.)
Location:
branches/ChangeDatasetOfRegressionModel
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4

    • Property svn:ignore
      •  

        old new  
        55*.vs10x
        66Plugin.cs
         7*.resx
  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.Designer.cs

    r7338 r7399  
    3636      //
    3737      //
    38       // splitContainer.Panel2
     38      // splitContainer.Panel1
    3939      //
    40       this.splitContainer.Panel2.Controls.Add(this.btnSimplify);
     40      this.splitContainer.Panel1.Controls.Add(this.btnSimplify);
    4141      this.splitContainer.Size = new System.Drawing.Size(480, 275);
    4242      this.splitContainer.SplitterDistance = 255;
     
    6868      // btnSimplify
    6969      //
    70       this.btnSimplify.Location = new System.Drawing.Point(3, 4);
     70      this.btnSimplify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
     71      this.btnSimplify.Location = new System.Drawing.Point(177, 4);
    7172      this.btnSimplify.Name = "btnSimplify";
    7273      this.btnSimplify.Size = new System.Drawing.Size(75, 23);
  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views

    • Property svn:ignore set to
      *.resx
  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/NamedDataAnalysisSolutionView.cs

    r7259 r7399  
    5656        if (viewType != null) {
    5757          view = (DataAnalysisSolutionView)Activator.CreateInstance(viewType);
     58          view.Locked = this.Locked;
     59          view.ReadOnly = this.ReadOnly;
    5860          view.Dock = DockStyle.Fill;
    5961          view.Content = Content;
  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.Designer.cs

    r7338 r7399  
    5858      //
    5959      //
    60       // splitContainer.Panel1
     60      // splitContainer.Panel2
    6161      //
    62       this.splitContainer.Panel1.Controls.Add(this.btnImport);
     62      this.splitContainer.Panel2.Controls.Add(this.btnImport);
    6363      //
    6464      // itemsGroupBox
     
    7676      // btnImport
    7777      //
    78       this.btnImport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    79       this.btnImport.Location = new System.Drawing.Point(172, 4);
     78      this.btnImport.Location = new System.Drawing.Point(3, 4);
    8079      this.btnImport.Name = "btnImport";
    8180      this.btnImport.Size = new System.Drawing.Size(75, 23);
  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.cs

    r7347 r7399  
    4343    }
    4444
     45    protected override void SetEnabledStateOfControls() {
     46      base.SetEnabledStateOfControls();
     47      btnImport.Enabled = !Locked && !ReadOnly && Content != null;
     48    }
     49
    4550    #region drag and drop
    4651    protected override void itemsListView_DragEnter(object sender, DragEventArgs e) {
     
    6772        }
    6873
    69         IRegressionProblemData problemData = null;
    70         if (hlFile != null && hlFile is RegressionProblemData) {
    71           problemData = (RegressionProblemData)hlFile;
    72         } else if (hlFile != null && hlFile is IRegressionProblem) {
    73           problemData = ((IRegressionProblem)hlFile).ProblemData;
    74         }
    75         if (problemData != null) {
    76           StringBuilder message = new StringBuilder();
    77           if (!problemData.TargetVariable.Equals(Content.ProblemData.TargetVariable))
    78             message.AppendLine("The target variables are not matching. Old target variable: '" + Content.ProblemData.TargetVariable
    79               + "'. New targetvariable: '" + problemData.TargetVariable + "'");
    80 
    81           List<string> variables = problemData.InputVariables.Select(x => x.Value).ToList();
    82 
    83           foreach (var item in Content.ProblemData.InputVariables.CheckedItems) {
    84             if (!variables.Contains(item.Value.Value))
    85               message.AppendLine("Input variable '" + item.Value.Value + "' is not in the new problem data.");
     74        if (hlFile != null) {
     75          IRegressionProblemData problemData = null;
     76          if (hlFile is RegressionProblemData) {
     77            problemData = (RegressionProblemData)hlFile;
     78          } else if (hlFile is IRegressionProblem) {
     79            problemData = ((IRegressionProblem)hlFile).ProblemData;
     80          } else if (hlFile is IRegressionSolution) {
     81            problemData = ((IRegressionSolution)hlFile).ProblemData;
    8682          }
    8783
    88           if (message.Length != 0)
    89             ErrorHandling.ShowErrorDialog(this, new Exception(message.ToString()));
    90           else
    91             Content.ProblemData = problemData;
     84          if (problemData == null) {
     85            ErrorHandling.ShowErrorDialog(this,
     86              new NullReferenceException("The problem data is null." + Environment.NewLine
     87                                       + "The .hl-file is no RegressionProblemData or RegressionProblem."));
     88          } else {
     89            StringBuilder message = new StringBuilder();
     90            if (!problemData.TargetVariable.Equals(Content.ProblemData.TargetVariable))
     91              message.AppendLine("The target variables are not matching. Old target variable: '"
     92                               + Content.ProblemData.TargetVariable
     93                               + "'. New targetvariable: '" + problemData.TargetVariable + "'");
     94
     95            List<string> variables = problemData.InputVariables.Select(x => x.Value).ToList();
     96
     97            foreach (var item in Content.ProblemData.InputVariables.CheckedItems) {
     98              if (!variables.Contains(item.Value.Value))
     99                message.AppendLine("Input variable '" + item.Value.Value + "' is not in the new problem data.");
     100            }
     101
     102            if (message.Length != 0)
     103              ErrorHandling.ShowErrorDialog(this, new Exception(message.ToString()));
     104            else
     105              Content.ProblemData = problemData;
     106          }
    92107        }
    93108      }
Note: See TracChangeset for help on using the changeset viewer.