Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/23/09 11:08:34 (15 years ago)
Author:
swagner
Message:

Implemented first draft of MainForm support in HeuristicLab.Core/HeuristicLab.Core.Views and all other depending plugins (#770)

Location:
trunk/sources/HeuristicLab.Core.Views/3.3
Files:
3 edited
2 copied
55 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Core.Views/3.3

    • Property svn:ignore

      •  

        old new  
        11bin
        22obj
         3*.user

  • trunk/sources/HeuristicLab.Core.Views/3.3/Auxiliary.cs

    r2515 r2520  
    2525using System.Windows.Forms;
    2626
    27 namespace HeuristicLab.Core {
     27namespace HeuristicLab.Core.Views {
    2828  /// <summary>
    2929  /// Static helper class.

  • trunk/sources/HeuristicLab.Core.Views/3.3/ChooseItemDialog.Designer.cs

    r2515 r2520  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core {
     22namespace HeuristicLab.Core.Views {
    2323  partial class ChooseItemDialog {
    2424    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/ChooseItemDialog.cs

    r2515 r2520  
    3030using HeuristicLab.PluginInfrastructure;
    3131
    32 namespace HeuristicLab.Core {
     32namespace HeuristicLab.Core.Views {
    3333  /// <summary>
    3434  /// A dialog to select an item.

  • trunk/sources/HeuristicLab.Core.Views/3.3/ChooseOperatorDialog.Designer.cs

    r2515 r2520  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core {
     22namespace HeuristicLab.Core.Views {
    2323  partial class ChooseOperatorDialog {
    2424    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/ChooseOperatorDialog.cs

    r2515 r2520  
    3030using HeuristicLab.PluginInfrastructure;
    3131
    32 namespace HeuristicLab.Core {
     32namespace HeuristicLab.Core.Views {
    3333  /// <summary>
    3434  /// A dialog to select an operator out of a library.

  • trunk/sources/HeuristicLab.Core.Views/3.3/ChooseTypeDialog.Designer.cs

    r2515 r2520  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core {
     22namespace HeuristicLab.Core.Views {
    2323  partial class ChooseTypeDialog {
    2424    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/ChooseTypeDialog.cs

    r2515 r2520  
    3030using HeuristicLab.PluginInfrastructure;
    3131
    32 namespace HeuristicLab.Core {
     32namespace HeuristicLab.Core.Views {
    3333  /// <summary>
    3434  /// A dialog to select a specific type.

  • trunk/sources/HeuristicLab.Core.Views/3.3/ConstrainedItemBaseView.Designer.cs

    r2515 r2520  
    2323using System.Windows.Forms;
    2424
    25 namespace HeuristicLab.Core {
     25namespace HeuristicLab.Core.Views {
    2626  partial class ConstrainedItemBaseView {
    2727    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/ConstrainedItemBaseView.cs

    r2515 r2520  
    2828using System.Windows.Forms;
    2929using HeuristicLab.Common;
     30using HeuristicLab.MainForm;
    3031
    31 namespace HeuristicLab.Core {
     32namespace HeuristicLab.Core.Views {
    3233  /// <summary>
    3334  /// The visual representation of an <see cref="IConstrainedItem"/>.
    3435  /// </summary>
     36  [Content(typeof(ConstrainedItemBase), true)]
    3537  public partial class ConstrainedItemBaseView : ViewBase {
    3638    private ChooseItemDialog chooseItemDialog;
    … …  
    120122      if (constraintsListView.SelectedItems.Count == 1) {
    121123        IConstraint constraint = (IConstraint)constraintsListView.SelectedItems[0].Tag;
    122         Control view = (Control)constraint.CreateView();
     124        Control view = (Control)MainFormManager.CreateDefaultView(constraint);
    123125        if (view != null) {
    124126          constraintDetailsGroupBox.Controls.Add(view);

  • trunk/sources/HeuristicLab.Core.Views/3.3/EditorBase.Designer.cs

    r2515 r2520  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core {
     22namespace HeuristicLab.Core.Views {
    2323  partial class EditorBase {
    2424    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/EditorBase.cs

    r2515 r2520  
    2929using System.Windows.Forms;
    3030
    31 namespace HeuristicLab.Core {
     31namespace HeuristicLab.Core.Views {
    3232  /// <summary>
    3333  /// Base class for views that can load and save data.

  • trunk/sources/HeuristicLab.Core.Views/3.3/EngineBaseEditor.Designer.cs

    r2515 r2520  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core {
     22namespace HeuristicLab.Core.Views {
    2323  partial class EngineBaseEditor {
    2424    /// <summary>
    … …  
    4949      this.splitContainer1 = new System.Windows.Forms.SplitContainer();
    5050      this.operatorGraphGroupBox = new System.Windows.Forms.GroupBox();
    51       this.operatorGraphView = new HeuristicLab.Core.OperatorGraphView();
     51      this.operatorGraphView = new HeuristicLab.Core.Views.OperatorGraphView();
    5252      this.globalScopeGroupBox = new System.Windows.Forms.GroupBox();
    53       this.scopeView = new HeuristicLab.Core.ScopeView();
     53      this.scopeView = new HeuristicLab.Core.Views.ScopeView();
    5454      this.resetButton = new System.Windows.Forms.Button();
    5555      this.abortButton = new System.Windows.Forms.Button();
    … …  
    208208    protected System.Windows.Forms.Button abortButton;
    209209    protected System.Windows.Forms.Button executeButton;
    210     protected HeuristicLab.Core.OperatorGraphView operatorGraphView;
    211     protected HeuristicLab.Core.ScopeView scopeView;
     210    protected HeuristicLab.Core.Views.OperatorGraphView operatorGraphView;
     211    protected HeuristicLab.Core.Views.ScopeView scopeView;
    212212
    213213  }

  • trunk/sources/HeuristicLab.Core.Views/3.3/EngineBaseEditor.cs

    r2515 r2520  
    2929using HeuristicLab.Core;
    3030using HeuristicLab.Common;
     31using HeuristicLab.MainForm;
    3132
    32 namespace HeuristicLab.Core {
     33namespace HeuristicLab.Core.Views {
    3334  /// <summary>
    3435  /// Base class for editors of engines.
    3536  /// </summary>
     37  [Content(typeof(EngineBase), true)]
    3638  public partial class EngineBaseEditor : EditorBase {
    3739    private int executionTimeCounter;

  • trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

    r2511 r2520  
    3939      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    4040    </Reference>
     41    <Reference Include="System.Drawing" />
     42    <Reference Include="System.Windows.Forms" />
    4143    <Reference Include="System.Xml.Linq">
    4244      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    … …  
    4951  </ItemGroup>
    5052  <ItemGroup>
     53    <Compile Include="Auxiliary.cs" />
     54    <Compile Include="ChooseItemDialog.cs">
     55      <SubType>Form</SubType>
     56    </Compile>
     57    <Compile Include="ChooseItemDialog.Designer.cs">
     58      <DependentUpon>ChooseItemDialog.cs</DependentUpon>
     59    </Compile>
     60    <Compile Include="ChooseOperatorDialog.cs">
     61      <SubType>Form</SubType>
     62    </Compile>
     63    <Compile Include="ChooseOperatorDialog.Designer.cs">
     64      <DependentUpon>ChooseOperatorDialog.cs</DependentUpon>
     65    </Compile>
     66    <Compile Include="ChooseTypeDialog.cs">
     67      <SubType>Form</SubType>
     68    </Compile>
     69    <Compile Include="ChooseTypeDialog.Designer.cs">
     70      <DependentUpon>ChooseTypeDialog.cs</DependentUpon>
     71    </Compile>
     72    <Compile Include="ConstrainedItemBaseView.cs">
     73      <SubType>UserControl</SubType>
     74    </Compile>
     75    <Compile Include="ConstrainedItemBaseView.Designer.cs">
     76      <DependentUpon>ConstrainedItemBaseView.cs</DependentUpon>
     77    </Compile>
     78    <Compile Include="EditorBase.cs">
     79      <SubType>UserControl</SubType>
     80    </Compile>
     81    <Compile Include="EditorBase.Designer.cs">
     82      <DependentUpon>EditorBase.cs</DependentUpon>
     83    </Compile>
     84    <Compile Include="EngineBaseEditor.cs">
     85      <SubType>UserControl</SubType>
     86    </Compile>
     87    <Compile Include="EngineBaseEditor.Designer.cs">
     88      <DependentUpon>EngineBaseEditor.cs</DependentUpon>
     89    </Compile>
    5190    <Compile Include="HeuristicLabCoreViewsPlugin.cs" />
     91    <Compile Include="IEditor.cs" />
     92    <Compile Include="ItemBaseView.cs">
     93      <SubType>UserControl</SubType>
     94    </Compile>
     95    <Compile Include="ItemBaseView.Designer.cs">
     96      <DependentUpon>ItemBaseView.cs</DependentUpon>
     97    </Compile>
     98    <Compile Include="IView.cs" />
     99    <Compile Include="OperatorBaseDescriptionView.cs">
     100      <SubType>UserControl</SubType>
     101    </Compile>
     102    <Compile Include="OperatorBaseDescriptionView.Designer.cs">
     103      <DependentUpon>OperatorBaseDescriptionView.cs</DependentUpon>
     104    </Compile>
     105    <Compile Include="OperatorBaseVariableInfosView.cs">
     106      <SubType>UserControl</SubType>
     107    </Compile>
     108    <Compile Include="OperatorBaseVariableInfosView.Designer.cs">
     109      <DependentUpon>OperatorBaseVariableInfosView.cs</DependentUpon>
     110    </Compile>
     111    <Compile Include="OperatorBaseVariablesView.cs">
     112      <SubType>UserControl</SubType>
     113    </Compile>
     114    <Compile Include="OperatorBaseVariablesView.Designer.cs">
     115      <DependentUpon>OperatorBaseVariablesView.cs</DependentUpon>
     116    </Compile>
     117    <Compile Include="OperatorBaseView.cs">
     118      <SubType>UserControl</SubType>
     119    </Compile>
     120    <Compile Include="OperatorBaseView.Designer.cs">
     121      <DependentUpon>OperatorBaseView.cs</DependentUpon>
     122    </Compile>
     123    <Compile Include="OperatorGraphView.cs">
     124      <SubType>UserControl</SubType>
     125    </Compile>
     126    <Compile Include="OperatorGraphView.Designer.cs">
     127      <DependentUpon>OperatorGraphView.cs</DependentUpon>
     128    </Compile>
     129    <Compile Include="OperatorLibraryEditor.cs">
     130      <SubType>UserControl</SubType>
     131    </Compile>
     132    <Compile Include="OperatorLibraryEditor.Designer.cs">
     133      <DependentUpon>OperatorLibraryEditor.cs</DependentUpon>
     134    </Compile>
    52135    <Compile Include="Properties\AssemblyInfo.cs" />
     136    <Compile Include="ScopeView.cs">
     137      <SubType>UserControl</SubType>
     138    </Compile>
     139    <Compile Include="ScopeView.Designer.cs">
     140      <DependentUpon>ScopeView.cs</DependentUpon>
     141    </Compile>
     142    <Compile Include="VariableInfoView.cs">
     143      <SubType>UserControl</SubType>
     144    </Compile>
     145    <Compile Include="VariableInfoView.Designer.cs">
     146      <DependentUpon>VariableInfoView.cs</DependentUpon>
     147    </Compile>
     148    <Compile Include="VariablesScopeView.cs">
     149      <SubType>UserControl</SubType>
     150    </Compile>
     151    <Compile Include="VariablesScopeView.Designer.cs">
     152      <DependentUpon>VariablesScopeView.cs</DependentUpon>
     153    </Compile>
     154    <Compile Include="VariableView.cs">
     155      <SubType>UserControl</SubType>
     156    </Compile>
     157    <Compile Include="VariableView.Designer.cs">
     158      <DependentUpon>VariableView.cs</DependentUpon>
     159    </Compile>
     160    <Compile Include="ViewBase.cs">
     161      <SubType>UserControl</SubType>
     162    </Compile>
     163    <Compile Include="ViewBase.Designer.cs">
     164      <DependentUpon>ViewBase.cs</DependentUpon>
     165    </Compile>
    53166  </ItemGroup>
    54167  <ItemGroup>
    … …  
    57170  </ItemGroup>
    58171  <ItemGroup>
     172    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources-3.2.csproj">
     173      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     174      <Name>HeuristicLab.Common.Resources-3.2</Name>
     175    </ProjectReference>
     176    <ProjectReference Include="..\..\HeuristicLab.Common\3.2\HeuristicLab.Common-3.2.csproj">
     177      <Project>{1FC004FC-59AF-4249-B1B6-FF25873A20E4}</Project>
     178      <Name>HeuristicLab.Common-3.2</Name>
     179    </ProjectReference>
     180    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     181      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     182      <Name>HeuristicLab.Core-3.3</Name>
     183    </ProjectReference>
     184    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.2\HeuristicLab.MainForm.WindowsForms-3.2.csproj">
     185      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
     186      <Name>HeuristicLab.MainForm.WindowsForms-3.2</Name>
     187    </ProjectReference>
     188    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.2\HeuristicLab.MainForm-3.2.csproj">
     189      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
     190      <Name>HeuristicLab.MainForm-3.2</Name>
     191    </ProjectReference>
    59192    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
    60193      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    61194      <Name>HeuristicLab.PluginInfrastructure</Name>
    62195    </ProjectReference>
     196  </ItemGroup>
     197  <ItemGroup>
     198    <Content Include="Resources\CombinedOperator.bmp" />
     199    <Content Include="Resources\HeuristicLab.ico" />
     200    <Content Include="Resources\Operator.bmp" />
     201    <Content Include="Resources\ProgrammableOperator.bmp" />
     202  </ItemGroup>
     203  <ItemGroup>
     204    <EmbeddedResource Include="ChooseItemDialog.resx">
     205      <DependentUpon>ChooseItemDialog.cs</DependentUpon>
     206    </EmbeddedResource>
     207    <EmbeddedResource Include="ChooseOperatorDialog.resx">
     208      <DependentUpon>ChooseOperatorDialog.cs</DependentUpon>
     209    </EmbeddedResource>
     210    <EmbeddedResource Include="ChooseTypeDialog.resx">
     211      <DependentUpon>ChooseTypeDialog.cs</DependentUpon>
     212    </EmbeddedResource>
     213    <EmbeddedResource Include="ConstrainedItemBaseView.resx">
     214      <DependentUpon>ConstrainedItemBaseView.cs</DependentUpon>
     215    </EmbeddedResource>
     216    <EmbeddedResource Include="EditorBase.resx">
     217      <DependentUpon>EditorBase.cs</DependentUpon>
     218    </EmbeddedResource>
     219    <EmbeddedResource Include="EngineBaseEditor.resx">
     220      <DependentUpon>EngineBaseEditor.cs</DependentUpon>
     221    </EmbeddedResource>
     222    <EmbeddedResource Include="ItemBaseView.resx">
     223      <DependentUpon>ItemBaseView.cs</DependentUpon>
     224    </EmbeddedResource>
     225    <EmbeddedResource Include="OperatorBaseDescriptionView.resx">
     226      <DependentUpon>OperatorBaseDescriptionView.cs</DependentUpon>
     227    </EmbeddedResource>
     228    <EmbeddedResource Include="OperatorBaseVariableInfosView.resx">
     229      <DependentUpon>OperatorBaseVariableInfosView.cs</DependentUpon>
     230    </EmbeddedResource>
     231    <EmbeddedResource Include="OperatorBaseVariablesView.resx">
     232      <DependentUpon>OperatorBaseVariablesView.cs</DependentUpon>
     233    </EmbeddedResource>
     234    <EmbeddedResource Include="OperatorBaseView.resx">
     235      <DependentUpon>OperatorBaseView.cs</DependentUpon>
     236    </EmbeddedResource>
     237    <EmbeddedResource Include="OperatorGraphView.resx">
     238      <DependentUpon>OperatorGraphView.cs</DependentUpon>
     239    </EmbeddedResource>
     240    <EmbeddedResource Include="OperatorLibraryEditor.resx">
     241      <DependentUpon>OperatorLibraryEditor.cs</DependentUpon>
     242    </EmbeddedResource>
     243    <EmbeddedResource Include="ScopeView.resx">
     244      <DependentUpon>ScopeView.cs</DependentUpon>
     245    </EmbeddedResource>
     246    <EmbeddedResource Include="VariableInfoView.resx">
     247      <DependentUpon>VariableInfoView.cs</DependentUpon>
     248    </EmbeddedResource>
     249    <EmbeddedResource Include="VariablesScopeView.resx">
     250      <DependentUpon>VariablesScopeView.cs</DependentUpon>
     251    </EmbeddedResource>
     252    <EmbeddedResource Include="VariableView.resx">
     253      <DependentUpon>VariableView.cs</DependentUpon>
     254    </EmbeddedResource>
    63255  </ItemGroup>
    64256  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLabCoreViewsPlugin.cs

    r2511 r2520  
    2525using HeuristicLab.PluginInfrastructure;
    2626
    27 namespace HeuristicLab.Core {
     27namespace HeuristicLab.Core.Views {
    2828  /// <summary>
    2929  /// Plugin class for HeuristicLab.Core.Views plugin.
    … …  
    3232  [PluginFile(Filename = "HeuristicLab.Core.Views-3.3.dll", Filetype = PluginFileType.Assembly)]
    3333  [Dependency(Dependency = "HeuristicLab.Common-3.2")]
    34   [Dependency(Dependency = "HeuristicLab.Persistence-3.3")]
     34  [Dependency(Dependency = "HeuristicLab.Common.Resources-3.2")]
     35  [Dependency(Dependency = "HeuristicLab.Core-3.3")]
     36  [Dependency(Dependency = "HeuristicLab.MainForm-3.2")]
     37  [Dependency(Dependency = "HeuristicLab.MainForm.WindowsForms-3.2")]
    3538  public class HeuristicLabCoreViewsPlugin : PluginBase {
    3639  }

  • trunk/sources/HeuristicLab.Core.Views/3.3/IEditor.cs

    r2515 r2520  
    2424using System.Text;
    2525
    26 namespace HeuristicLab.Core {
     26namespace HeuristicLab.Core.Views {
    2727  /// <summary>
    2828  /// Interface to represent an editor.

  • trunk/sources/HeuristicLab.Core.Views/3.3/IView.cs

    r2515 r2520  
    2525using HeuristicLab.PluginInfrastructure;
    2626
    27 namespace HeuristicLab.Core {
     27namespace HeuristicLab.Core.Views {
    2828  /// <summary>
    2929  /// An interface for all kinds visual representations of items (objects, operators...).
    3030  /// </summary>
    31   public interface IView : IControl {
     31  public interface IView : IControl, HeuristicLab.MainForm.IView{
    3232    /// <summary>
    3333    /// Gets the current item instance.
    3434    /// </summary>
    3535    IItem Item { get; }
    36     /// <summary>
    37     /// Gets or sets the caption of the current instance.
    38     /// </summary>
    39     string Caption { get; set; }
    4036
    4137    /// <summary>
    … …  
    4339    /// </summary>
    4440    event EventHandler ItemChanged;
    45     /// <summary>
    46     /// Occurs when the caption was changed.
    47     /// </summary>
    48     event EventHandler CaptionChanged;
    4941  }
    5042}

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemBaseView.Designer.cs

    r2515 r2520  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core {
     22namespace HeuristicLab.Core.Views {
    2323  partial class ItemBaseView {
    2424    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemBaseView.cs

    r2515 r2520  
    2727using System.Text;
    2828using System.Windows.Forms;
     29using HeuristicLab.MainForm;
    2930
    30 namespace HeuristicLab.Core {
     31namespace HeuristicLab.Core.Views {
    3132  /// <summary>
    3233  /// The base class for visual representations of items.
    3334  /// </summary>
     35  [Content(typeof(ItemBase), true)]
    3436  public partial class ItemBaseView : ViewBase {
    3537    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorBaseDescriptionView.Designer.cs

    r2515 r2520  
    2323using System.Windows.Forms;
    2424
    25 namespace HeuristicLab.Core {
     25namespace HeuristicLab.Core.Views {
    2626  partial class OperatorBaseDescriptionView {
    2727    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorBaseDescriptionView.cs

    r2515 r2520  
    2828using System.Windows.Forms;
    2929
    30 namespace HeuristicLab.Core {
     30namespace HeuristicLab.Core.Views {
    3131  /// <summary>
    3232  /// The visual representation of the description of operators.

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorBaseVariableInfosView.Designer.cs

    r2515 r2520  
    2323using System.Windows.Forms;
    2424
    25 namespace HeuristicLab.Core {
     25namespace HeuristicLab.Core.Views {
    2626  partial class OperatorBaseVariableInfosView {
    2727    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorBaseVariableInfosView.cs

    r2515 r2520  
    2828using System.Windows.Forms;
    2929using HeuristicLab.Common;
     30using HeuristicLab.MainForm;
    3031
    31 namespace HeuristicLab.Core {
     32namespace HeuristicLab.Core.Views {
    3233  /// <summary>
    3334  /// The visual representation of the information of the variables of an operator.
    … …  
    131132      if (variableInfosListView.SelectedItems.Count == 1) {
    132133        IVariableInfo variableInfo = (IVariableInfo)variableInfosListView.SelectedItems[0].Tag;
    133         Control control = (Control)variableInfo.CreateView();
     134        Control control = (Control)MainFormManager.CreateDefaultView(variableInfo);
    134135        variableInfoDetailsGroupBox.Controls.Add(control);
    135136        control.Dock = DockStyle.Fill;

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorBaseVariablesView.Designer.cs

    r2515 r2520  
    2323using System.Windows.Forms;
    2424
    25 namespace HeuristicLab.Core {
     25namespace HeuristicLab.Core.Views {
    2626  partial class OperatorBaseVariablesView {
    2727    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorBaseVariablesView.cs

    r2515 r2520  
    2828using System.Windows.Forms;
    2929using HeuristicLab.Common;
    30 
    31 namespace HeuristicLab.Core {
     30using HeuristicLab.MainForm;
     31
     32namespace HeuristicLab.Core.Views {
    3233  /// <summary>
    3334  /// The visual representation of the variables of an operator.
    … …  
    126127      if (variablesListView.SelectedItems.Count == 1) {
    127128        IVariable variable = (IVariable)variablesListView.SelectedItems[0].Tag;
    128         Control editor = (Control)variable.CreateView();
     129        Control editor = (Control)MainFormManager.CreateDefaultView(variable);
    129130        variableDetailsGroupBox.Controls.Add(editor);
    130131        editor.Dock = DockStyle.Fill;

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorBaseView.Designer.cs

    r2515 r2520  
    2323using System.Windows.Forms;
    2424
    25 namespace HeuristicLab.Core {
     25namespace HeuristicLab.Core.Views {
    2626  partial class OperatorBaseView {
    2727    /// <summary>
    … …  
    5050      this.tabControl = new System.Windows.Forms.TabControl();
    5151      this.variableInfosTabPage = new System.Windows.Forms.TabPage();
    52       this.operatorBaseVariableInfosView = new HeuristicLab.Core.OperatorBaseVariableInfosView();
     52      this.operatorBaseVariableInfosView = new HeuristicLab.Core.Views.OperatorBaseVariableInfosView();
    5353      this.variablesTabPage = new System.Windows.Forms.TabPage();
    54       this.operatorBaseVariablesView = new HeuristicLab.Core.OperatorBaseVariablesView();
     54      this.operatorBaseVariablesView = new HeuristicLab.Core.Views.OperatorBaseVariablesView();
    5555      this.constraintsTabPage = new System.Windows.Forms.TabPage();
    56       this.constrainedItemBaseView = new HeuristicLab.Core.ConstrainedItemBaseView();
     56      this.constrainedItemBaseView = new HeuristicLab.Core.Views.ConstrainedItemBaseView();
    5757      this.descriptionTabPage = new System.Windows.Forms.TabPage();
    58       this.operatorBaseDescriptionView = new HeuristicLab.Core.OperatorBaseDescriptionView();
     58      this.operatorBaseDescriptionView = new HeuristicLab.Core.Views.OperatorBaseDescriptionView();
    5959      this.tabControl.SuspendLayout();
    6060      this.variableInfosTabPage.SuspendLayout();

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorBaseView.cs

    r2515 r2520  
    2727using System.Text;
    2828using System.Windows.Forms;
     29using HeuristicLab.MainForm;
    2930
    30 namespace HeuristicLab.Core {
     31namespace HeuristicLab.Core.Views {
    3132  /// <summary>
    3233  /// The base class for visual representation of operators (contains description view, variable view,
    3334  /// variable info view,...).
    3435  /// </summary>
     36  [Content(typeof(OperatorBase), true)]
    3537  public partial class OperatorBaseView : ViewBase {
    3638    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorGraphView.Designer.cs

    r2515 r2520  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core {
     22namespace HeuristicLab.Core.Views {
    2323  partial class OperatorGraphView {
    2424    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorGraphView.cs

    r2515 r2520  
    2929using HeuristicLab.PluginInfrastructure;
    3030using HeuristicLab.Common;
    31 
    32 namespace HeuristicLab.Core {
     31using HeuristicLab.MainForm;
     32
     33namespace HeuristicLab.Core.Views {
    3334  /// <summary>
    3435  /// The visual representation of an <see cref="IOperatorGraph"/>.
    3536  /// </summary>
     37  [Content(typeof(OperatorGraph), true)]
    3638  public partial class OperatorGraphView : ViewBase {
    3739    private ChooseOperatorDialog chooseOperatorDialog;
    … …  
    182184      if (operatorsListView.SelectedItems.Count == 1) {
    183185        IOperator op = (IOperator)operatorsListView.SelectedItems[0].Tag;
    184         IView view = op.CreateView();
     186        IView view = (IView)MainFormManager.CreateDefaultView(op);
    185187        if (view != null)
    186188          PluginManager.ControlManager.ShowControl(view);
    … …  
    398400      if (operatorsListView.SelectedItems.Count == 1) {
    399401        IOperator op = (IOperator)operatorsListView.SelectedItems[0].Tag;
    400         IView view = op.CreateView();
     402        IView view = (IView)MainFormManager.CreateDefaultView(op);
    401403        if (view != null) {
    402404          viewToolStripMenuItem.Enabled = true;
    … …  
    430432      if (graphTreeView.SelectedNode != null) {
    431433        IOperator op = (IOperator)graphTreeView.SelectedNode.Tag;
    432         IView view = op.CreateView();
     434        IView view = (IView)MainFormManager.CreateDefaultView(op);
    433435        if (view != null) {
    434436          viewToolStripMenuItem1.Enabled = true;

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorLibraryEditor.Designer.cs

    r2515 r2520  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core {
     22namespace HeuristicLab.Core.Views {
    2323  partial class OperatorLibraryEditor {
    2424    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorLibraryEditor.cs

    r2515 r2520  
    2929using System.Windows.Forms;
    3030using HeuristicLab.PluginInfrastructure;
    31 
    32 namespace HeuristicLab.Core {
     31using HeuristicLab.MainForm;
     32
     33namespace HeuristicLab.Core.Views {
    3334  /// <summary>
    3435  /// Visual representation of the class <see cref="IOperatorLibrary"/>.
    3536  /// </summary>
     37  [Content(typeof(OperatorLibrary), true)]
    3638  public partial class OperatorLibraryEditor : EditorBase {
    3739    private ChooseOperatorDialog chooseOperatorDialog;
    … …  
    202204        IOperator op = operatorsTreeView.SelectedNode.Tag as IOperator;
    203205        if (op != null) {
    204           IView view = op.CreateView();
     206          IView view = (IView)MainFormManager.CreateDefaultView(op);
    205207          if (view != null)
    206208            PluginManager.ControlManager.ShowControl(view);
    … …  
    277279        IOperator op = operatorsTreeView.SelectedNode.Tag as IOperator;
    278280        if (op != null) {
    279           IView view = op.CreateView();
     281          IView view = (IView)MainFormManager.CreateDefaultView(op);
    280282          if (view != null) {
    281283            viewToolStripMenuItem.Enabled = true;

  • trunk/sources/HeuristicLab.Core.Views/3.3/ScopeView.Designer.cs

    r2515 r2520  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core {
     22namespace HeuristicLab.Core.Views {
    2323  partial class ScopeView {
    2424    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/ScopeView.cs

    r2515 r2520  
    2929using HeuristicLab.PluginInfrastructure;
    3030using HeuristicLab.Common;
    31 
    32 namespace HeuristicLab.Core {
     31using HeuristicLab.MainForm;
     32
     33namespace HeuristicLab.Core.Views {
    3334  /// <summary>
    3435  /// The visual represenation of <see cref="IScope"/>.
    3536  /// </summary>
     37  [Content(typeof(Scope), true)]
    3638  public partial class ScopeView : ViewBase {
    3739    private Dictionary<IScope, TreeNode> scopeNodeTable;
    … …  
    203205    private void showViewToolStripMenuItem_Click(object sender, EventArgs e) {
    204206      IItem item = (IItem)((ToolStripMenuItem)sender).Tag;
    205       PluginManager.ControlManager.ShowControl(item.CreateView());
     207      PluginManager.ControlManager.ShowControl((IControl)MainFormManager.CreateDefaultView(item));
    206208    }
    207209    #endregion

  • trunk/sources/HeuristicLab.Core.Views/3.3/VariableInfoView.Designer.cs

    r2515 r2520  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core {
     22namespace HeuristicLab.Core.Views {
    2323  partial class VariableInfoView {
    2424    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/VariableInfoView.cs

    r2515 r2520  
    2727using System.Text;
    2828using System.Windows.Forms;
     29using HeuristicLab.MainForm;
    2930
    30 namespace HeuristicLab.Core {
     31namespace HeuristicLab.Core.Views {
    3132  /// <summary>
    3233  /// The visual representation of <see cref="IVariableInfo"/>.
    3334  /// </summary>
     35  [Content(typeof(VariableInfo), true)]
    3436  public partial class VariableInfoView : ViewBase {
    3537    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/VariableView.Designer.cs

    r2515 r2520  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core {
     22namespace HeuristicLab.Core.Views {
    2323  partial class VariableView {
    2424    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/VariableView.cs

    r2515 r2520  
    2727using System.Text;
    2828using System.Windows.Forms;
     29using HeuristicLab.MainForm;
    2930
    30 namespace HeuristicLab.Core {
     31namespace HeuristicLab.Core.Views {
    3132  /// <summary>
    3233  /// The visual representation of an <see cref="IVariable"/>.
    3334  /// </summary>
     35  [Content(typeof(Variable), true)]
    3436  public partial class VariableView : ViewBase {
    3537    private ChooseItemDialog chooseItemDialog;
    … …  
    101103          valueTextBox.Text = Variable.Value.GetType().FullName;
    102104          valueTextBox.Enabled = true;
    103           Control editor = (Control)Variable.Value.CreateView();
     105          Control editor = (Control)MainFormManager.CreateDefaultView(Variable.Value);
    104106          if (editor != null) {
    105107            editorGroupBox.Controls.Add(editor);

  • trunk/sources/HeuristicLab.Core.Views/3.3/VariablesScopeView.Designer.cs

    r2515 r2520  
    2323using System.Windows.Forms;
    2424
    25 namespace HeuristicLab.Core {
     25namespace HeuristicLab.Core.Views {
    2626  partial class VariablesScopeView {
    2727    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/VariablesScopeView.cs

    r2515 r2520  
    2828using System.Windows.Forms;
    2929using HeuristicLab.Common;
    30 
    31 namespace HeuristicLab.Core {
     30using HeuristicLab.MainForm;
     31
     32namespace HeuristicLab.Core.Views {
    3233  /// <summary>
    3334  /// The visual representation of all variables in a specified scope.
    3435  /// </summary>
     36  [Content(typeof(Scope))]
    3537  public partial class VariablesScopeView : ViewBase {
    3638    private ChooseItemDialog chooseItemDialog;

  • trunk/sources/HeuristicLab.Core.Views/3.3/ViewBase.Designer.cs

    r2515 r2520  
    2222using System;
    2323
    24 namespace HeuristicLab.Core {
     24namespace HeuristicLab.Core.Views {
    2525  partial class ViewBase {
    2626    /// <summary>

  • trunk/sources/HeuristicLab.Core.Views/3.3/ViewBase.cs

    r2515 r2520  
    2929using System.Windows.Forms;
    3030
    31 namespace HeuristicLab.Core {
     31namespace HeuristicLab.Core.Views {
    3232  /// <summary>
    3333  /// Base class for all visual representations.
    3434  /// </summary>
    35   public partial class ViewBase : UserControl, IView {
     35  public partial class ViewBase : HeuristicLab.MainForm.WindowsForms.ViewBase, IView {
    3636    private IItem myItem;
    3737    /// <summary>
Note: See TracChangeset for help on using the changeset viewer.