Changeset 12930


Ignore:
Timestamp:
09/02/15 07:50:58 (7 years ago)
Author:
ascheibe
Message:

#2355 adapted MetaOpt branch to changes from r12926

Location:
branches/HeuristicLab.MetaOptimization
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.HiveEngine.Views/3.3/HiveEngineView.Designer.cs

    r6984 r12930  
    3838      this.executionTimeLabel = new System.Windows.Forms.Label();
    3939      this.executionTimeTextBox = new System.Windows.Forms.TextBox();
    40       this.isPrivilegedCheckBox = new System.Windows.Forms.CheckBox();
    4140      this.tabControl.SuspendLayout();
    4241      this.jobsTabPage.SuspendLayout();
     
    5554      // resourceIdsTextBox
    5655      //
    57       this.resourceIdsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    58                   | System.Windows.Forms.AnchorStyles.Left)
    59                   | System.Windows.Forms.AnchorStyles.Right)));
     56      this.resourceIdsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     57            | System.Windows.Forms.AnchorStyles.Left)
     58            | System.Windows.Forms.AnchorStyles.Right)));
    6059      this.resourceIdsTextBox.Location = new System.Drawing.Point(189, 52);
    6160      this.resourceIdsTextBox.Name = "resourceIdsTextBox";
    62       this.resourceIdsTextBox.Size = new System.Drawing.Size(428, 20);
     61      this.resourceIdsTextBox.Size = new System.Drawing.Size(517, 20);
    6362      this.resourceIdsTextBox.TabIndex = 4;
    6463      this.resourceIdsTextBox.Text = "HEAL";
     
    9493      // executionTimeOnHiveTextBox
    9594      //
    96       this.executionTimeOnHiveTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    97                   | System.Windows.Forms.AnchorStyles.Left)
    98                   | System.Windows.Forms.AnchorStyles.Right)));
     95      this.executionTimeOnHiveTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     96            | System.Windows.Forms.AnchorStyles.Left)
     97            | System.Windows.Forms.AnchorStyles.Right)));
    9998      this.executionTimeOnHiveTextBox.Location = new System.Drawing.Point(129, 26);
    10099      this.executionTimeOnHiveTextBox.Name = "executionTimeOnHiveTextBox";
     
    105104      // tabControl
    106105      //
    107       this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    108                   | System.Windows.Forms.AnchorStyles.Left)
    109                   | System.Windows.Forms.AnchorStyles.Right)));
     106      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     107            | System.Windows.Forms.AnchorStyles.Left)
     108            | System.Windows.Forms.AnchorStyles.Right)));
    110109      this.tabControl.Controls.Add(this.jobsTabPage);
    111110      this.tabControl.Controls.Add(this.logTabPage);
     
    135134      this.hiveExperimentListView.Name = "hiveExperimentListView";
    136135      this.hiveExperimentListView.ReadOnly = false;
     136      this.hiveExperimentListView.ShowDetails = true;
    137137      this.hiveExperimentListView.Size = new System.Drawing.Size(686, 428);
    138138      this.hiveExperimentListView.TabIndex = 0;
     
    171171      // executionTimeTextBox
    172172      //
    173       this.executionTimeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    174                   | System.Windows.Forms.AnchorStyles.Left)
    175                   | System.Windows.Forms.AnchorStyles.Right)));
     173      this.executionTimeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     174            | System.Windows.Forms.AnchorStyles.Left)
     175            | System.Windows.Forms.AnchorStyles.Right)));
    176176      this.executionTimeTextBox.Location = new System.Drawing.Point(129, 3);
    177177      this.executionTimeTextBox.Name = "executionTimeTextBox";
     
    180180      this.executionTimeTextBox.TabIndex = 11;
    181181      //
    182       // isPrivilegedCheckBox
    183       //
    184       this.isPrivilegedCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    185       this.isPrivilegedCheckBox.AutoSize = true;
    186       this.isPrivilegedCheckBox.Location = new System.Drawing.Point(623, 54);
    187       this.isPrivilegedCheckBox.Name = "isPrivilegedCheckBox";
    188       this.isPrivilegedCheckBox.Size = new System.Drawing.Size(80, 17);
    189       this.isPrivilegedCheckBox.TabIndex = 13;
    190       this.isPrivilegedCheckBox.Text = "IsPrivileged";
    191       this.isPrivilegedCheckBox.UseVisualStyleBackColor = true;
    192       this.isPrivilegedCheckBox.Validated += new System.EventHandler(this.isPrivilegedCheckBox_Validated);
    193       //
    194182      // HiveEngineView
    195183      //
    196184      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    197185      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    198       this.Controls.Add(this.isPrivilegedCheckBox);
    199186      this.Controls.Add(this.executionTimeTextBox);
    200187      this.Controls.Add(this.executionTimeLabel);
     
    231218    private HeuristicLab.Core.Views.LogView logView;
    232219    private RefreshableHiveJobListView hiveExperimentListView;
    233     private System.Windows.Forms.CheckBox isPrivilegedCheckBox;
    234220  }
    235221}
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.HiveEngine.Views/3.3/HiveEngineView.cs

    r6984 r12930  
    7373        priorityTextBox.Text = string.Empty;
    7474        executionTimeOnHiveTextBox.Text = string.Empty;
    75         isPrivilegedCheckBox.Checked = false;
    7675        hiveExperimentListView.Content = null;
    7776        logView.Content = null;
     
    8079        priorityTextBox.Text = Content.Priority.ToString();
    8180        executionTimeOnHiveTextBox.Text = Content.ExecutionTimeOnHive.ToString();
    82         isPrivilegedCheckBox.Checked = Content.IsPrivileged;
    8381        hiveExperimentListView.Content = Content.Jobs;
    8482        logView.Content = Content.Log;
     
    9290        resourceIdsTextBox.ReadOnly = this.ReadOnly;
    9391        priorityTextBox.ReadOnly = this.ReadOnly;
    94         isPrivilegedCheckBox.Enabled = Content.IsAllowedPrivileged;
    9592      } else {
    9693        resourceIdsTextBox.ReadOnly = false;
    9794        priorityTextBox.ReadOnly = false;
    98         isPrivilegedCheckBox.Enabled = false;
    9995      }
    10096    }
     
    108104      Content.Priority = int.Parse(priorityTextBox.Text);
    109105    }
    110 
    111     private void isPrivilegedCheckBox_Validated(object sender, EventArgs e) {
    112       Content.IsPrivileged = isPrivilegedCheckBox.Checked;
    113     }
    114106    #endregion
    115107  }
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.HiveEngine/3.3/HiveEngine.cs

    r7137 r12930  
    9292    }
    9393
    94     public bool IsAllowedPrivileged { get; set; }
    95 
    9694    #region constructors and cloning
    9795    public HiveEngine() {
     
    9997      this.Priority = 0;
    10098      this.log = new ThreadSafeLog();
    101       this.IsAllowedPrivileged = HiveServiceLocator.Instance.CallHiveService((s) => s.IsAllowedPrivileged());
    10299    }
    103100
     
    288285        log.LogException(e);
    289286        throw e;
    290       } finally {
     287      }
     288      finally {
    291289        DisposeJob(refreshableJob);
    292290      }
     
    299297        hiveExperiment.DateCreated = DateTime.Now;
    300298        hiveExperiment.ResourceNames = this.ResourceNames;
    301         hiveExperiment.IsPrivileged = this.IsPrivileged;
    302299        var refreshableHiveExperiment = new RefreshableJob(hiveExperiment);
    303300        refreshableHiveExperiment.IsDownloadable = false; // download happens automatically so disable button
Note: See TracChangeset for help on using the changeset viewer.