Changeset 11349


Ignore:
Timestamp:
09/06/14 11:58:15 (5 years ago)
Author:
bburlacu
Message:

#1772: Merged trunk changes for HeuristicLab.Problems.DataAnalysis.Symbolic.Views.

Location:
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicExpressionTreeChart.cs

    r11208 r11349  
    9191    }
    9292
     93
     94    private static readonly ISymbolicExpressionGrammar grammar = new TypeCoherentExpressionGrammar();
    9395    private void insertNodeToolStripMenuItem_Click(object sender, EventArgs e) {
    9496      if (currSelected == null || currSelected.Content is SymbolicExpressionTreeTerminalNode) return;
     
    9698
    9799      using (var dialog = new InsertNodeDialog()) {
    98         dialog.SetAllowedSymbols(parent.Grammar.Symbols.Where(s => !(s is ProgramRootSymbol || s is StartSymbol || s is Defun || s is GroupSymbol))); // allow everything
     100        dialog.SetAllowedSymbols(grammar.Symbols.Where(s => !(s is ProgramRootSymbol || s is StartSymbol || s is Defun || s is GroupSymbol))); // allow everything
    99101        dialog.ShowDialog(this);
    100102        if (dialog.DialogResult != DialogResult.OK) return;
  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/RunCollectionVariableImpactView.cs

    r11208 r11349  
    2222using System;
    2323using System.Collections.Generic;
     24using System.ComponentModel;
    2425using System.Drawing;
    2526using System.Linq;
     
    6667    private void RegisterRunEvents(IEnumerable<IRun> runs) {
    6768      foreach (IRun run in runs)
    68         run.Changed += Run_Changed;
     69        run.PropertyChanged += Run_PropertyChanged;
    6970    }
    7071    private void DeregisterRunEvents(IEnumerable<IRun> runs) {
    7172      foreach (IRun run in runs)
    72         run.Changed -= Run_Changed;
     73        run.PropertyChanged -= Run_PropertyChanged;
    7374    }
    7475    private void Content_ItemsAdded(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<IRun> e) {
     
    8889      if (!Content.UpdateOfRunsInProgress) UpdateData();
    8990    }
    90     private void Run_Changed(object sender, EventArgs e) {
    91       if (!Content.UpdateOfRunsInProgress) UpdateData();
     91    private void Run_PropertyChanged(object sender, PropertyChangedEventArgs e) {
     92      if (!Content.UpdateOfRunsInProgress && e.PropertyName == "Visible")
     93        UpdateData();
    9294    }
    9395    #endregion
Note: See TracChangeset for help on using the changeset viewer.