Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/17/11 22:51:11 (13 years ago)
Author:
abeham
Message:

#1541

  • updated to latest trunk version
Location:
branches/QAPAlgorithms
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/QAPAlgorithms

  • branches/QAPAlgorithms/HeuristicLab.Core.Views/3.3/Clipboard.cs

    r5839 r6569  
    2727using System.Threading;
    2828using System.Windows.Forms;
     29using HeuristicLab.Common;
    2930using HeuristicLab.MainForm;
    3031using HeuristicLab.Persistence.Default.Xml;
    … …  
    321322          } else if (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IEnumerable) {
    322323            IEnumerable<T> items = ((IEnumerable)e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat)).Cast<T>();
     324            if (e.Effect.HasFlag(DragDropEffects.Copy)) {
     325              Cloner cloner = new Cloner();
     326              items = items.Select(x => cloner.Clone(x));
     327            }
    323328            foreach (T item in items)
    324               AddItem(e.Effect.HasFlag(DragDropEffects.Copy) ? (T)item.Clone() : item);
     329              AddItem(item);
    325330          }
    326331        }

  • branches/QAPAlgorithms/HeuristicLab.Core.Views/3.3/HeuristicLabCoreViewsPlugin.cs.frame

    r6099 r6569  
    2626  /// Plugin class for HeuristicLab.Core.Views plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Core.Views", "3.3.4.$WCREV$")]
     28  [Plugin("HeuristicLab.Core.Views", "3.3.5.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Core.Views-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Collections", "3.3")]

  • branches/QAPAlgorithms/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

    r5839 r6569  
    2626using System.Windows.Forms;
    2727using HeuristicLab.Collections;
     28using HeuristicLab.Common;
    2829using HeuristicLab.MainForm;
    2930using HeuristicLab.MainForm.WindowsForms;
    … …  
    294295        } else if (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IEnumerable) {
    295296          IEnumerable<T> items = ((IEnumerable)e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat)).Cast<T>();
     297          if (e.Effect.HasFlag(DragDropEffects.Copy)) {
     298            Cloner cloner = new Cloner();
     299            items = items.Select(x => cloner.Clone(x));
     300          }
    296301          foreach (T item in items)
    297             Content.Add(e.Effect.HasFlag(DragDropEffects.Copy) ? (T)item.Clone() : item);
     302            Content.Add(item);
    298303        }
    299304      }

  • branches/QAPAlgorithms/HeuristicLab.Core.Views/3.3/ItemListView.cs

    r5928 r6569  
    2727using System.Windows.Forms;
    2828using HeuristicLab.Collections;
     29using HeuristicLab.Common;
    2930using HeuristicLab.MainForm;
    3031using HeuristicLab.MainForm.WindowsForms;
    … …  
    334335        } else if (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IEnumerable) {
    335336          IEnumerable<T> items = ((IEnumerable)e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat)).Cast<T>();
     337          if (e.Effect.HasFlag(DragDropEffects.Copy)) {
     338            Cloner cloner = new Cloner();
     339            items = items.Select(x => cloner.Clone(x));
     340          }
    336341          foreach (T item in items) {
    337             if (listViewItem != null) Content.Insert(listViewItem.Index, e.Effect.HasFlag(DragDropEffects.Copy) ? (T)item.Clone() : item);
    338             else Content.Add(e.Effect.HasFlag(DragDropEffects.Copy) ? (T)item.Clone() : item);
     342            if (listViewItem != null) Content.Insert(listViewItem.Index, item);
     343            else Content.Add(item);
    339344          }
    340345        }

  • branches/QAPAlgorithms/HeuristicLab.Core.Views/3.3/Properties/AssemblyInfo.frame

    r6099 r6569  
    5454// by using the '*' as shown below:
    5555[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.4.$WCREV$")]
     56[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]

  • branches/QAPAlgorithms/HeuristicLab.Core.Views/3.3/TypeSelector.cs

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/GP.Grammar.Editor/HeuristicLab.Core.Views/3.3/TypeSelector.csmergedeligible
      /trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.csmergedeligible
      /branches/CloningRefactoring/HeuristicLab.Core.Views/3.3/TypeSelector.cs4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Core.Views/3.3/TypeSelector.cs5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Core.Views/3.3/TypeSelector.cs5815-6180
      /branches/DataAnalysis/HeuristicLab.Core.Views/3.3/TypeSelector.cs4458-4459,​4462,​4464
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Core.Views/3.3/TypeSelector.cs5060
      /branches/NET40/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs5138-5162
      /branches/ParallelEngine/HeuristicLab.Core.Views/3.3/TypeSelector.cs5175-5192
      /branches/SuccessProgressAnalysis/HeuristicLab.Core.Views/3.3/TypeSelector.cs5370-5682
      /branches/VNS/HeuristicLab.Core.Views/3.3/TypeSelector.cs5594-5752
      /branches/histogram/HeuristicLab.Core.Views/3.3/TypeSelector.cs5959-6341
    r6019 r6569  
    8686
    8787    public virtual void Configure(Type baseType, bool showNotInstantiableTypes, bool showGenericTypes) {
    88       Configure(new List<Type>() { baseType }, showNotInstantiableTypes, showGenericTypes, true);
     88      Configure(baseType, showNotInstantiableTypes, showGenericTypes, (t) => true);
     89    }
     90
     91    public virtual void Configure(Type baseType, bool showNotInstantiableTypes, bool showGenericTypes, Func<Type, bool> typeCondition) {
     92      Configure(new List<Type>() { baseType }, showNotInstantiableTypes, showGenericTypes, true, typeCondition);
    8993    }
    9094
    9195    public virtual void Configure(IEnumerable<Type> baseTypes, bool showNotInstantiableTypes, bool showGenericTypes, bool assignableToAllTypes) {
     96      Configure(baseTypes, showNotInstantiableTypes, showGenericTypes, assignableToAllTypes, (t) => { return true; });
     97    }
     98
     99    public virtual void Configure(IEnumerable<Type> baseTypes, bool showNotInstantiableTypes, bool showGenericTypes, bool assignableToAllTypes, Func<Type, bool> typeCondition) {
    92100      if (baseTypes == null) throw new ArgumentNullException();
    93101      if (InvokeRequired)
    94         Invoke(new Action<IEnumerable<Type>, bool, bool, bool>(Configure), baseTypes, showNotInstantiableTypes, showGenericTypes, assignableToAllTypes);
     102        Invoke(new Action<IEnumerable<Type>, bool, bool, bool, Func<Type, bool>>(Configure), baseTypes, showNotInstantiableTypes, showGenericTypes, assignableToAllTypes, typeCondition);
    95103      else {
    96104        this.baseTypes = baseTypes;
    … …  
    120128
    121129          var types = from t in ApplicationManager.Manager.GetTypes(BaseTypes, plugin, !ShowNotInstantiableTypes, assignableToAllTypes)
     130                      where typeCondition(t)
    122131                      orderby t.Name ascending
    123132                      select t;
Note: See TracChangeset for help on using the changeset viewer.