Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/16/13 13:13:41 (11 years ago)
Author:
spimming
Message:

#1888:

  • Merged revisions from trunk
Location:
branches/OaaS
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • branches/OaaS

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.3/HeuristicLab.Problems.VehicleRouting.Views-3.3.csproj

    r6866 r9363  
    260260  -->
    261261  <PropertyGroup>
    262     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     262   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    263263set ProjectDir=$(ProjectDir)
    264264set SolutionDir=$(SolutionDir)
    … …  
    267267call PreBuildEvent.cmd
    268268</PreBuildEvent>
     269<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     270export ProjectDir=$(ProjectDir)
     271export SolutionDir=$(SolutionDir)
     272
     273$SolutionDir/PreBuildEvent.sh
     274</PreBuildEvent>
    269275  </PropertyGroup>
    270276</Project>

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.3/Plugin.cs.frame

    r7259 r9363  
    2626  /// Plugin class for HeuristicLab.Problems.VehicleRouting.Views plugin
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Problems.VehicleRouting.Views", "3.3.6.$WCREV$")]
     28  [Plugin("HeuristicLab.Problems.VehicleRouting.Views", "3.3.7.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.VehicleRouting.Views-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.3/Properties/AssemblyInfo.cs.frame

    r7259 r9363  
    5353// by using the '*' as shown below:
    5454[assembly: AssemblyVersion("3.3.0.0")]
    55 [assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
     55[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.3/VehicleRoutingProblemView.Designer.cs

    r5832 r9363  
    1 namespace HeuristicLab.Problems.VehicleRouting.Views {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22namespace HeuristicLab.Problems.VehicleRouting.Views {
    223  partial class VehicleRoutingProblemView {
    324    /// <summary>

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/CVRPPDTWView.Designer.cs

    r6710 r9363  
    1 namespace HeuristicLab.Problems.VehicleRouting.Views {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22namespace HeuristicLab.Problems.VehicleRouting.Views {
    223  partial class CVRPPDTWView {
    324    /// <summary>

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/CVRPPDTWView.cs

    r7858 r9363  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.Collections.Generic;
    324using System.ComponentModel;

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/CVRPTWView.Designer.cs

    r4374 r9363  
    1 namespace HeuristicLab.Problems.VehicleRouting.Views {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22namespace HeuristicLab.Problems.VehicleRouting.Views {
    223  partial class CVRPTWView {
    324    /// <summary>

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/CVRPTWView.cs

    r7858 r9363  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.Collections.Generic;
    324using System.ComponentModel;

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/HeuristicLab.Problems.VehicleRouting.Views-3.4.csproj

    r7923 r9363  
    6969    <OutputPath>..\..\bin\</OutputPath>
    7070    <DefineConstants>TRACE</DefineConstants>
    71     <DocumentationFile>bin\x86\Release\HeuristicLab.Problems.VehicleRouting.Views-3.4.xml</DocumentationFile>
     71    <DocumentationFile>
     72    </DocumentationFile>
    7273    <Optimize>true</Optimize>
    7374    <DebugType>pdbonly</DebugType>
    … …  
    298299  -->
    299300  <PropertyGroup>
    300     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     301    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    301302set ProjectDir=$(ProjectDir)
    302303set SolutionDir=$(SolutionDir)
    … …  
    304305
    305306call PreBuildEvent.cmd</PreBuildEvent>
     307    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     308export ProjectDir=$(ProjectDir)
     309export SolutionDir=$(SolutionDir)
     310
     311$SolutionDir/PreBuildEvent.sh
     312</PreBuildEvent>
    306313  </PropertyGroup>
    307314  <PropertyGroup>

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPPDTWView.Designer.cs

    r6856 r9363  
    1 namespace HeuristicLab.Problems.VehicleRouting.Views {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22namespace HeuristicLab.Problems.VehicleRouting.Views {
    223  partial class MDCVRPPDTWView {
    324    /// <summary>

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPPDTWView.cs

    r7858 r9363  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.Collections.Generic;
    324using System.ComponentModel;

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPTWView.Designer.cs

    r6854 r9363  
    1 namespace HeuristicLab.Problems.VehicleRouting.Views {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22namespace HeuristicLab.Problems.VehicleRouting.Views {
    223  partial class MDCVRPTWView {
    324    /// <summary>

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPTWView.cs

    r7858 r9363  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.Collections.Generic;
    324using System.ComponentModel;

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/MultiDepotVRPView.Designer.cs

    r6851 r9363  
    1 namespace HeuristicLab.Problems.VehicleRouting.Views {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22namespace HeuristicLab.Problems.VehicleRouting.Views {
    223  partial class MultiDepotVRPView {
    324    /// <summary>

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/MultiDepotVRPView.cs

    r7858 r9363  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.Collections.Generic;
    324using System.ComponentModel;

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/SingleDepotVRPView.Designer.cs

    r4374 r9363  
    1 namespace HeuristicLab.Problems.VehicleRouting.Views {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22namespace HeuristicLab.Problems.VehicleRouting.Views {
    223  partial class SingleDepotVRPView {
    324    /// <summary>

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/SingleDepotVRPView.cs

    r7858 r9363  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.Collections.Generic;
    324using System.ComponentModel;

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPProblemInstanceView.Designer.cs

    r6715 r9363  
    1 namespace HeuristicLab.Problems.VehicleRouting.Views {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22namespace HeuristicLab.Problems.VehicleRouting.Views {
    223  partial class VRPProblemInstanceView {
    324    /// <summary>
    … …  
    2546    private void InitializeComponent() {
    2647      this.pictureBox = new System.Windows.Forms.PictureBox();
     48      this.tabControl1 = new System.Windows.Forms.TabControl();
     49      this.tabPage1 = new System.Windows.Forms.TabPage();
     50      this.tabPage2 = new System.Windows.Forms.TabPage();
     51      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    2752      ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
     53      this.tabControl1.SuspendLayout();
     54      this.tabPage1.SuspendLayout();
     55      this.tabPage2.SuspendLayout();
    2856      this.SuspendLayout();
     57      //
     58      // parameterCollectionView
     59      //
     60      this.parameterCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
     61      this.parameterCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
     62      this.parameterCollectionView.Location = new System.Drawing.Point(3, 3);
     63      this.parameterCollectionView.Size = new System.Drawing.Size(448, 361);
     64      //
     65      // nameTextBox
     66      //
     67      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     68      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
     69      this.nameTextBox.Size = new System.Drawing.Size(213, 20);
     70      this.nameTextBox.Visible = false;
     71      //
     72      // nameLabel
     73      //
     74      this.nameLabel.Visible = false;
    2975      //
    3076      // pictureBox
    … …  
    3379      this.pictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
    3480      this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
    35       this.pictureBox.Location = new System.Drawing.Point(0, 0);
     81      this.pictureBox.Location = new System.Drawing.Point(3, 3);
    3682      this.pictureBox.Name = "pictureBox";
    37       this.pictureBox.Size = new System.Drawing.Size(462, 393);
     83      this.pictureBox.Size = new System.Drawing.Size(448, 361);
    3884      this.pictureBox.TabIndex = 1;
    3985      this.pictureBox.TabStop = false;
    4086      this.pictureBox.SizeChanged += new System.EventHandler(this.pictureBox_SizeChanged);
    41       this.pictureBox.MouseClick += new System.Windows.Forms.MouseEventHandler(pictureBox_MouseClick);
     87      this.pictureBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pictureBox_MouseClick);
     88      //
     89      // tabControl1
     90      //
     91      this.tabControl1.Controls.Add(this.tabPage1);
     92      this.tabControl1.Controls.Add(this.tabPage2);
     93      this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
     94      this.tabControl1.Location = new System.Drawing.Point(0, 0);
     95      this.tabControl1.Name = "tabControl1";
     96      this.tabControl1.SelectedIndex = 0;
     97      this.tabControl1.Size = new System.Drawing.Size(462, 393);
     98      this.tabControl1.TabIndex = 2;
     99      //
     100      // tabPage1
     101      //
     102      this.tabPage1.Controls.Add(this.pictureBox);
     103      this.tabPage1.Location = new System.Drawing.Point(4, 22);
     104      this.tabPage1.Name = "tabPage1";
     105      this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
     106      this.tabPage1.Size = new System.Drawing.Size(454, 367);
     107      this.tabPage1.TabIndex = 0;
     108      this.tabPage1.Text = "Visualization";
     109      this.tabPage1.UseVisualStyleBackColor = true;
     110      //
     111      // tabPage2
     112      //
     113      this.tabPage2.Controls.Add(this.parameterCollectionView);
     114      this.tabPage2.Location = new System.Drawing.Point(4, 22);
     115      this.tabPage2.Name = "tabPage2";
     116      this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
     117      this.tabPage2.Size = new System.Drawing.Size(454, 367);
     118      this.tabPage2.TabIndex = 1;
     119      this.tabPage2.Text = "Parameters";
     120      this.tabPage2.UseVisualStyleBackColor = true;
    42121      //
    43122      // VRPProblemInstanceView
    44123      //
    45       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    46       this.Controls.Add(this.pictureBox);
     124      this.Controls.Add(this.tabControl1);
    47125      this.Name = "VRPProblemInstanceView";
    48126      this.Size = new System.Drawing.Size(462, 393);
     127      this.Controls.SetChildIndex(this.tabControl1, 0);
     128      this.Controls.SetChildIndex(this.infoLabel, 0);
     129      this.Controls.SetChildIndex(this.nameTextBox, 0);
     130      this.Controls.SetChildIndex(this.nameLabel, 0);
     131      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    49132      ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
     133      this.tabControl1.ResumeLayout(false);
     134      this.tabPage1.ResumeLayout(false);
     135      this.tabPage2.ResumeLayout(false);
    50136      this.ResumeLayout(false);
     137      this.PerformLayout();
    51138
    52139    }
    … …  
    54141
    55142    private System.Windows.Forms.PictureBox pictureBox;
     143    private System.Windows.Forms.TabControl tabControl1;
     144    private System.Windows.Forms.TabPage tabPage1;
     145    private System.Windows.Forms.TabPage tabPage2;
    56146  }
    57147}

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPProblemInstanceView.cs

    r8053 r9363  
    2727using HeuristicLab.MainForm;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
     29using HeuristicLab.Optimization.Views;
    2930
    3031namespace HeuristicLab.Problems.VehicleRouting.Views {
    3132  [View("VRPProblemInstance View")]
    3233  [Content(typeof(IVRPProblemInstance), true)]
    33   public abstract partial class VRPProblemInstanceView : ItemView {
     34  public abstract partial class VRPProblemInstanceView : ParameterizedNamedItemView {
    3435    public new IVRPProblemInstance Content {
    3536      get { return (IVRPProblemInstance)base.Content; }

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPSolutionView.Designer.cs

    r8115 r9363  
    1 namespace HeuristicLab.Problems.VehicleRouting.Views {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22namespace HeuristicLab.Problems.VehicleRouting.Views {
    223  partial class VRPSolutionView {
    324    /// <summary>

  • branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views/3.4/VehicleRoutingProblemView.Designer.cs

    r7967 r9363  
    1 namespace HeuristicLab.Problems.VehicleRouting.Views {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22namespace HeuristicLab.Problems.VehicleRouting.Views {
    223  partial class VehicleRoutingProblemView {
    324    /// <summary>
Note: See TracChangeset for help on using the changeset viewer.