- Timestamp:
- 03/18/19 17:24:30 (5 years ago)
- Location:
- branches/2521_ProblemRefactoring
- Files:
-
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring
- Property svn:ignore
-
old new 24 24 protoc.exe 25 25 obj 26 .vs
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/ExtensionMethods/TreeNodeExtensions.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/ListViewItemDateComparer.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/CreateHiveJobMenuItem.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 55 55 56 56 public override void Execute() { 57 IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView; 58 var content = activeView.Content as IItem; 57 IContentView activeView = (IContentView)MainFormManager.MainForm.ActiveView; 58 var content = (IItem)activeView.Content; 59 var clonedConent = (IItem)content.Clone(); 59 60 60 61 //IOptimizer and IExecutables need some special care 61 if (c ontent is IOptimizer) {62 ((IOptimizer)c ontent).Runs.Clear();62 if (clonedConent is IOptimizer) { 63 ((IOptimizer)clonedConent).Runs.Clear(); 63 64 } 64 if (c ontent is IExecutable) {65 IExecutable exec = c ontent as IExecutable;65 if (clonedConent is IExecutable) { 66 IExecutable exec = clonedConent as IExecutable; 66 67 if (exec.ExecutionState != ExecutionState.Prepared) { 67 68 exec.Prepare(); … … 71 72 HiveClient.Instance.Refresh(); 72 73 73 ItemTask hiveTask = ItemTask.GetItemTaskForItem(c ontent);74 ItemTask hiveTask = ItemTask.GetItemTaskForItem(clonedConent); 74 75 HiveTask task = hiveTask.CreateHiveTask(); 75 76 RefreshableJob rJob = new RefreshableJob(); 76 rJob.Job.Name = c ontent.ToString();77 rJob.Job.Name = clonedConent.ToString(); 77 78 rJob.HiveTasks.Add(task); 78 task.ItemTask.ComputeInParallel = c ontent is Experiment || content is BatchRun;79 task.ItemTask.ComputeInParallel = clonedConent is Experiment || clonedConent is BatchRun; 79 80 80 81 MainFormManager.MainForm.ShowContent(rJob); -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/JobManagerMenuItem.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/RunInHiveMenuItem.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Plugin.cs.frame
r13321 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 24 24 namespace HeuristicLab.Clients.Hive.JobManager { 25 [Plugin("HeuristicLab.Clients.Hive.JobManager", "3.3.1 3.$WCREV$")]25 [Plugin("HeuristicLab.Clients.Hive.JobManager", "3.3.15.$WCREV$")] 26 26 [PluginFile("HeuristicLab.Clients.Hive.JobManager-3.3.dll", PluginFileType.Assembly)] 27 27 [PluginDependency("HeuristicLab.Clients.Hive", "3.3")] -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Properties/AssemblyInfo.cs.frame
r13321 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 32 32 [assembly: AssemblyCompany("HEAL")] 33 33 [assembly: AssemblyProduct("HeuristicLab")] 34 [assembly: AssemblyCopyright("(c) 2002-201 5HEAL")]34 [assembly: AssemblyCopyright("(c) 2002-2018 HEAL")] 35 35 [assembly: AssemblyTrademark("")] 36 36 [assembly: AssemblyCulture("")] … … 55 55 // [assembly: AssemblyVersion("1.0.*")] 56 56 [assembly: AssemblyVersion("3.3.0.0")] 57 [assembly: AssemblyFileVersion("3.3.1 3.$WCREV$")]57 [assembly: AssemblyFileVersion("3.3.15.$WCREV$")] -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.Designer.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs
r13060 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 61 61 } 62 62 63 protected override void OnContentChanged() {63 protected async override void OnContentChanged() { 64 64 base.OnContentChanged(); 65 65 if (Content == null) { … … 67 67 } else { 68 68 hiveExperimentListView.Content = Content.Jobs; 69 if (Content != null) 70 Content.RefreshAsync(new Action<Exception>((Exception ex) => HandleServiceException(ex))); 69 try { 70 await System.Threading.Tasks.Task.Run(() => Content.Refresh()); 71 } catch (Exception ex) { 72 HandleServiceException(ex); 73 } 71 74 } 72 75 } … … 98 101 } 99 102 100 private void refreshButton_Click(object sender, EventArgs e) { 101 Content.RefreshAsync(new Action<Exception>((Exception ex) => HandleServiceException(ex))); 103 private async void refreshButton_Click(object sender, EventArgs e) { 104 try { 105 await System.Threading.Tasks.Task.Run(() => Content.Refresh()); 106 } catch (Exception ex) { 107 HandleServiceException(ex); 108 } 102 109 } 103 110 -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.Designer.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.Designer.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.Designer.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.Designer.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.Designer.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs
r12926 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 60 60 this.startButton = new System.Windows.Forms.Button(); 61 61 this.stopButton = new System.Windows.Forms.Button(); 62 this.resetButton = new System.Windows.Forms.Button();63 62 this.executionTimeLabel = new System.Windows.Forms.Label(); 64 63 this.executionTimeTextBox = new System.Windows.Forms.TextBox(); … … 271 270 this.stopButton.Click += new System.EventHandler(this.stopButton_Click); 272 271 // 273 // resetButton274 //275 this.resetButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));276 this.resetButton.Enabled = false;277 this.resetButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Restart;278 this.resetButton.Location = new System.Drawing.Point(90, 536);279 this.resetButton.Name = "resetButton";280 this.resetButton.Size = new System.Drawing.Size(24, 24);281 this.resetButton.TabIndex = 8;282 this.toolTip.SetToolTip(this.resetButton, "Reset Experiment");283 this.resetButton.UseVisualStyleBackColor = true;284 this.resetButton.Click += new System.EventHandler(this.resetButton_Click);285 //286 272 // executionTimeLabel 287 273 // … … 486 472 this.Controls.Add(this.resourceIdsLabel); 487 473 this.Controls.Add(this.stopButton); 488 this.Controls.Add(this.resetButton);489 474 this.Name = "RefreshableHiveJobView"; 490 475 this.Size = new System.Drawing.Size(717, 560); … … 505 490 private System.Windows.Forms.Button startButton; 506 491 private System.Windows.Forms.Button stopButton; 507 private System.Windows.Forms.Button resetButton;508 492 private System.Windows.Forms.Label executionTimeLabel; 509 493 private System.Windows.Forms.TextBox executionTimeTextBox; -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs
r12926 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 167 167 pauseButton.Enabled = !Locked; 168 168 stopButton.Enabled = !Locked; 169 resetButton.Enabled = !Locked;170 169 } 171 170 … … 188 187 this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing; 189 188 190 this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && Content.ExecutionState == ExecutionState.Started&& !Content.IsProgressing;189 this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && (Content.ExecutionState == ExecutionState.Started || Content.ExecutionState == ExecutionState.Paused) && !Content.IsProgressing; 191 190 this.refreshButton.Enabled = Content.IsDownloadable && alreadyUploaded && !Content.IsProgressing; 192 191 … … 380 379 }, TaskContinuationOptions.OnlyOnFaulted); 381 380 } 382 private void resetButton_Click(object sender, EventArgs e) { }383 381 384 382 private void PauseJobAsync(object job) { … … 438 436 private void SetEnabledStateOfExecutableButtons() { 439 437 if (Content == null) { 440 startButton.Enabled = pauseButton.Enabled = stopButton.Enabled = resetButton.Enabled =false;438 startButton.Enabled = pauseButton.Enabled = stopButton.Enabled = false; 441 439 } else { 442 440 startButton.Enabled = Content.IsControllable && Content.HiveTasks != null && Content.HiveTasks.Count > 0 && (Content.ExecutionState == ExecutionState.Prepared || Content.ExecutionState == ExecutionState.Paused) && !Content.IsProgressing; 443 441 pauseButton.Enabled = Content.IsControllable && Content.ExecutionState == ExecutionState.Started && !Content.IsProgressing; 444 stopButton.Enabled = Content.IsControllable && Content.ExecutionState == ExecutionState.Started && !Content.IsProgressing; 445 resetButton.Enabled = false; 442 stopButton.Enabled = Content.IsControllable && (Content.ExecutionState == ExecutionState.Started || Content.ExecutionState == ExecutionState.Paused) && !Content.IsProgressing; 446 443 } 447 444 }
Note: See TracChangeset
for help on using the changeset viewer.