Changeset 2826 for trunk/sources
- Timestamp:
- 02/18/10 13:51:21 (15 years ago)
- Location:
- trunk/sources
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Core.Views/3.3/EngineView.Designer.cs
r2796 r2826 49 49 this.executionTimeTextBox = new System.Windows.Forms.TextBox(); 50 50 this.executionTimeLabel = new System.Windows.Forms.Label(); 51 this.operatorGraphView = new HeuristicLab.Core.Views.OperatorGraphView();52 51 this.scopeView = new HeuristicLab.Core.Views.ScopeView(); 53 52 this.resetButton = new System.Windows.Forms.Button(); … … 63 62 this.tabControl = new System.Windows.Forms.TabControl(); 64 63 this.operatorGraphTabPage = new System.Windows.Forms.TabPage(); 64 this.operatorGraphViewHost = new HeuristicLab.Core.Views.ViewHost(); 65 65 this.globalScopeTabPage = new System.Windows.Forms.TabPage(); 66 66 this.problemTabPage = new System.Windows.Forms.TabPage(); … … 92 92 this.executionTimeLabel.TabIndex = 4; 93 93 this.executionTimeLabel.Text = "&Execution Time:"; 94 //95 // operatorGraphView96 //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;106 94 // 107 95 // scopeView … … 236 224 // operatorGraphTabPage 237 225 // 226 this.operatorGraphTabPage.Controls.Add(this.operatorGraphViewHost); 238 227 this.operatorGraphTabPage.Controls.Add(this.saveOperatorGraphButton); 239 228 this.operatorGraphTabPage.Controls.Add(this.openOperatorGraphButton); 240 229 this.operatorGraphTabPage.Controls.Add(this.newOperatorGraphButton); 241 this.operatorGraphTabPage.Controls.Add(this.operatorGraphView);242 230 this.operatorGraphTabPage.Location = new System.Drawing.Point(4, 22); 243 231 this.operatorGraphTabPage.Name = "operatorGraphTabPage"; … … 247 235 this.operatorGraphTabPage.Text = "Operator Graph"; 248 236 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; 249 249 // 250 250 // globalScopeTabPage … … 283 283 this.problemViewHost.Size = new System.Drawing.Size(782, 542); 284 284 this.problemViewHost.TabIndex = 3; 285 this.problemViewHost.ViewType = null; 285 286 // 286 287 // openFileDialog … … 327 328 protected System.Windows.Forms.Button stopButton; 328 329 protected System.Windows.Forms.Button startButton; 329 protected HeuristicLab.Core.Views.OperatorGraphView operatorGraphView;330 330 protected HeuristicLab.Core.Views.ScopeView scopeView; 331 331 protected System.Windows.Forms.ToolTip toolTip; 332 332 protected System.Windows.Forms.TabControl tabControl; 333 protected System.Windows.Forms.TabPage operatorGraphTabPage;334 333 protected System.Windows.Forms.TabPage globalScopeTabPage; 335 334 protected System.Windows.Forms.TabPage problemTabPage; 336 335 protected ViewHost problemViewHost; 337 336 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;341 337 protected System.Windows.Forms.Button saveProblemButton; 342 338 protected System.Windows.Forms.Button openProblemButton; 343 339 protected System.Windows.Forms.OpenFileDialog openFileDialog; 344 340 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; 345 346 346 347 } -
trunk/sources/HeuristicLab.Core.Views/3.3/EngineView.cs
r2818 r2826 95 95 if (Content == null) { 96 96 newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = false; 97 operatorGraphView .Enabled = false;97 operatorGraphViewHost.Enabled = false; 98 98 scopeView.Enabled = false; 99 99 newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = false; … … 103 103 } else { 104 104 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; 107 107 scopeView.Content = Content.GlobalScope; 108 108 scopeView.Enabled = true; … … 123 123 Invoke(new EventHandler(Content_OperatorGraphChanged), sender, e); 124 124 else 125 operatorGraphView .Content = Content.OperatorGraph;125 operatorGraphViewHost.Content = Content.OperatorGraph; 126 126 } 127 127 protected void Content_ProblemChanged(object sender, EventArgs e) { … … 138 138 else { 139 139 newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true; 140 operatorGraphView .Enabled = true;140 operatorGraphViewHost.Enabled = true; 141 141 scopeView.Enabled = true; 142 142 newProblemButton.Enabled = openProblemButton.Enabled = true; … … 155 155 else { 156 156 newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = false; 157 operatorGraphView .Enabled = false;157 operatorGraphViewHost.Enabled = false; 158 158 scopeView.Enabled = false; 159 159 newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = false; … … 170 170 else { 171 171 newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true; 172 operatorGraphView .Enabled = true;172 operatorGraphViewHost.Enabled = true; 173 173 scopeView.Enabled = true; 174 174 newProblemButton.Enabled = openProblemButton.Enabled = true; -
trunk/sources/HeuristicLab.Operators.Views/3.3/CombinedOperatorView.Designer.cs
r2790 r2826 47 47 this.tabControl = new System.Windows.Forms.TabControl(); 48 48 this.parametersTabPage = new System.Windows.Forms.TabPage(); 49 this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView(); 49 50 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(); 52 52 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); 53 53 this.tabControl.SuspendLayout(); … … 92 92 this.parametersTabPage.UseVisualStyleBackColor = true; 93 93 // 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 // 94 106 // operatorGraphTabPage 95 107 // 96 this.operatorGraphTabPage.Controls.Add(this.operatorGraphView );108 this.operatorGraphTabPage.Controls.Add(this.operatorGraphViewHost); 97 109 this.operatorGraphTabPage.Location = new System.Drawing.Point(4, 22); 98 110 this.operatorGraphTabPage.Name = "operatorGraphTabPage"; … … 103 115 this.operatorGraphTabPage.UseVisualStyleBackColor = true; 104 116 // 105 // parameterCollectionView117 // operatorGraphViewHost 106 118 // 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) 108 120 | System.Windows.Forms.AnchorStyles.Left) 109 121 | 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; 126 128 // 127 129 // CombinedOperatorView … … 152 154 protected System.Windows.Forms.TabPage operatorGraphTabPage; 153 155 protected HeuristicLab.Core.Views.ParameterCollectionView parameterCollectionView; 154 protected HeuristicLab.Core.Views. OperatorGraphView operatorGraphView;156 protected HeuristicLab.Core.Views.ViewHost operatorGraphViewHost; 155 157 } 156 158 } -
trunk/sources/HeuristicLab.Operators.Views/3.3/CombinedOperatorView.cs
r2796 r2826 54 54 if (Content == null) { 55 55 parameterCollectionView.Content = null; 56 operatorGraphView .Content = null;56 operatorGraphViewHost.Content = null; 57 57 tabControl.Enabled = false; 58 58 } else { 59 59 parameterCollectionView.Content = ((IOperator)Content).Parameters; 60 operatorGraphView .Content = Content.OperatorGraph;60 operatorGraphViewHost.Content = Content.OperatorGraph; 61 61 tabControl.Enabled = true; 62 62 }
Note: See TracChangeset
for help on using the changeset viewer.