Changeset 9436
- Timestamp:
- 05/03/13 23:20:36 (12 years ago)
- Location:
- trunk/sources
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs
r9223 r9436 76 76 Content.ExecutionStateChanged += new EventHandler(Content_ExecutionStateChanged); 77 77 Content.ExecutionTimeChanged += new EventHandler(Content_ExecutionTimeChanged); 78 Content.IsAllowedPrivilegedChanged += new EventHandler(Content_IsAllowedPrivilegedChanged);79 78 Content.Loaded += new EventHandler(Content_Loaded); 80 79 Content.TaskReceived += new EventHandler(Content_TaskReceived); … … 145 144 executionTimeTextBox.Text = Content.ExecutionTime.ToString(); 146 145 resourceNamesTextBox.Text = Content.Job.ResourceNames; 147 isPrivilegedCheckBox.Checked = Content. IsAllowedPrivileged;146 isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged; 148 147 refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically; 149 148 logView.Content = Content.Log; … … 327 326 runCollectionViewHost.Content = GetAllRunsFromJob(Content); 328 327 } 328 isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged; 329 329 } 330 330 … … 368 368 else { 369 369 UpdateStateLogList(); 370 }371 }372 private void Content_IsAllowedPrivilegedChanged(object sender, EventArgs e) {373 if (InvokeRequired)374 Invoke(new EventHandler(Content_IsAllowedPrivilegedChanged), sender, e);375 else {376 isPrivilegedCheckBox.Checked = Content.IsAllowedPrivileged;377 SetEnabledStateOfControls();378 370 } 379 371 } … … 478 470 479 471 private void isPrivilegedCheckBox_CheckChanged(object sender, EventArgs e) { 480 if (Content != null && !SuppressEvents) Content. IsAllowedPrivileged = isPrivilegedCheckBox.Checked;472 if (Content != null && !SuppressEvents) Content.Job.IsPrivileged = isPrivilegedCheckBox.Checked; 481 473 } 482 474 -
trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs
r9219 r9436 113 113 114 114 foreach (var j in jobsLoaded) { 115 jobs.Add(new RefreshableJob(j) { IsAllowedPrivileged = this.isAllowedPrivileged });115 jobs.Add(new RefreshableJob(j)); 116 116 } 117 117 } … … 452 452 IDictionary<Guid, HiveTask> allHiveTasks = downloader.Results; 453 453 var parents = allHiveTasks.Values.Where(x => !x.Task.ParentTaskId.HasValue); 454 refreshableJob.Job.IsPrivileged = allHiveTasks.Any(x => x.Value.Task.IsPrivileged); 454 455 455 456 refreshableJob.Progress.Status = "Downloading/deserializing complete. Displaying tasks..."; -
trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs
r9390 r9436 157 157 } 158 158 159 // may execute jobs with privileged permissions on slaves160 public bool IsAllowedPrivileged {161 get { return Job.IsPrivileged; }162 set {163 if (value != Job.IsPrivileged) {164 Job.IsPrivileged = value;165 OnIsAllowedPrivilegedChanged();166 }167 }168 }169 170 159 private Progress progress; 171 160 public Progress Progress { … … 196 185 this.HiveTasks = new ItemCollection<HiveTask>(); 197 186 } 198 public RefreshableJob(Job hive Experiment) {187 public RefreshableJob(Job hiveJob) { 199 188 this.refreshAutomatically = true; 200 this.Job = hive Experiment;189 this.Job = hiveJob; 201 190 this.log = new ThreadSafeLog(); 202 191 this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(Settings.Default.MaxParallelDownloads, Settings.Default.MaxParallelDownloads); … … 433 422 } 434 423 435 public event EventHandler IsAllowedPrivilegedChanged;436 private void OnIsAllowedPrivilegedChanged() {437 var handler = IsAllowedPrivilegedChanged;438 if (handler != null) handler(this, EventArgs.Empty);439 }440 441 424 public event EventHandler JobStatisticsChanged; 442 425 private void OnJobStatisticsChanged() {
Note: See TracChangeset
for help on using the changeset viewer.