Changeset 3694


Ignore:
Timestamp:
05/07/10 04:45:45 (12 years ago)
Author:
swagner
Message:

Implemented reviewers' comments (#893)

Location:
trunk/sources
Files:
1 deleted
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Core.Views/3.3/Clipboard.cs

    r3588 r3694  
    249249      T item = e.Data.GetData("Value") as T;
    250250      if (!ReadOnly && (type != null) && (item != null)) {
    251         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
     251        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
    252252        else if (((e.KeyState & 4) == 4) && !itemListViewItemTable.ContainsKey(item)) e.Effect = DragDropEffects.Move;  // SHIFT key
    253253        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemArrayView.cs

    r3588 r3694  
    259259        ListViewItem listViewItem = itemsListView.GetItemAt(p.X, p.Y);
    260260        if (listViewItem != null) {
    261           if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
     261          if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
    262262          else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    263263          else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

    r3588 r3694  
    212212      Type type = e.Data.GetData("Type") as Type;
    213213      if (!Content.IsReadOnly && !ReadOnly && (type != null) && (typeof(T).IsAssignableFrom(type))) {
    214         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
     214        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
    215215        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    216216        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.cs

    r3588 r3694  
    247247      Type type = e.Data.GetData("Type") as Type;
    248248      if (!Content.IsReadOnly && !ReadOnly && (type != null) && (typeof(T).IsAssignableFrom(type))) {
    249         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
     249        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
    250250        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    251251        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
  • trunk/sources/HeuristicLab.Core.Views/3.3/VariableValueView.cs

    r3566 r3694  
    104104      Type type = e.Data.GetData("Type") as Type;
    105105      if (!ReadOnly && (type != null) && (typeof(IItem).IsAssignableFrom(type))) {
    106         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
     106        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
    107107        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    108108        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
  • trunk/sources/HeuristicLab.Core.Views/3.3/VariableView.cs

    r3588 r3694  
    132132      Type type = e.Data.GetData("Type") as Type;
    133133      if (!ReadOnly && (type != null) && (typeof(IItem).IsAssignableFrom(type))) {
    134         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
     134        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
    135135        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    136136        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
  • trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphView.cs

    r3566 r3694  
    225225      Type type = e.Data.GetData("Type") as Type;
    226226      if (!ReadOnly && (type != null) && (typeof(IOperator).IsAssignableFrom(type))) {
    227         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key       
     227        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
    228228        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    229229        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs

    r3588 r3694  
    230230      Type type = e.Data.GetData("Type") as Type;
    231231      if ((type != null) && (Content.ProblemType.IsAssignableFrom(type))) {
    232         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
     232        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
    233233        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    234234        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/BatchRunView.cs

    r3588 r3694  
    215215      Type type = e.Data.GetData("Type") as Type;
    216216      if ((type != null) && (typeof(IAlgorithm).IsAssignableFrom(type))) {
    217         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
     217        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
    218218        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    219219        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs

    r3632 r3694  
    232232      Type type = e.Data.GetData("Type") as Type;
    233233      if (!Content.IsReadOnly && !ReadOnly && (type != null) && (typeof(IRun).IsAssignableFrom(type))) {
    234         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
     234        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
    235235        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    236236        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
  • trunk/sources/HeuristicLab.Optimization/3.3/Algorithm.cs

    r3616 r3694  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
     27using HeuristicLab.Data;
    2728using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2829
     
    199200    }
    200201    public virtual void CollectResultValues(IDictionary<string, IItem> values) {
     202      values.Add("Execution Time", new TimeSpanValue(ExecutionTime));
    201203      foreach (IResult result in Results)
    202204        values.Add(result.Name, result.Value);
     
    242244      ExecutionState = ExecutionState.Stopped;
    243245      runsCounter++;
    244       runs.Add(new Run(string.Format("{0} Run {1} ({2})", Name, runsCounter, ExecutionTime), this));
     246      runs.Add(new Run(string.Format("{0} Run {1}", Name, runsCounter), this));
    245247      EventHandler handler = Stopped;
    246248      if (handler != null) handler(this, EventArgs.Empty);
  • trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.cs

    r3588 r3694  
    144144      Type type = e.Data.GetData("Type") as Type;
    145145      if (!ReadOnly && (type != null) && (Content.DataType.IsAssignableFrom(type))) {
    146         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
     146        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
    147147        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    148148        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
  • trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueParameterView.cs

    r3588 r3694  
    132132      Type type = e.Data.GetData("Type") as Type;
    133133      if (!ReadOnly && (type != null) && (Content.DataType.IsAssignableFrom(type))) {
    134         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
     134        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
    135135        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    136136        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
  • trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj

    r3647 r3694  
    146146    </ProjectReference>
    147147  </ItemGroup>
    148   <ItemGroup>
    149     <EmbeddedResource Include="SingleObjectiveTestFunctionSolutionView.resx">
    150       <DependentUpon>SingleObjectiveTestFunctionSolutionView.cs</DependentUpon>
    151     </EmbeddedResource>
    152   </ItemGroup>
    153148  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    154149  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionSolutionView.Designer.cs

    r3661 r3694  
    3232      this.textualTabPage = new System.Windows.Forms.TabPage();
    3333      this.graphicalTabPage = new System.Windows.Forms.TabPage();
     34      this.pictureBox = new System.Windows.Forms.PictureBox();
    3435      this.label1 = new System.Windows.Forms.Label();
    35       this.pictureBox = new System.Windows.Forms.PictureBox();
    3636      this.splitContainer1.Panel1.SuspendLayout();
    3737      this.splitContainer1.Panel2.SuspendLayout();
     
    4747      // qualityView
    4848      //
     49      this.qualityView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     50                  | System.Windows.Forms.AnchorStyles.Left)
     51                  | System.Windows.Forms.AnchorStyles.Right)));
    4952      this.qualityView.Caption = null;
    5053      this.qualityView.Content = null;
    51       this.qualityView.Dock = System.Windows.Forms.DockStyle.Fill;
    52       this.qualityView.Location = new System.Drawing.Point(3, 16);
     54      this.qualityView.Location = new System.Drawing.Point(6, 19);
    5355      this.qualityView.Name = "qualityView";
    5456      this.qualityView.ReadOnly = false;
    55       this.qualityView.Size = new System.Drawing.Size(485, 31);
    56       this.qualityView.TabIndex = 1;
     57      this.qualityView.Size = new System.Drawing.Size(479, 32);
     58      this.qualityView.TabIndex = 0;
    5759      this.qualityView.ViewType = null;
    5860      //
     
    6264      this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
    6365      this.splitContainer1.IsSplitterFixed = true;
    64       this.splitContainer1.Location = new System.Drawing.Point(0, 0);
     66      this.splitContainer1.Location = new System.Drawing.Point(3, 3);
    6567      this.splitContainer1.Name = "splitContainer1";
    6668      this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
     
    7678      this.splitContainer1.Panel2MinSize = 30;
    7779      this.splitContainer1.Size = new System.Drawing.Size(491, 304);
    78       this.splitContainer1.TabIndex = 7;
     80      this.splitContainer1.SplitterDistance = 60;
     81      this.splitContainer1.TabIndex = 0;
    7982      //
    8083      // groupBox3
    8184      //
     85      this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     86                  | System.Windows.Forms.AnchorStyles.Left)
     87                  | System.Windows.Forms.AnchorStyles.Right)));
    8288      this.groupBox3.Controls.Add(this.qualityView);
    83       this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
    8489      this.groupBox3.Location = new System.Drawing.Point(0, 0);
    8590      this.groupBox3.Name = "groupBox3";
    86       this.groupBox3.Size = new System.Drawing.Size(491, 50);
    87       this.groupBox3.TabIndex = 6;
     91      this.groupBox3.Size = new System.Drawing.Size(491, 57);
     92      this.groupBox3.TabIndex = 0;
    8893      this.groupBox3.TabStop = false;
    8994      this.groupBox3.Text = "Quality";
     
    9196      // groupBox4
    9297      //
     98      this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     99                  | System.Windows.Forms.AnchorStyles.Left)
     100                  | System.Windows.Forms.AnchorStyles.Right)));
    93101      this.groupBox4.Controls.Add(this.realVectorView);
    94       this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill;
    95       this.groupBox4.Location = new System.Drawing.Point(0, 0);
     102      this.groupBox4.Location = new System.Drawing.Point(0, 3);
    96103      this.groupBox4.Name = "groupBox4";
    97       this.groupBox4.Size = new System.Drawing.Size(491, 250);
    98       this.groupBox4.TabIndex = 6;
     104      this.groupBox4.Size = new System.Drawing.Size(491, 237);
     105      this.groupBox4.TabIndex = 0;
    99106      this.groupBox4.TabStop = false;
    100107      this.groupBox4.Text = "Real vector";
     
    102109      // realVectorView
    103110      //
     111      this.realVectorView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     112                  | System.Windows.Forms.AnchorStyles.Left)
     113                  | System.Windows.Forms.AnchorStyles.Right)));
    104114      this.realVectorView.Caption = null;
    105115      this.realVectorView.Content = null;
    106       this.realVectorView.Dock = System.Windows.Forms.DockStyle.Fill;
    107       this.realVectorView.Location = new System.Drawing.Point(3, 16);
     116      this.realVectorView.Location = new System.Drawing.Point(6, 19);
    108117      this.realVectorView.Name = "realVectorView";
    109118      this.realVectorView.ReadOnly = false;
    110       this.realVectorView.Size = new System.Drawing.Size(485, 231);
    111       this.realVectorView.TabIndex = 1;
     119      this.realVectorView.Size = new System.Drawing.Size(479, 212);
     120      this.realVectorView.TabIndex = 0;
    112121      this.realVectorView.ViewType = null;
    113122      //
     
    121130      this.tabControl1.SelectedIndex = 0;
    122131      this.tabControl1.Size = new System.Drawing.Size(505, 336);
    123       this.tabControl1.TabIndex = 2;
     132      this.tabControl1.TabIndex = 0;
    124133      //
    125134      // textualTabPage
     
    146155      this.graphicalTabPage.UseVisualStyleBackColor = true;
    147156      //
     157      // pictureBox
     158      //
     159      this.pictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     160                  | System.Windows.Forms.AnchorStyles.Left)
     161                  | System.Windows.Forms.AnchorStyles.Right)));
     162      this.pictureBox.BackColor = System.Drawing.Color.White;
     163      this.pictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
     164      this.pictureBox.Location = new System.Drawing.Point(6, 6);
     165      this.pictureBox.Name = "pictureBox";
     166      this.pictureBox.Size = new System.Drawing.Size(485, 298);
     167      this.pictureBox.TabIndex = 1;
     168      this.pictureBox.TabStop = false;
     169      //
    148170      // label1
    149171      //
     
    155177      this.label1.TabIndex = 0;
    156178      this.label1.Text = "The graphical view is only available for 2 dimensions";
    157       //
    158       // pictureBox
    159       //
    160       this.pictureBox.BackColor = System.Drawing.Color.White;
    161       this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
    162       this.pictureBox.Location = new System.Drawing.Point(0, 0);
    163       this.pictureBox.Name = "pictureBox";
    164       this.pictureBox.Size = new System.Drawing.Size(491, 304);
    165       this.pictureBox.TabIndex = 1;
    166       this.pictureBox.TabStop = false;
    167179      //
    168180      // SingleObjectiveTestFunctionSolutionView
     
    190202    private System.Windows.Forms.SplitContainer splitContainer1;
    191203    private System.Windows.Forms.GroupBox groupBox4;
    192     protected HeuristicLab.MainForm.WindowsForms.ViewHost qualityView;
     204    private HeuristicLab.MainForm.WindowsForms.ViewHost qualityView;
    193205    private System.Windows.Forms.GroupBox groupBox3;
    194     protected HeuristicLab.MainForm.WindowsForms.ViewHost realVectorView;
     206    private HeuristicLab.MainForm.WindowsForms.ViewHost realVectorView;
    195207    private System.Windows.Forms.TabControl tabControl1;
    196208    private System.Windows.Forms.TabPage textualTabPage;
Note: See TracChangeset for help on using the changeset viewer.