Changeset 15933


Ignore:
Timestamp:
05/13/18 20:33:39 (4 years ago)
Author:
jzenisek
Message:

#2839: several fixes

  • rebuilt run in hive
  • adapted numeric selector (added FixedNumericUpDown.cs)
Location:
branches/2839_HiveProjectManagement
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs

    r15922 r15933  
    8585        var top = BuildResourceTree(HiveAdminClient.Instance.Resources);
    8686        detailsViewHost.Content = top;
     87        detailsViewHost.Locked = true;
    8788      }
    8889    }
  • branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourceView.Designer.cs

    r15422 r15933  
    3131      this.descriptionTextBox = new System.Windows.Forms.TextBox();
    3232      this.heartbeatIntervalLabel = new System.Windows.Forms.Label();
    33       this.heartbeatIntervalNumericUpDown = new System.Windows.Forms.NumericUpDown();
     33      this.heartbeatIntervalNumericUpDown = new Hive.Views.Extensions.FixedNumericUpDown();
    3434      this.publicLabel = new System.Windows.Forms.Label();
    3535      this.publicCheckBox = new System.Windows.Forms.CheckBox();
     
    111111      this.heartbeatIntervalNumericUpDown.Size = new System.Drawing.Size(397, 20);
    112112      this.heartbeatIntervalNumericUpDown.TabIndex = 9;
     113      this.heartbeatIntervalNumericUpDown.Minimum = 0;
     114      this.heartbeatIntervalNumericUpDown.Maximum = 120;
    113115      this.heartbeatIntervalNumericUpDown.ValueChanged += new System.EventHandler(this.heartbeatIntervalNumericUpDown_ValueChanged);
    114116      //
     
    164166    protected System.Windows.Forms.TextBox idTextBox;
    165167    protected System.Windows.Forms.TextBox descriptionTextBox;
    166     protected System.Windows.Forms.NumericUpDown heartbeatIntervalNumericUpDown;
     168    protected HeuristicLab.Clients.Hive.Views.Extensions.FixedNumericUpDown heartbeatIntervalNumericUpDown;
    167169    protected System.Windows.Forms.CheckBox publicCheckBox;
    168170  }
  • branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/RunInHiveMenuItem.cs

    r14185 r15933  
    2828using HeuristicLab.Optimizer;
    2929using HeuristicLab.PluginInfrastructure;
     30using HeuristicLab.Clients.Hive.JobManager.Views;
     31using System.Windows.Forms;
     32using System.Linq;
    3033
    3134namespace HeuristicLab.Clients.Hive.JobManager {
     
    8285      task.ItemTask.ComputeInParallel = content is Experiment || content is BatchRun;
    8386
    84       progress = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToContent(this.content, "Uploading to Hive...");
    85       rJob.Progress = progress;
    86       progress.ProgressStateChanged += progress_ProgressStateChanged;
    8787
    88       HiveClient.StartJob(new Action<Exception>(HandleEx), rJob, new CancellationToken());
     88      var hiveResourceSelectorDialog = new HiveResourceSelectorDialog(rJob.Job.Id, rJob.Job.ProjectId);
     89      if (hiveResourceSelectorDialog.ShowDialog((UserControl)activeView) == DialogResult.OK) {
     90        var selectedProject = hiveResourceSelectorDialog.SelectedProject;
     91        if (selectedProject != null) {
     92          rJob.Job.ProjectId = selectedProject.Id;
     93          rJob.Job.ResourceIds = hiveResourceSelectorDialog.SelectedResources.Select(x => x.Id).ToList();
     94
     95          progress = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToContent(this.content, "Uploading to Hive...");
     96          rJob.Progress = progress;
     97          progress.ProgressStateChanged += progress_ProgressStateChanged;
     98
     99          HiveClient.StartJob(new Action<Exception>(HandleEx), rJob, new CancellationToken());
     100        }
     101      }
    89102    }
    90103
  • branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.Designer.cs

    r15627 r15933  
    5555      this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    5656      this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
     57      this.okButton.Enabled = false;
    5758      this.okButton.Location = new System.Drawing.Point(405, 609);
    5859      this.okButton.Name = "okButton";
     
    9192      this.hiveResourceSelector.Caption = "View";
    9293      this.hiveResourceSelector.Content = null;
     94      this.hiveResourceSelector.JobId = new System.Guid("00000000-0000-0000-0000-000000000000");
    9395      this.hiveResourceSelector.Location = new System.Drawing.Point(12, 12);
    9496      this.hiveResourceSelector.Name = "hiveResourceSelector";
     97      this.hiveResourceSelector.ProjectId = null;
    9598      this.hiveResourceSelector.ReadOnly = false;
    9699      this.hiveResourceSelector.SelectedProject = null;
     100      this.hiveResourceSelector.SelectedProjectId = null;
     101      this.hiveResourceSelector.SelectedResourceIds = null;
    97102      this.hiveResourceSelector.Size = new System.Drawing.Size(549, 591);
    98103      this.hiveResourceSelector.TabIndex = 0;
  • branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.cs

    r15913 r15933  
    129129
    130130      await SecurityExceptionUtil.TryAsyncAndReportSecurityExceptions(
    131         action: () => UpdateInstance(),
     131        action: () => UpdateProjects(),
    132132        finallyCallback: () => updatingProjects = false);
    133133    }
     
    151151
    152152    #region Helpers
    153     private void UpdateInstance() {
    154       HiveClient.Instance.Refresh();
    155     }
    156 
    157153    private void UpdateProjects() {
    158154      HiveClient.Instance.RefreshProjectsAndResources();
  • branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj

    r15922 r15933  
    101101  </ItemGroup>
    102102  <ItemGroup>
     103    <Compile Include="Extensions\FixedNumericUpDown.cs">
     104      <SubType>Component</SubType>
     105    </Compile>
    103106    <Compile Include="HiveInformationDialog.cs">
    104107      <SubType>Form</SubType>
Note: See TracChangeset for help on using the changeset viewer.