Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/13/10 04:37:49 (15 years ago)
Author:
swagner
Message:

Operator architecture refactoring (#95)

  • implemented reviewers' comments
  • added additional plugins HeuristicLab.Evolutionary, HeuristicLab.Permutation, HeuristicLab.Selection, and HeuristicLab.Routing.TSP
Location:
trunk/sources/HeuristicLab.Optimizer/3.3
Files:
2 deleted
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Optimizer/3.3/FileManager.cs

    r2713 r2790  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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;
     24using System.IO;
    325using System.Linq;
    4 using System.Text;
    526using System.Threading;
    6 using System.IO;
    727using System.Windows.Forms;
     28using HeuristicLab.Core;
     29using HeuristicLab.Core.Views;
    830using HeuristicLab.MainForm;
    9 using HeuristicLab.Core;
    1031using HeuristicLab.Persistence.Default.Xml;
    11 using HeuristicLab.Core.Views;
    1232
    1333namespace HeuristicLab.Optimizer {

  • trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

    r2754 r2790  
    124124  </ItemGroup>
    125125  <ItemGroup>
    126     <EmbeddedResource Include="NewItemDialog.resx">
    127       <DependentUpon>NewItemDialog.cs</DependentUpon>
    128     </EmbeddedResource>
    129     <EmbeddedResource Include="OptimizerMainForm.resx">
    130       <DependentUpon>OptimizerMainForm.cs</DependentUpon>
    131     </EmbeddedResource>
    132126    <EmbeddedResource Include="Properties\Resources.resx">
    133127      <Generator>ResXFileCodeGenerator</Generator>

  • trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerApplication.cs

    r2656 r2790  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2009 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Text;
    25 using System.Reflection;
    2622using System.Windows.Forms;
    2723using HeuristicLab.PluginInfrastructure;
    28 using HeuristicLab.Common.Resources;
    29 using HeuristicLab.MainForm;
    30 using HeuristicLab.MainForm.WindowsForms;
    3124
    3225namespace HeuristicLab.Optimizer {
    … …  
    3528    public override void Run() {
    3629      OptimizerMainForm mainForm = new OptimizerMainForm(typeof(IOptimizerUserInterfaceItemProvider));
    37       mainForm.ViewClosed += new EventHandler<ViewEventArgs>(FileManager.ViewClosed);
    3830      Application.Run(mainForm);
    3931    }

  • trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs.frame

    r2754 r2790  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2009 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Text;
    2522using HeuristicLab.PluginInfrastructure;
    2623

  • trunk/sources/HeuristicLab.Optimizer/3.3/IOptimizerUserInterfaceItemProvider.cs

    r2501 r2790  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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
    521
    622namespace HeuristicLab.Optimizer {
    7   public interface IOptimizerUserInterfaceItemProvider {
    8   }
     23  public interface IOptimizerUserInterfaceItemProvider { }
    924}

  • trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/CloseAllMenuItem.cs

    r2713 r2790  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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.Linq;
    4 using System.Text;
    525using System.Windows.Forms;
    6 using System.Drawing;
    726using HeuristicLab.MainForm;
    8 using HeuristicLab.MainForm.WindowsForms;
    9 using HeuristicLab.Common.Resources;
    1027
    1128namespace HeuristicLab.Optimizer.MenuItems {

  • trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/CloseMenuItem.cs

    r2713 r2790  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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;
    3 using System.Linq;
    4 using System.Text;
    524using System.Windows.Forms;
    6 using System.Drawing;
    725using HeuristicLab.MainForm;
    8 using HeuristicLab.MainForm.WindowsForms;
    9 using HeuristicLab.Common.Resources;
    1026
    1127namespace HeuristicLab.Optimizer.MenuItems {

  • trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/ExitMenuItem.cs

    r2713 r2790  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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
    222using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
    523using System.Windows.Forms;
    6 using System.Drawing;
    724using HeuristicLab.MainForm;
    8 using HeuristicLab.MainForm.WindowsForms;
    9 using HeuristicLab.Common.Resources;
    1025
    1126namespace HeuristicLab.Optimizer.MenuItems {

  • trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/NewMenuItem.cs

    r2713 r2790  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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
    222using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
     23using System.Drawing;
    524using System.Windows.Forms;
    6 using System.Drawing;
    7 using HeuristicLab.MainForm.WindowsForms;
    825using HeuristicLab.Common.Resources;
    926

  • trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/OpenMenuItem.cs

    r2713 r2790  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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
    222using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
     23using System.Drawing;
    524using System.Windows.Forms;
    6 using System.Drawing;
    7 using HeuristicLab.MainForm.WindowsForms;
    825using HeuristicLab.Common.Resources;
    926

  • trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/OperatorsMenuItem.cs

    r2713 r2790  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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.Linq;
    4 using System.Text;
    525using System.Windows.Forms;
    6 using System.Drawing;
     26using HeuristicLab.Core.Views;
    727using HeuristicLab.MainForm;
    8 using HeuristicLab.MainForm.WindowsForms;
    9 using HeuristicLab.Common.Resources;
    10 using HeuristicLab.Core;
    11 using HeuristicLab.Core.Views;
    1228
    1329namespace HeuristicLab.Optimizer.MenuItems {
    1430  internal class OperatorsMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
    15     private OperatorsSidebar view;
    1631    private ToolStripMenuItem menuItem;
    1732
    … …  
    2742
    2843    protected override void OnToolStripItemSet(EventArgs e) {
    29       view = new OperatorsSidebar();
    30       view.Dock = DockStyle.Left;
     44      MainFormManager.MainForm.ViewShown += new EventHandler<ViewShownEventArgs>(MainForm_ViewShown);
    3145      MainFormManager.MainForm.ViewHidden += new EventHandler<ViewEventArgs>(MainForm_ViewHidden);
    3246
    3347      menuItem = ToolStripItem as ToolStripMenuItem;
    34       if (menuItem != null) {
    35         menuItem.Checked = true;
     48      if (menuItem != null)
    3649        menuItem.CheckOnClick = true;
    37       }
    38       view.Show();
    3950    }
    4051
     52    private void MainForm_ViewShown(object sender, ViewShownEventArgs e) {
     53      if ((e.View is OperatorsSidebar) && (menuItem != null))
     54        menuItem.Checked = true;
     55    }
    4156    private void MainForm_ViewHidden(object sender, ViewEventArgs e) {
    42       if ((e.View == view) && (menuItem != null))
     57      if ((e.View is OperatorsSidebar) && (menuItem != null))
    4358        menuItem.Checked = false;
    4459    }
    4560
    4661    public override void Execute() {
    47       if (menuItem != null) {
    48         if (menuItem.Checked)
    49           view.Show();
    50         else
    51           view.Hide();
    52       } else {
     62      var view = (from v in MainFormManager.MainForm.Views
     63                 where v is OperatorsSidebar
     64                 select v as OperatorsSidebar).FirstOrDefault();
     65      if (view.IsShown)
     66        view.Hide();
     67      else
    5368        view.Show();
    54       }
    5569    }
    5670  }

  • trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveAllMenuItem.cs

    r2713 r2790  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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;
     24using System.Drawing;
    325using System.Linq;
    4 using System.Text;
    526using System.Windows.Forms;
    6 using System.Drawing;
    7 using HeuristicLab.MainForm;
    8 using HeuristicLab.MainForm.WindowsForms;
    927using HeuristicLab.Common.Resources;
    1028using HeuristicLab.Core;
    11 using HeuristicLab.Core.Views;
     29using HeuristicLab.MainForm;
    1230
    1331namespace HeuristicLab.Optimizer.MenuItems {

  • trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveAsMenuItem.cs

    r2713 r2790  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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;
    3 using System.Linq;
    4 using System.Text;
    524using System.Windows.Forms;
    6 using System.Drawing;
     25using HeuristicLab.Core;
    726using HeuristicLab.MainForm;
    8 using HeuristicLab.MainForm.WindowsForms;
    9 using HeuristicLab.Common.Resources;
    10 using HeuristicLab.Core;
    11 using HeuristicLab.Core.Views;
    1227
    1328namespace HeuristicLab.Optimizer.MenuItems {

  • trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveMenuItem.cs

    r2713 r2790  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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;
    3 using System.Linq;
    4 using System.Text;
     24using System.Drawing;
    525using System.Windows.Forms;
    6 using System.Drawing;
    7 using HeuristicLab.MainForm;
    8 using HeuristicLab.MainForm.WindowsForms;
    926using HeuristicLab.Common.Resources;
    1027using HeuristicLab.Core;
    11 using HeuristicLab.Core.Views;
     28using HeuristicLab.MainForm;
    1229
    1330namespace HeuristicLab.Optimizer.MenuItems {

  • trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/Separators.cs

    r2708 r2790  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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
    222using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
    5 using System.Windows.Forms;
    6 using System.Drawing;
    723using HeuristicLab.MainForm;
    8 using HeuristicLab.MainForm.WindowsForms;
    9 using HeuristicLab.Common.Resources;
    1024
    1125namespace HeuristicLab.Optimizer.MenuItems {

  • trunk/sources/HeuristicLab.Optimizer/3.3/NewItemDialog.Designer.cs

    r2546 r2790  
    1 namespace HeuristicLab.Optimizer {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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.Optimizer {
    223  partial class NewItemDialog {
    324    /// <summary>
    … …  
    2546    private void InitializeComponent() {
    2647      this.components = new System.ComponentModel.Container();
    27       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NewItemDialog));
    2848      this.okButton = new System.Windows.Forms.Button();
    2949      this.cancelButton = new System.Windows.Forms.Button();
    … …  
    3151      this.nameColumnHeader = new System.Windows.Forms.ColumnHeader();
    3252      this.descriptioncolumnHeader = new System.Windows.Forms.ColumnHeader();
    33       this.itemsLabel = new System.Windows.Forms.Label();
    34       this.showIconsCheckBox = new System.Windows.Forms.CheckBox();
    35       this.showDetailsCheckBox = new System.Windows.Forms.CheckBox();
    3653      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
    3754      this.SuspendLayout();
    … …  
    7087            this.descriptioncolumnHeader});
    7188      this.itemsListView.HideSelection = false;
    72       this.itemsListView.Location = new System.Drawing.Point(12, 33);
     89      this.itemsListView.Location = new System.Drawing.Point(12, 12);
    7390      this.itemsListView.MultiSelect = false;
    7491      this.itemsListView.Name = "itemsListView";
    75       this.itemsListView.Size = new System.Drawing.Size(600, 370);
     92      this.itemsListView.Size = new System.Drawing.Size(600, 391);
    7693      this.itemsListView.TabIndex = 1;
    7794      this.itemsListView.UseCompatibleStateImageBehavior = false;
    78       this.itemsListView.View = System.Windows.Forms.View.SmallIcon;
     95      this.itemsListView.View = System.Windows.Forms.View.Details;
    7996      this.itemsListView.SelectedIndexChanged += new System.EventHandler(this.itemTypesListView_SelectedIndexChanged);
    8097      this.itemsListView.DoubleClick += new System.EventHandler(this.itemTypesListView_DoubleClick);
    … …  
    83100      //
    84101      this.nameColumnHeader.Text = "Name";
     102      this.nameColumnHeader.Width = 91;
    85103      //
    86104      // descriptioncolumnHeader
    87105      //
    88106      this.descriptioncolumnHeader.Text = "Description";
    89       //
    90       // itemsLabel
    91       //
    92       this.itemsLabel.AutoSize = true;
    93       this.itemsLabel.Location = new System.Drawing.Point(12, 9);
    94       this.itemsLabel.Name = "itemsLabel";
    95       this.itemsLabel.Size = new System.Drawing.Size(35, 13);
    96       this.itemsLabel.TabIndex = 0;
    97       this.itemsLabel.Text = "&Items:";
    98       //
    99       // showIconsCheckBox
    100       //
    101       this.showIconsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    102       this.showIconsCheckBox.Appearance = System.Windows.Forms.Appearance.Button;
    103       this.showIconsCheckBox.Checked = true;
    104       this.showIconsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
    105       this.showIconsCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("showIconsCheckBox.Image")));
    106       this.showIconsCheckBox.Location = new System.Drawing.Point(558, 3);
    107       this.showIconsCheckBox.Name = "showIconsCheckBox";
    108       this.showIconsCheckBox.Size = new System.Drawing.Size(24, 24);
    109       this.showIconsCheckBox.TabIndex = 4;
    110       this.toolTip.SetToolTip(this.showIconsCheckBox, "Show Icons");
    111       this.showIconsCheckBox.UseVisualStyleBackColor = true;
    112       this.showIconsCheckBox.Click += new System.EventHandler(this.showIconsCheckBox_Click);
    113       //
    114       // showDetailsCheckBox
    115       //
    116       this.showDetailsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    117       this.showDetailsCheckBox.Appearance = System.Windows.Forms.Appearance.Button;
    118       this.showDetailsCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("showDetailsCheckBox.Image")));
    119       this.showDetailsCheckBox.Location = new System.Drawing.Point(588, 3);
    120       this.showDetailsCheckBox.Name = "showDetailsCheckBox";
    121       this.showDetailsCheckBox.Size = new System.Drawing.Size(24, 24);
    122       this.showDetailsCheckBox.TabIndex = 5;
    123       this.toolTip.SetToolTip(this.showDetailsCheckBox, "Show Details");
    124       this.showDetailsCheckBox.UseVisualStyleBackColor = true;
    125       this.showDetailsCheckBox.Click += new System.EventHandler(this.showDetailsCheckBox_Click);
     107      this.descriptioncolumnHeader.Width = 190;
    126108      //
    127109      // NewItemDialog
    … …  
    132114      this.CancelButton = this.cancelButton;
    133115      this.ClientSize = new System.Drawing.Size(624, 444);
    134       this.Controls.Add(this.showDetailsCheckBox);
    135       this.Controls.Add(this.showIconsCheckBox);
    136       this.Controls.Add(this.itemsLabel);
    137116      this.Controls.Add(this.itemsListView);
    138117      this.Controls.Add(this.cancelButton);
    … …  
    149128      this.Shown += new System.EventHandler(this.NewItemDialog_Shown);
    150129      this.ResumeLayout(false);
    151       this.PerformLayout();
    152130
    153131    }
    … …  
    158136    private System.Windows.Forms.Button cancelButton;
    159137    private System.Windows.Forms.ListView itemsListView;
    160     private System.Windows.Forms.Label itemsLabel;
    161     private System.Windows.Forms.CheckBox showIconsCheckBox;
    162     private System.Windows.Forms.CheckBox showDetailsCheckBox;
    163138    private System.Windows.Forms.ToolTip toolTip;
    164139    private System.Windows.Forms.ColumnHeader nameColumnHeader;

  • trunk/sources/HeuristicLab.Optimizer/3.3/NewItemDialog.cs

    r2656 r2790  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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;
    3 using System.ComponentModel;
    4 using System.Data;
    5 using System.Drawing;
    624using System.Linq;
    7 using System.Text;
    825using System.Windows.Forms;
     26using HeuristicLab.Core;
    927using HeuristicLab.PluginInfrastructure;
    10 using HeuristicLab.Common.Resources;
    11 using HeuristicLab.Core;
    1228
    1329namespace HeuristicLab.Optimizer {
    … …  
    3046    private void NewItemDialog_Load(object sender, EventArgs e) {
    3147      if (!initialized) {
    32         SetListViewDisplayStyleCheckBoxes();
    33 
    3448        var categories = from t in ApplicationManager.Manager.GetTypes(typeof(IItem))
    3549                         where CreatableAttribute.IsCreatable(t)
    … …  
    5266          }
    5367        }
     68        for (int i = 0; i < itemsListView.Columns.Count; i++)
     69          itemsListView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
    5470        initialized = true;
    5571      }
    … …  
    7894      }
    7995    }
    80 
    81     private void showIconsCheckBox_Click(object sender, EventArgs e) {
    82       itemsListView.View = View.SmallIcon;
    83       SetListViewDisplayStyleCheckBoxes();
    84     }
    85     private void showDetailsCheckBox_Click(object sender, EventArgs e) {
    86       itemsListView.View = View.Details;
    87       SetListViewDisplayStyleCheckBoxes();
    88       for (int i = 0; i < itemsListView.Columns.Count; i++)
    89         itemsListView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
    90     }
    91     private void SetListViewDisplayStyleCheckBoxes() {
    92       showIconsCheckBox.Checked = itemsListView.View == View.SmallIcon;
    93       showDetailsCheckBox.Checked = itemsListView.View == View.Details;
    94     }
    9596  }
    9697}

  • trunk/sources/HeuristicLab.Optimizer/3.3/OptimizerMainForm.Designer.cs

    r2656 r2790  
    1 namespace HeuristicLab.Optimizer {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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.Optimizer {
    223  partial class OptimizerMainForm {
    324    /// <summary>

  • trunk/sources/HeuristicLab.Optimizer/3.3/OptimizerMainForm.cs

    r2547 r2790  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.ComponentModel;
    4 using System.Data;
    5 using System.Drawing;
    6 using System.Linq;
    7 using System.Text;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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;
    823using System.Reflection;
    924using System.Windows.Forms;
     25using HeuristicLab.Core.Views;
    1026using HeuristicLab.MainForm;
    1127using HeuristicLab.MainForm.WindowsForms;
    … …  
    2541    private void OptimizerMainForm_Load(object sender, EventArgs e) {
    2642      Title = "HeuristicLab Optimizer " + Assembly.GetExecutingAssembly().GetName().Version.ToString();
     43      ViewClosed += new EventHandler<ViewEventArgs>(FileManager.ViewClosed);
     44      OperatorsSidebar operatorsSidebar = new OperatorsSidebar();
     45      operatorsSidebar.Dock = DockStyle.Left;
     46      operatorsSidebar.Show();
    2747    }
    2848  }

  • trunk/sources/HeuristicLab.Optimizer/3.3/Properties/AssemblyInfo.frame

    r2754 r2790  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2009 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • trunk/sources/HeuristicLab.Optimizer/3.3/ToolBarItems/NewToolBarItem.cs

    r2708 r2790  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
    5 using System.Windows.Forms;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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
    622using System.Drawing;
    7 using HeuristicLab.MainForm;
    8 using HeuristicLab.MainForm.WindowsForms;
    923using HeuristicLab.Common.Resources;
    1024

  • trunk/sources/HeuristicLab.Optimizer/3.3/ToolBarItems/OpenToolBarItem.cs

    r2708 r2790  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
    5 using System.Windows.Forms;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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
    622using System.Drawing;
    7 using HeuristicLab.MainForm;
    8 using HeuristicLab.MainForm.WindowsForms;
    923using HeuristicLab.Common.Resources;
    1024

  • trunk/sources/HeuristicLab.Optimizer/3.3/ToolBarItems/SaveAllToolBarItem.cs

    r2713 r2790  
    1 using System;
    2 using System.Collections.Generic;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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;
     23using System.Drawing;
    324using System.Linq;
    4 using System.Text;
    525using System.Windows.Forms;
    6 using System.Drawing;
    7 using HeuristicLab.MainForm;
    8 using HeuristicLab.MainForm.WindowsForms;
    926using HeuristicLab.Common.Resources;
    1027using HeuristicLab.Core;
    11 using HeuristicLab.Core.Views;
     28using HeuristicLab.MainForm;
    1229
    1330namespace HeuristicLab.Optimizer {

  • trunk/sources/HeuristicLab.Optimizer/3.3/ToolBarItems/SaveToolBarItem.cs

    r2713 r2790  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 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;
     23using System.Drawing;
    524using System.Windows.Forms;
    6 using System.Drawing;
    7 using HeuristicLab.MainForm;
    8 using HeuristicLab.MainForm.WindowsForms;
    925using HeuristicLab.Common.Resources;
    1026using HeuristicLab.Core;
    11 using HeuristicLab.Core.Views;
     27using HeuristicLab.MainForm;
    1228
    1329namespace HeuristicLab.Optimizer {
Note: See TracChangeset for help on using the changeset viewer.