- Timestamp:
- 09/08/11 17:28:49 (13 years ago)
- Location:
- branches/HeuristicLab.Hive-3.4/sources
- Files:
-
- 1 added
- 2 deleted
- 3 edited
- 8 copied
- 4 moved
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/RefreshableHiveExperimentView.Designer.cs ¶
r6725 r6727 51 51 this.tabControl = new System.Windows.Forms.TabControl(); 52 52 this.jobsTabPage = new System.Windows.Forms.TabPage(); 53 this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.ExperimentManager.Hive JobItemTreeView();53 this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.ExperimentManager.HiveTaskItemTreeView(); 54 54 this.stateTabPage = new System.Windows.Forms.TabPage(); 55 55 this.stateLogViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost(); … … 470 470 private Core.Views.LogView logView; 471 471 private System.Windows.Forms.TabPage jobsTabPage; 472 private Hive JobItemTreeView jobsTreeView;472 private HiveTaskItemTreeView jobsTreeView; 473 473 private System.Windows.Forms.Label nameLabel; 474 474 private System.Windows.Forms.TextBox nameTextBox; -
TabularUnified branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj ¶
r6717 r6727 125 125 </ItemGroup> 126 126 <ItemGroup> 127 <Compile Include="Hive Jobs\OptimizerHiveJobView.cs">128 <SubType>UserControl</SubType> 129 </Compile> 130 <Compile Include="Hive Jobs\OptimizerHiveJobView.designer.cs">131 <DependentUpon>OptimizerHive JobView.cs</DependentUpon>127 <Compile Include="HiveTasks\OptimizerHiveTaskView.cs"> 128 <SubType>UserControl</SubType> 129 </Compile> 130 <Compile Include="HiveTasks\OptimizerHiveTaskView.designer.cs"> 131 <DependentUpon>OptimizerHiveTaskView.cs</DependentUpon> 132 132 </Compile> 133 133 <Compile Include="HiveItemView.cs"> … … 137 137 <DependentUpon>HiveItemView.cs</DependentUpon> 138 138 </Compile> 139 <Compile Include="Hive Jobs\HiveJobListView.cs">140 <SubType>UserControl</SubType> 141 </Compile> 142 <Compile Include="Hive Jobs\HiveJobListView.designer.cs">143 <DependentUpon>Hive JobListView.cs</DependentUpon>144 </Compile> 145 <Compile Include="Hive Jobs\HiveJobView.cs">146 <SubType>UserControl</SubType> 147 </Compile> 148 <Compile Include="Hive Jobs\HiveJobView.designer.cs">149 <DependentUpon>Hive JobView.cs</DependentUpon>150 </Compile> 151 <Compile Include="TreeView\New ExperimentTreeNodeAction.cs" />152 <Compile Include="TreeView\Delete JobTreeNodeAction.cs" />153 <Compile Include="TreeView\Hive JobItemTreeView.cs">154 <SubType>UserControl</SubType> 155 </Compile> 156 <Compile Include="TreeView\Hive JobItemTreeView.Designer.cs">157 <DependentUpon>Hive JobItemTreeView.cs</DependentUpon>139 <Compile Include="HiveTasks\HiveTaskListView.cs"> 140 <SubType>UserControl</SubType> 141 </Compile> 142 <Compile Include="HiveTasks\HiveTaskListView.designer.cs"> 143 <DependentUpon>HiveTaskListView.cs</DependentUpon> 144 </Compile> 145 <Compile Include="HiveTasks\HiveTaskView.cs"> 146 <SubType>UserControl</SubType> 147 </Compile> 148 <Compile Include="HiveTasks\HiveTaskView.designer.cs"> 149 <DependentUpon>HiveTaskView.cs</DependentUpon> 150 </Compile> 151 <Compile Include="TreeView\NewTaskTreeNodeAction.cs" /> 152 <Compile Include="TreeView\DeleteTaskTreeNodeAction.cs" /> 153 <Compile Include="TreeView\HiveTaskItemTreeView.cs"> 154 <SubType>UserControl</SubType> 155 </Compile> 156 <Compile Include="TreeView\HiveTaskItemTreeView.Designer.cs"> 157 <DependentUpon>HiveTaskItemTreeView.cs</DependentUpon> 158 158 </Compile> 159 159 <Compile Include="TreeView\ItemTreeView.cs"> … … 218 218 </ItemGroup> 219 219 <ItemGroup> 220 <EmbeddedResource Include="Hive Jobs\OptimizerHiveJobView.resx">221 <DependentUpon>OptimizerHive JobView.cs</DependentUpon>222 </EmbeddedResource> 223 <EmbeddedResource Include="Hive Jobs\HiveJobView.resx">224 <DependentUpon>Hive JobView.cs</DependentUpon>220 <EmbeddedResource Include="HiveTasks\OptimizerHiveTaskView.resx"> 221 <DependentUpon>OptimizerHiveTaskView.cs</DependentUpon> 222 </EmbeddedResource> 223 <EmbeddedResource Include="HiveTasks\HiveTaskView.resx"> 224 <DependentUpon>HiveTaskView.cs</DependentUpon> 225 225 </EmbeddedResource> 226 226 <EmbeddedResource Include="TreeView\ItemTreeView.resx"> -
TabularUnified branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskListView.cs ¶
r6726 r6727 26 26 27 27 namespace HeuristicLab.Clients.Hive.Views { 28 [View(" JobItemList View")]28 [View("TaskItemList View")] 29 29 [Content(typeof(IItemList<HiveTask>), false)] 30 public partial class Hive JobListView : ItemListView<HiveTask> {30 public partial class HiveTaskListView : ItemListView<HiveTask> { 31 31 32 public Hive JobListView() {32 public HiveTaskListView() { 33 33 InitializeComponent(); 34 itemsGroupBox.Text = " Jobs";34 itemsGroupBox.Text = "Tasks"; 35 35 } 36 36 -
TabularUnified branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskListView.designer.cs ¶
r6726 r6727 1 1 namespace HeuristicLab.Clients.Hive.Views { 2 partial class Hive JobListView {2 partial class HiveTaskListView { 3 3 /// <summary> 4 4 /// Required designer variable. -
TabularUnified branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.cs ¶
r6726 r6727 29 29 [Content(typeof(HiveTask), true)] 30 30 [Content(typeof(HiveTask<>), false)] 31 public partial class Hive JobView : ItemView {31 public partial class HiveTaskView : ItemView { 32 32 public new HiveTask Content { 33 33 get { return (HiveTask)base.Content; } … … 39 39 } 40 40 41 public Hive JobView() {41 public HiveTaskView() { 42 42 InitializeComponent(); 43 43 } … … 45 45 protected override void RegisterContentEvents() { 46 46 base.RegisterContentEvents(); 47 Content.Item JobChanged += new EventHandler(Content_JobItemChanged);48 Content. JobChanged += new EventHandler(Content_JobChanged);49 Content. JobStateChanged += new EventHandler(Content_TaskStateChanged);47 Content.ItemTaskChanged += new EventHandler(Content_TaskItemChanged); 48 Content.TaskChanged += new EventHandler(Content_TaskChanged); 49 Content.TaskStateChanged += new EventHandler(Content_TaskStateChanged); 50 50 Content.StateLogChanged += new EventHandler(Content_StateLogChanged); 51 51 } 52 52 53 53 protected override void DeregisterContentEvents() { 54 Content.Item JobChanged -= new EventHandler(Content_JobItemChanged);55 Content. JobChanged -= new EventHandler(Content_JobChanged);56 Content. JobStateChanged -= new EventHandler(Content_TaskStateChanged);54 Content.ItemTaskChanged -= new EventHandler(Content_TaskItemChanged); 55 Content.TaskChanged -= new EventHandler(Content_TaskChanged); 56 Content.TaskStateChanged -= new EventHandler(Content_TaskStateChanged); 57 57 Content.StateLogChanged -= new EventHandler(Content_StateLogChanged); 58 58 base.DeregisterContentEvents(); … … 66 66 computeInParallelCheckBox.Checked = false; 67 67 } 68 Content_ JobItemChanged(this, EventArgs.Empty);69 Content_ JobChanged(this, EventArgs.Empty);68 Content_TaskItemChanged(this, EventArgs.Empty); 69 Content_TaskChanged(this, EventArgs.Empty); 70 70 Content_TaskStateChanged(this, EventArgs.Empty); 71 71 } 72 72 73 protected virtual void Register JobEvents() {73 protected virtual void RegisterTaskEvents() { 74 74 if (Content != null && Content.Task != null) { 75 75 Content.ItemTask.ComputeInParallelChanged += new EventHandler(OptimizerJob_ComputeInParallelChanged); … … 78 78 } 79 79 80 protected virtual void Deregister JobEvents() {80 protected virtual void DeregisterTaskEvents() { 81 81 if (Content != null && Content.Task != null) { 82 82 Content.ItemTask.ComputeInParallelChanged -= new EventHandler(OptimizerJob_ComputeInParallelChanged); … … 86 86 87 87 #region Content Events 88 protected virtual void Content_ JobChanged(object sender, EventArgs e) {88 protected virtual void Content_TaskChanged(object sender, EventArgs e) { 89 89 if (InvokeRequired) { 90 Invoke(new EventHandler(Content_ JobChanged), sender, e);90 Invoke(new EventHandler(Content_TaskChanged), sender, e); 91 91 } else { 92 92 if (Content != null && Content.Task != null) { … … 106 106 } 107 107 108 protected virtual void Content_ JobItemChanged(object sender, EventArgs e) {109 Register JobEvents();108 protected virtual void Content_TaskItemChanged(object sender, EventArgs e) { 109 RegisterTaskEvents(); 110 110 Job_ItemChanged(this, e); 111 111 } -
TabularUnified branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.designer.cs ¶
r6726 r6727 1 1 namespace HeuristicLab.Clients.Hive.Views { 2 partial class Hive JobView {2 partial class HiveTaskView { 3 3 /// <summary> 4 4 /// Required designer variable. … … 458 458 this.commandLabel.Text = "Command:"; 459 459 // 460 // Hive JobView460 // HiveTaskView 461 461 // 462 462 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 463 463 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 464 464 this.Controls.Add(this.tabControl); 465 this.Name = "Hive JobView";465 this.Name = "HiveTaskView"; 466 466 this.Size = new System.Drawing.Size(577, 407); 467 467 this.stateLogTabPage.ResumeLayout(false); -
TabularUnified branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs ¶
r6726 r6727 27 27 [View("OptimizerHiveTask View")] 28 28 [Content(typeof(OptimizerHiveTask), true)] 29 public partial class OptimizerHive JobView : HiveJobView {29 public partial class OptimizerHiveTaskView : HiveTaskView { 30 30 public new OptimizerHiveTask Content { 31 31 get { return (OptimizerHiveTask)base.Content; } … … 37 37 } 38 38 39 public OptimizerHive JobView() {39 public OptimizerHiveTaskView() { 40 40 InitializeComponent(); 41 41 } -
TabularUnified branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.designer.cs ¶
r6726 r6727 1 1 namespace HeuristicLab.Clients.Hive.Views { 2 partial class OptimizerHive JobView {2 partial class OptimizerHiveTaskView { 3 3 /// <summary> 4 4 /// Required designer variable. … … 24 24 /// </summary> 25 25 private void InitializeComponent() { 26 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptimizerHive JobView));26 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptimizerHiveTaskView)); 27 27 this.restartButton = new System.Windows.Forms.Button(); 28 28 this.pauseButton = new System.Windows.Forms.Button(); … … 128 128 this.runCollectionViewHost.ViewType = null; 129 129 // 130 // OptimizerHive JobView130 // OptimizerHiveTaskView 131 131 // 132 132 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 133 133 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 134 this.Name = "OptimizerHive JobView";134 this.Name = "OptimizerHiveTaskView"; 135 135 this.stateLogTabPage.ResumeLayout(false); 136 136 this.detailsTabPage.ResumeLayout(false); -
TabularUnified branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/TreeView/DeleteTaskTreeNodeAction.cs ¶
r6726 r6727 5 5 using HeuristicLab.Optimization; 6 6 namespace HeuristicLab.Clients.Hive.Views.ExperimentManager.TreeView { 7 public class Delete JobTreeNodeAction : IItemTreeNodeAction<HiveTask> {8 private ItemCollection<HiveTask> hive Jobs;9 10 public Delete JobTreeNodeAction(ItemCollection<HiveTask> hiveJobs) {11 this.hive Jobs = hiveJobs;7 public class DeleteTaskTreeNodeAction : IItemTreeNodeAction<HiveTask> { 8 private ItemCollection<HiveTask> hiveTasks; 9 10 public DeleteTaskTreeNodeAction(ItemCollection<HiveTask> hiveTasks) { 11 this.hiveTasks = hiveTasks; 12 12 } 13 13 … … 22 22 public void Execute(HiveTask item, HiveTask parentItem) { 23 23 if (parentItem == null) { 24 hive Jobs.Remove(item);24 hiveTasks.Remove(item); 25 25 } else { 26 26 var experiment = parentItem.ItemTask.Item as Experiment; -
TabularUnified branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/TreeView/HiveTaskItemTreeView.Designer.cs ¶
r6726 r6727 21 21 22 22 namespace HeuristicLab.Clients.Hive.Views.ExperimentManager { 23 partial class Hive JobItemTreeView {23 partial class HiveTaskItemTreeView { 24 24 /// <summary> 25 25 /// Required designer variable. -
TabularUnified branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/TreeView/HiveTaskItemTreeView.cs ¶
r6726 r6727 32 32 [View("HiveTask ItemTreeView")] 33 33 [Content(typeof(ItemCollection<HiveTask>), IsDefaultView = false)] 34 public partial class Hive JobItemTreeView : ItemTreeView<HiveTask> {34 public partial class HiveTaskItemTreeView : ItemTreeView<HiveTask> { 35 35 public new ItemCollection<HiveTask> Content { 36 36 get { return (ItemCollection<HiveTask>)base.Content; } … … 38 38 } 39 39 40 public Hive JobItemTreeView() {40 public HiveTaskItemTreeView() { 41 41 InitializeComponent(); 42 42 } -
TabularUnified branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/TreeView/NewTaskTreeNodeAction.cs ¶
r6726 r6727 25 25 26 26 namespace HeuristicLab.Clients.Hive { 27 public class New ExperimentTreeNodeAction : IItemTreeNodeAction<HiveTask> {27 public class NewTaskTreeNodeAction : IItemTreeNodeAction<HiveTask> { 28 28 private ItemCollection<HiveTask> hiveJobs; 29 29 30 public New ExperimentTreeNodeAction(ItemCollection<HiveTask> hiveJobs) {30 public NewTaskTreeNodeAction(ItemCollection<HiveTask> hiveJobs) { 31 31 this.hiveJobs = hiveJobs; 32 32 } 33 33 34 public string Name { 35 get { return "New Experiment..."; }34 public string Name { 35 get { return "New Task..."; } 36 36 } 37 37 -
TabularUnified branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveTask.cs ¶
r6725 r6727 286 286 287 287 #region Event Handler 288 public event EventHandler JobChanged;288 public event EventHandler TaskChanged; 289 289 private void OnTaskChanged() { 290 EventHandler handler = JobChanged;290 EventHandler handler = TaskChanged; 291 291 if (handler != null) handler(this, EventArgs.Empty); 292 292 } 293 293 294 public event EventHandler JobStateChanged;294 public event EventHandler TaskStateChanged; 295 295 private void OnTaskStateChanged() { 296 EventHandler handler = JobStateChanged;296 EventHandler handler = TaskStateChanged; 297 297 if (handler != null) handler(this, EventArgs.Empty); 298 298 } 299 299 300 public event EventHandler Item JobChanged;300 public event EventHandler ItemTaskChanged; 301 301 private void OnItemTaskChanged() { 302 302 ItemJob_ComputeInParallelChanged(this, EventArgs.Empty); 303 var handler = Item JobChanged;303 var handler = ItemTaskChanged; 304 304 if (handler != null) handler(this, EventArgs.Empty); 305 305 }
Note: See TracChangeset
for help on using the changeset viewer.