- Timestamp:
- 03/28/19 16:54:20 (5 years ago)
- Location:
- branches/2521_ProblemRefactoring
- Files:
-
- 29 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive.Views merged eligible /branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Views merged eligible /branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Clients.Hive.Views merged eligible /branches/2965_CancelablePersistence/HeuristicLab.Clients.Hive.Views merged eligible /stable/HeuristicLab.Clients.Hive.Views merged eligible /trunk/HeuristicLab.Clients.Hive.Views merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Clients.Hive.Views 10321-10322 /branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Hive.Views 15743-16388 /branches/2915-AbsoluteSymbol/HeuristicLab.Clients.Hive.Views 15943-16355 /branches/Algorithms.GradientDescent/HeuristicLab.Clients.Hive.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Clients.Hive.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.Clients.Hive.Views 4656-4721 /branches/CodeEditor/HeuristicLab.Clients.Hive.Views 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Clients.Hive.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Clients.Hive.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.Clients.Hive.Views 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Clients.Hive.Views 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Clients.Hive.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Clients.Hive.Views 5060 /branches/HLScript/HeuristicLab.Clients.Hive.Views 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Clients.Hive.Views 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Clients.Hive.Views 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Clients.Hive.Views 11130-12721 /branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Views 12440-12877 /branches/LogResidualEvaluator/HeuristicLab.Clients.Hive.Views 10202-10483 /branches/NET40/sources/HeuristicLab.Clients.Hive.Views 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Clients.Hive.Views 12033-12122 /branches/ParallelEngine/HeuristicLab.Clients.Hive.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Clients.Hive.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Clients.Hive.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Clients.Hive.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.Clients.Hive.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.Clients.Hive.Views 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Clients.Hive.Views 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Clients.Hive.Views 5370-5682 /branches/Trunk/HeuristicLab.Clients.Hive.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.Clients.Hive.Views 9168-9215 /branches/VNS/HeuristicLab.Clients.Hive.Views 5594-5752 /branches/crossvalidation-2434/HeuristicLab.Clients.Hive.Views 12948-12950 /branches/histogram/HeuristicLab.Clients.Hive.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj
r11623 r16723 11 11 <RootNamespace>HeuristicLab.Clients.Hive.Views</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Clients.Hive.Views-3.3</AssemblyName> 13 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 14 14 <FileAlignment>512</FileAlignment> 15 15 <TargetFrameworkProfile /> … … 101 101 </ItemGroup> 102 102 <ItemGroup> 103 <Compile Include="Extensions\FixedNumericUpDown.cs"> 104 <SubType>Component</SubType> 105 </Compile> 103 106 <Compile Include="HiveInformationDialog.cs"> 104 107 <SubType>Form</SubType> … … 168 171 <Compile Include="StateLog\StateLogView.designer.cs"> 169 172 <DependentUpon>StateLogView.cs</DependentUpon> 173 </Compile> 174 <Compile Include="TreeView\NoDoubleClickTreeView.cs"> 175 <SubType>Component</SubType> 170 176 </Compile> 171 177 <None Include="Plugin.cs.frame" /> … … 258 264 <Private>False</Private> 259 265 </ProjectReference> 266 </ItemGroup> 267 <ItemGroup> 268 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 269 <SpecificVersion>False</SpecificVersion> 270 <HintPath>..\..\bin\HEAL.Attic.dll</HintPath> 271 <Private>False</Private> 272 </Reference> 260 273 </ItemGroup> 261 274 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/HiveInformationDialog.Designer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/HiveInformationDialog.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/HiveItemView.Designer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 52 52 // storeButton 53 53 // 54 this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary. PublishToWeb;54 this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save; 55 55 this.storeButton.Location = new System.Drawing.Point(0, 0); 56 56 this.storeButton.Name = "storeButton"; -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/HiveItemView.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskListView.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskListView.designer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 211 211 } 212 212 } 213 214 private void coresNeededComboBox_SelectedIndexChanged(object sender, EventArgs e) { 215 if (Content != null && Content.Task != null) { 216 int cores; 217 if (int.TryParse(coresNeededComboBox.SelectedItem.ToString(), out cores) && Content.Task.CoresNeeded != cores) 218 Content.Task.CoresNeeded = cores; 219 } 220 } 213 221 } 214 222 } -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.designer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 292 292 "2", 293 293 "3", 294 "4"}); 294 "4", 295 "6", 296 "8", 297 "10", 298 "12"}); 295 299 this.coresNeededComboBox.Location = new System.Drawing.Point(134, 13); 296 300 this.coresNeededComboBox.Name = "coresNeededComboBox"; 297 301 this.coresNeededComboBox.Size = new System.Drawing.Size(134, 21); 298 302 this.coresNeededComboBox.TabIndex = 41; 303 this.coresNeededComboBox.SelectedIndexChanged += new System.EventHandler(this.coresNeededComboBox_SelectedIndexChanged); 299 304 // 300 305 // memoryNeededLabel -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 46 46 protected override void Job_ItemChanged(object sender, EventArgs e) { 47 47 if (Content != null && Content.Task != null && Content.ItemTask.Item != null) { 48 Content.ExecuteReadActionOnItemTask(new Action(delegate () {48 Content.ExecuteReadActionOnItemTask(new Action(delegate () { 49 49 runCollectionViewHost.Content = Content.ItemTask.Item.Runs; 50 50 })); … … 58 58 base.RegisterContentEvents(); 59 59 Content.IsControllableChanged += new EventHandler(Content_IsControllableChanged); 60 MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, Content.Progress);60 Progress.Show(this, Content.Progress); 61 61 } 62 62 63 63 protected override void DeregisterContentEvents() { 64 64 Content.IsControllableChanged -= new EventHandler(Content_IsControllableChanged); 65 MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this, false);65 Progress.Hide(this, false); 66 66 base.DeregisterContentEvents(); 67 67 } … … 99 99 100 100 private void PauseTaskAsync() { 101 Content.Progress.Start("Pausing task. Please be patient for the command to take effect." );101 Content.Progress.Start("Pausing task. Please be patient for the command to take effect.", ProgressMode.Indeterminate); 102 102 Content.Pause(); 103 103 Content.Progress.Finish(); … … 105 105 106 106 private void StopTaskAsync() { 107 Content.Progress.Start("Stopping task. Please be patient for the command to take effect." );107 Content.Progress.Start("Stopping task. Please be patient for the command to take effect.", ProgressMode.Indeterminate); 108 108 Content.Stop(); 109 109 Content.Progress.Finish(); … … 111 111 112 112 private void ResumeTaskAsync() { 113 Content.Progress.Start("Resuming task. Please be patient for the command to take effect." );113 Content.Progress.Start("Resuming task. Please be patient for the command to take effect.", ProgressMode.Indeterminate); 114 114 Content.Restart(); 115 115 Content.Progress.Finish(); -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.designer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/Plugin.cs.frame
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/Properties/AssemblyInfo.cs.frame
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartListView.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartListView.designer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartView.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartView.designer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogListView.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogListView.designer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogView.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogView.designer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/TreeView/DeleteTaskTreeNodeAction.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/TreeView/HiveTaskItemTreeView.Designer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/TreeView/HiveTaskItemTreeView.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/TreeView/ItemTreeView.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/TreeView/ItemTreeView.designer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Views/3.3/TreeView/NewTaskTreeNodeAction.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab.
Note: See TracChangeset
for help on using the changeset viewer.