Changeset 2826


Ignore:
Timestamp:
02/18/10 13:51:21 (11 years ago)
Author:
mkommend
Message:

changed OperatorGraphView in EngineView and CombinedOperatorView to ViewHost (ticket #867)

Location:
trunk/sources
Files:
4 edited

Legend:

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

    r2796 r2826  
    4949      this.executionTimeTextBox = new System.Windows.Forms.TextBox();
    5050      this.executionTimeLabel = new System.Windows.Forms.Label();
    51       this.operatorGraphView = new HeuristicLab.Core.Views.OperatorGraphView();
    5251      this.scopeView = new HeuristicLab.Core.Views.ScopeView();
    5352      this.resetButton = new System.Windows.Forms.Button();
     
    6362      this.tabControl = new System.Windows.Forms.TabControl();
    6463      this.operatorGraphTabPage = new System.Windows.Forms.TabPage();
     64      this.operatorGraphViewHost = new HeuristicLab.Core.Views.ViewHost();
    6565      this.globalScopeTabPage = new System.Windows.Forms.TabPage();
    6666      this.problemTabPage = new System.Windows.Forms.TabPage();
     
    9292      this.executionTimeLabel.TabIndex = 4;
    9393      this.executionTimeLabel.Text = "&Execution Time:";
    94       //
    95       // operatorGraphView
    96       //
    97       this.operatorGraphView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    98                   | System.Windows.Forms.AnchorStyles.Left)
    99                   | System.Windows.Forms.AnchorStyles.Right)));
    100       this.operatorGraphView.Caption = "Operator Graph";
    101       this.operatorGraphView.Content = null;
    102       this.operatorGraphView.Location = new System.Drawing.Point(6, 36);
    103       this.operatorGraphView.Name = "operatorGraphView";
    104       this.operatorGraphView.Size = new System.Drawing.Size(782, 542);
    105       this.operatorGraphView.TabIndex = 3;
    10694      //
    10795      // scopeView
     
    236224      // operatorGraphTabPage
    237225      //
     226      this.operatorGraphTabPage.Controls.Add(this.operatorGraphViewHost);
    238227      this.operatorGraphTabPage.Controls.Add(this.saveOperatorGraphButton);
    239228      this.operatorGraphTabPage.Controls.Add(this.openOperatorGraphButton);
    240229      this.operatorGraphTabPage.Controls.Add(this.newOperatorGraphButton);
    241       this.operatorGraphTabPage.Controls.Add(this.operatorGraphView);
    242230      this.operatorGraphTabPage.Location = new System.Drawing.Point(4, 22);
    243231      this.operatorGraphTabPage.Name = "operatorGraphTabPage";
     
    247235      this.operatorGraphTabPage.Text = "Operator Graph";
    248236      this.operatorGraphTabPage.UseVisualStyleBackColor = true;
     237      //
     238      // operatorGraphViewHost
     239      //
     240      this.operatorGraphViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     241                  | System.Windows.Forms.AnchorStyles.Left)
     242                  | System.Windows.Forms.AnchorStyles.Right)));
     243      this.operatorGraphViewHost.Content = null;
     244      this.operatorGraphViewHost.Location = new System.Drawing.Point(6, 36);
     245      this.operatorGraphViewHost.Name = "operatorGraphViewHost";
     246      this.operatorGraphViewHost.Size = new System.Drawing.Size(782, 542);
     247      this.operatorGraphViewHost.TabIndex = 3;
     248      this.operatorGraphViewHost.ViewType = null;
    249249      //
    250250      // globalScopeTabPage
     
    283283      this.problemViewHost.Size = new System.Drawing.Size(782, 542);
    284284      this.problemViewHost.TabIndex = 3;
     285      this.problemViewHost.ViewType = null;
    285286      //
    286287      // openFileDialog
     
    327328    protected System.Windows.Forms.Button stopButton;
    328329    protected System.Windows.Forms.Button startButton;
    329     protected HeuristicLab.Core.Views.OperatorGraphView operatorGraphView;
    330330    protected HeuristicLab.Core.Views.ScopeView scopeView;
    331331    protected System.Windows.Forms.ToolTip toolTip;
    332332    protected System.Windows.Forms.TabControl tabControl;
    333     protected System.Windows.Forms.TabPage operatorGraphTabPage;
    334333    protected System.Windows.Forms.TabPage globalScopeTabPage;
    335334    protected System.Windows.Forms.TabPage problemTabPage;
    336335    protected ViewHost problemViewHost;
    337336    protected System.Windows.Forms.Button newProblemButton;
    338     protected System.Windows.Forms.Button saveOperatorGraphButton;
    339     protected System.Windows.Forms.Button openOperatorGraphButton;
    340     protected System.Windows.Forms.Button newOperatorGraphButton;
    341337    protected System.Windows.Forms.Button saveProblemButton;
    342338    protected System.Windows.Forms.Button openProblemButton;
    343339    protected System.Windows.Forms.OpenFileDialog openFileDialog;
    344340    protected System.Windows.Forms.SaveFileDialog saveFileDialog;
     341    protected System.Windows.Forms.TabPage operatorGraphTabPage;
     342    protected System.Windows.Forms.Button saveOperatorGraphButton;
     343    protected System.Windows.Forms.Button openOperatorGraphButton;
     344    protected System.Windows.Forms.Button newOperatorGraphButton;
     345    protected ViewHost operatorGraphViewHost;
    345346
    346347  }
  • trunk/sources/HeuristicLab.Core.Views/3.3/EngineView.cs

    r2818 r2826  
    9595      if (Content == null) {
    9696        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = false;
    97         operatorGraphView.Enabled = false;
     97        operatorGraphViewHost.Enabled = false;
    9898        scopeView.Enabled = false;
    9999        newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = false;
     
    103103      } else {
    104104        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true;
    105         operatorGraphView.Content = Content.OperatorGraph;
    106         operatorGraphView.Enabled = true;
     105        operatorGraphViewHost.Content = Content.OperatorGraph;
     106        operatorGraphViewHost.Enabled = true;
    107107        scopeView.Content = Content.GlobalScope;
    108108        scopeView.Enabled = true;
     
    123123        Invoke(new EventHandler(Content_OperatorGraphChanged), sender, e);
    124124      else
    125         operatorGraphView.Content = Content.OperatorGraph;
     125        operatorGraphViewHost.Content = Content.OperatorGraph;
    126126    }
    127127    protected void Content_ProblemChanged(object sender, EventArgs e) {
     
    138138      else {
    139139        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true;
    140         operatorGraphView.Enabled = true;
     140        operatorGraphViewHost.Enabled = true;
    141141        scopeView.Enabled = true;
    142142        newProblemButton.Enabled = openProblemButton.Enabled = true;
     
    155155      else {
    156156        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = false;
    157         operatorGraphView.Enabled = false;
     157        operatorGraphViewHost.Enabled = false;
    158158        scopeView.Enabled = false;
    159159        newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = false;
     
    170170      else {
    171171        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true;
    172         operatorGraphView.Enabled = true;
     172        operatorGraphViewHost.Enabled = true;
    173173        scopeView.Enabled = true;
    174174        newProblemButton.Enabled = openProblemButton.Enabled = true;
  • trunk/sources/HeuristicLab.Operators.Views/3.3/CombinedOperatorView.Designer.cs

    r2790 r2826  
    4747      this.tabControl = new System.Windows.Forms.TabControl();
    4848      this.parametersTabPage = new System.Windows.Forms.TabPage();
     49      this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
    4950      this.operatorGraphTabPage = new System.Windows.Forms.TabPage();
    50       this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
    51       this.operatorGraphView = new HeuristicLab.Core.Views.OperatorGraphView();
     51      this.operatorGraphViewHost = new HeuristicLab.Core.Views.ViewHost();
    5252      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5353      this.tabControl.SuspendLayout();
     
    9292      this.parametersTabPage.UseVisualStyleBackColor = true;
    9393      //
     94      // parameterCollectionView
     95      //
     96      this.parameterCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     97                  | System.Windows.Forms.AnchorStyles.Left)
     98                  | System.Windows.Forms.AnchorStyles.Right)));
     99      this.parameterCollectionView.Caption = "ParameterCollection";
     100      this.parameterCollectionView.Content = null;
     101      this.parameterCollectionView.Location = new System.Drawing.Point(6, 6);
     102      this.parameterCollectionView.Name = "parameterCollectionView";
     103      this.parameterCollectionView.Size = new System.Drawing.Size(466, 326);
     104      this.parameterCollectionView.TabIndex = 0;
     105      //
    94106      // operatorGraphTabPage
    95107      //
    96       this.operatorGraphTabPage.Controls.Add(this.operatorGraphView);
     108      this.operatorGraphTabPage.Controls.Add(this.operatorGraphViewHost);
    97109      this.operatorGraphTabPage.Location = new System.Drawing.Point(4, 22);
    98110      this.operatorGraphTabPage.Name = "operatorGraphTabPage";
     
    103115      this.operatorGraphTabPage.UseVisualStyleBackColor = true;
    104116      //
    105       // parameterCollectionView
     117      // operatorGraphViewHost
    106118      //
    107       this.parameterCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     119      this.operatorGraphViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    108120                  | System.Windows.Forms.AnchorStyles.Left)
    109121                  | System.Windows.Forms.AnchorStyles.Right)));
    110       this.parameterCollectionView.Caption = "ParameterCollection";
    111       this.parameterCollectionView.Location = new System.Drawing.Point(6, 6);
    112       this.parameterCollectionView.Name = "parameterCollectionView";
    113       this.parameterCollectionView.Size = new System.Drawing.Size(466, 326);
    114       this.parameterCollectionView.TabIndex = 0;
    115       //
    116       // operatorGraphView
    117       //
    118       this.operatorGraphView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    119                   | System.Windows.Forms.AnchorStyles.Left)
    120                   | System.Windows.Forms.AnchorStyles.Right)));
    121       this.operatorGraphView.Caption = "Operator Graph";
    122       this.operatorGraphView.Location = new System.Drawing.Point(6, 6);
    123       this.operatorGraphView.Name = "operatorGraphView";
    124       this.operatorGraphView.Size = new System.Drawing.Size(466, 326);
    125       this.operatorGraphView.TabIndex = 0;
     122      this.operatorGraphViewHost.Content = null;
     123      this.operatorGraphViewHost.Location = new System.Drawing.Point(6, 6);
     124      this.operatorGraphViewHost.Name = "operatorGraphViewHost";
     125      this.operatorGraphViewHost.Size = new System.Drawing.Size(466, 326);
     126      this.operatorGraphViewHost.TabIndex = 0;
     127      this.operatorGraphViewHost.ViewType = null;
    126128      //
    127129      // CombinedOperatorView
     
    152154    protected System.Windows.Forms.TabPage operatorGraphTabPage;
    153155    protected HeuristicLab.Core.Views.ParameterCollectionView parameterCollectionView;
    154     protected HeuristicLab.Core.Views.OperatorGraphView operatorGraphView;
     156    protected HeuristicLab.Core.Views.ViewHost operatorGraphViewHost;
    155157  }
    156158}
  • trunk/sources/HeuristicLab.Operators.Views/3.3/CombinedOperatorView.cs

    r2796 r2826  
    5454      if (Content == null) {
    5555        parameterCollectionView.Content = null;
    56         operatorGraphView.Content = null;
     56        operatorGraphViewHost.Content = null;
    5757        tabControl.Enabled = false;
    5858      } else {
    5959        parameterCollectionView.Content = ((IOperator)Content).Parameters;
    60         operatorGraphView.Content = Content.OperatorGraph;
     60        operatorGraphViewHost.Content = Content.OperatorGraph;
    6161        tabControl.Enabled = true;
    6262      }
Note: See TracChangeset for help on using the changeset viewer.