Changeset 7177 for trunk/sources/HeuristicLab.Clients.Hive.Views/3.3

Timestamp:

12/12/11 16:25:17 (13 years ago)

Author:

ascheibe

Message:

#1672 fixed setting of priorities in the Job Manager

Location:

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks

Files:

• HiveTaskView.cs (modified) (3 diffs)
• HiveTaskView.designer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.cs

@@ -93 +93 @@
           this.jobIdTextBox.Text = Content.Task.Id.ToString();
           this.dateCreatedTextBox.Text = Content.Task.DateCreated.HasValue ? Content.Task.DateCreated.ToString() : string.Empty;
-          this.priorityComboBox.Text = Content.Task.Priority.ToString();
+          if (Content.Task.Priority >= 0 && Content.Task.Priority < priorityComboBox.Items.Count) {
+            this.priorityComboBox.SelectedIndex = Content.Task.Priority;
+          } else {
+            this.priorityComboBox.SelectedIndex = 0;
+          }
           this.coresNeededComboBox.Text = Content.Task.CoresNeeded.ToString();
           this.memoryNeededComboBox.Text = Content.Task.MemoryNeeded.ToString();
@@ -99 +103 @@
           this.jobIdTextBox.Text = string.Empty;
           this.dateCreatedTextBox.Text = string.Empty;
-          this.priorityComboBox.Text = "3";
+          this.priorityComboBox.SelectedIndex = 0;
           this.coresNeededComboBox.Text = "1";
           this.memoryNeededComboBox.Text = "256";
@@ -201 +205 @@
       this.modifyItemButton.Enabled = (Content != null && Content.ItemTask.Item != null && (Content.Task.State == TaskState.Paused || Content.Task.State == TaskState.Offline || Content.Task.State == TaskState.Finished || Content.Task.State == TaskState.Failed || Content.Task.State == TaskState.Aborted));
     }
+
+    private void priorityComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      if (Content.Task.Priority != priorityComboBox.SelectedIndex) {
+        Content.Task.Priority = priorityComboBox.SelectedIndex;
+      }
+    }
   }
 }

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.designer.cs

@@ -170 +170 @@
       this.priorityComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.priorityComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.priorityComboBox.FormattingEnabled = true;
       this.priorityComboBox.Items.AddRange(new object[] {
-            "1",
-            "2",
-            "3",
-            "4",
-            "5"});
+            "Normal",
+            "Urgent",
+            "Critical"});
       this.priorityComboBox.Location = new System.Drawing.Point(87, 39);
       this.priorityComboBox.Name = "priorityComboBox";
       this.priorityComboBox.Size = new System.Drawing.Size(182, 21);
       this.priorityComboBox.TabIndex = 43;
+      this.priorityComboBox.SelectedIndexChanged += new System.EventHandler(this.priorityComboBox_SelectedIndexChanged);
       // 
       // jobIdLabel