Changeset 4548 for branches/OKB/HeuristicLab.Clients.OKB-3.3/Views

Timestamp:

10/04/10 01:43:23 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views

Files:

• AdministratorView.cs (modified) (1 diff)
• AlgorithmDataView.cs (modified) (7 diffs)
• AlgorithmView.cs (modified) (5 diffs)
• DataTypeView.cs (modified) (3 diffs)
• OKBExperimentView.Designer.cs (added)
• OKBExperimentView.cs (added)
• ProblemDataView.cs (modified) (7 diffs)
• ProblemView.cs (modified) (5 diffs)

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AdministratorView.cs

@@ -27 +27 @@
 namespace HeuristicLab.Clients.OKB {
   [View("OKB Administrator")]
-  [Content(typeof(Administrator), true)]
+  [Content(typeof(OKB), true)]
   public sealed partial class AdministratorView : AsynchronousContentView {
-    public new Administrator Content {
-      get { return (Administrator)base.Content; }
+    public new OKB Content {
+      get { return (OKB)base.Content; }
       set { base.Content = value; }
     }

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmDataView.cs

@@ -60 +60 @@
     protected override void OnInitialized(System.EventArgs e) {
       base.OnInitialized(e);
-      dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.ToList();
+      dataTypeComboBox.DataSource = OKB.Instance.DataTypes.ToList();
       dataTypeComboBox.SelectedIndex = -1;
     }
@@ -80 +80 @@
         noViewAvailableLabel.Visible = false;
       } else {
-        dataTypeComboBox.SelectedItem = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
+        dataTypeComboBox.SelectedItem = OKB.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
 
         using (MemoryStream stream = new MemoryStream(Content.Data)) {
@@ -111 +111 @@
       switch (e.PropertyName) {
         case "DataTypeId":
-          dataTypeComboBox.SelectedItem = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
+          dataTypeComboBox.SelectedItem = OKB.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
           break;
       }
@@ -119 +119 @@
       BeginAsyncCall();
       var call = new Action(delegate() {
-        AlgorithmData data = Administrator.Instance.GetAlgorithmData(AlgorithmId);
+        AlgorithmData data = OKB.Instance.GetAlgorithmData(AlgorithmId);
         Content = data;
       });
@@ -142 +142 @@
         }
       }
-      Administrator.Instance.UpdateAlgorithmData(Content);
+      OKB.Instance.UpdateAlgorithmData(Content);
     }
     private void newDataButton_Click(object sender, EventArgs e) {
@@ -153 +153 @@
             if (Content == null) Content = new AlgorithmData { AlgorithmId = AlgorithmId };
             viewHost.Content = (IContent)dialog.TypeSelector.CreateInstanceOfSelectedType();
-            DataType dataType = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
+            DataType dataType = OKB.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
             if (dataType == null) {
               dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "varbinary" };
-              dataType.PlatformId = Administrator.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
+              dataType.PlatformId = OKB.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
               dataType.Store();
-              Administrator.Instance.DataTypes.Add(dataType);
-              dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.OrderBy(d => d.Name).ToList();
+              OKB.Instance.DataTypes.Add(dataType);
+              dataTypeComboBox.DataSource = OKB.Instance.DataTypes.OrderBy(d => d.Name).ToList();
             }
             dataTypeComboBox.SelectedItem = dataType;
@@ -185 +185 @@
             viewHost.Content = algorithm;
             noViewAvailableLabel.Visible = false;
-            DataType dataType = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
+            DataType dataType = OKB.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
             if (dataType == null) {
               dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "varbinary" };
-              dataType.PlatformId = Administrator.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
+              dataType.PlatformId = OKB.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
               dataType.Store();
-              Administrator.Instance.DataTypes.Add(dataType);
-              dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.OrderBy(d => d.Name).ToList();
+              OKB.Instance.DataTypes.Add(dataType);
+              dataTypeComboBox.DataSource = OKB.Instance.DataTypes.OrderBy(d => d.Name).ToList();
             }
             dataTypeComboBox.SelectedItem = dataType;

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmView.cs

@@ -42 +42 @@
     protected override void OnInitialized(System.EventArgs e) {
       base.OnInitialized(e);
-      platformComboBox.DataSource = Administrator.Instance.Platforms.ToList();
-      algorithmClassComboBox.DataSource = Administrator.Instance.AlgorithmClasses.ToList();
+      platformComboBox.DataSource = OKB.Instance.Platforms.ToList();
+      algorithmClassComboBox.DataSource = OKB.Instance.AlgorithmClasses.ToList();
     }
 
@@ -53 +53 @@
         algorithmDataView.AlgorithmId = 0;
       } else {
-        platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
-        algorithmClassComboBox.SelectedItem = Administrator.Instance.AlgorithmClasses.FirstOrDefault(a => a.Id == Content.AlgorithmClassId);
+        platformComboBox.SelectedItem = OKB.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
+        algorithmClassComboBox.SelectedItem = OKB.Instance.AlgorithmClasses.FirstOrDefault(a => a.Id == Content.AlgorithmClassId);
         algorithmDataView.AlgorithmId = Content.Id;
       }
@@ -77 +77 @@
           break;
         case "PlatformId":
-          platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
+          platformComboBox.SelectedItem = OKB.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
           break;
         case "AlgorithmClassId":
-          algorithmClassComboBox.SelectedItem = Administrator.Instance.AlgorithmClasses.FirstOrDefault(a => a.Id == Content.AlgorithmClassId);
+          algorithmClassComboBox.SelectedItem = OKB.Instance.AlgorithmClasses.FirstOrDefault(a => a.Id == Content.AlgorithmClassId);
           break;
       }
@@ -99 +99 @@
 
     private void refreshUsersButton_Click(object sender, System.EventArgs e) {
-      Guid[] ids = Administrator.Instance.GetAlgorithmUsers(Content.Id);
+      Guid[] ids = OKB.Instance.GetAlgorithmUsers(Content.Id);
       if (ids != null) {
-        List<User> users = Administrator.Instance.Users.ToList();
+        List<User> users = OKB.Instance.Users.ToList();
         usersListBox.DataSource = users;
         usersListBox.DisplayMember = "Name";
@@ -112 +112 @@
     }
     private void storeUsersButton_Click(object sender, System.EventArgs e) {
-      if (Administrator.Instance.UpdateAlgorithmUsers(Content.Id, usersListBox.SelectedItems.Cast<User>().Select(u => u.Id).ToArray()))
+      if (OKB.Instance.UpdateAlgorithmUsers(Content.Id, usersListBox.SelectedItems.Cast<User>().Select(u => u.Id).ToArray()))
         storeUsersButton.Enabled = false;
     }

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeView.cs

@@ -41 +41 @@
     protected override void OnInitialized(System.EventArgs e) {
       base.OnInitialized(e);
-      platformComboBox.DataSource = Administrator.Instance.Platforms.ToList();
+      platformComboBox.DataSource = OKB.Instance.Platforms.ToList();
     }
 
@@ -57 +57 @@
         nameTextBox.Text = Content.Name;
         sqlNameComboBox.Text = Content.SqlName;
-        platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
+        platformComboBox.SelectedItem = OKB.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
         Caption = Content.Name;
       }
@@ -80 +80 @@
           break;
         case "PlatformId":
-          platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
+          platformComboBox.SelectedItem = OKB.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
           break;
       }

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/ProblemDataView.cs

@@ -60 +60 @@
     protected override void OnInitialized(System.EventArgs e) {
       base.OnInitialized(e);
-      dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.ToList();
+      dataTypeComboBox.DataSource = OKB.Instance.DataTypes.ToList();
       dataTypeComboBox.SelectedIndex = -1;
     }
@@ -80 +80 @@
         noViewAvailableLabel.Visible = false;
       } else {
-        dataTypeComboBox.SelectedItem = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
+        dataTypeComboBox.SelectedItem = OKB.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
 
         using (MemoryStream stream = new MemoryStream(Content.Data)) {
@@ -111 +111 @@
       switch (e.PropertyName) {
         case "DataTypeId":
-          dataTypeComboBox.SelectedItem = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
+          dataTypeComboBox.SelectedItem = OKB.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
           break;
       }
@@ -119 +119 @@
       BeginAsyncCall();
       var call = new Action(delegate() {
-        ProblemData data = Administrator.Instance.GetProblemData(ProblemId);
+        ProblemData data = OKB.Instance.GetProblemData(ProblemId);
         Content = data;
       });
@@ -141 +141 @@
         }
       }
-      Administrator.Instance.UpdateProblemData(Content);
+      OKB.Instance.UpdateProblemData(Content);
     }
     private void newDataButton_Click(object sender, EventArgs e) {
@@ -152 +152 @@
             if (Content == null) Content = new ProblemData { ProblemId = ProblemId };
             viewHost.Content = (IContent)dialog.TypeSelector.CreateInstanceOfSelectedType();
-            DataType dataType = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
+            DataType dataType = OKB.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
             if (dataType == null) {
               dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "varbinary" };
-              dataType.PlatformId = Administrator.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
+              dataType.PlatformId = OKB.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
               dataType.Store();
-              Administrator.Instance.DataTypes.Add(dataType);
-              dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.OrderBy(d => d.Name).ToList();
+              OKB.Instance.DataTypes.Add(dataType);
+              dataTypeComboBox.DataSource = OKB.Instance.DataTypes.OrderBy(d => d.Name).ToList();
             }
             dataTypeComboBox.SelectedItem = dataType;
@@ -184 +184 @@
             viewHost.Content = problem;
             noViewAvailableLabel.Visible = false;
-            DataType dataType = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
+            DataType dataType = OKB.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
             if (dataType == null) {
               dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "varbinary" };
-              dataType.PlatformId = Administrator.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
+              dataType.PlatformId = OKB.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
               dataType.Store();
-              Administrator.Instance.DataTypes.Add(dataType);
-              dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.OrderBy(d => d.Name).ToList();
+              OKB.Instance.DataTypes.Add(dataType);
+              dataTypeComboBox.DataSource = OKB.Instance.DataTypes.OrderBy(d => d.Name).ToList();
             }
             dataTypeComboBox.SelectedItem = dataType;

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/ProblemView.cs

@@ -42 +42 @@
     protected override void OnInitialized(System.EventArgs e) {
       base.OnInitialized(e);
-      platformComboBox.DataSource = Administrator.Instance.Platforms.ToList();
-      problemClassComboBox.DataSource = Administrator.Instance.ProblemClasses.ToList();
+      platformComboBox.DataSource = OKB.Instance.Platforms.ToList();
+      problemClassComboBox.DataSource = OKB.Instance.ProblemClasses.ToList();
     }
 
@@ -53 +53 @@
         problemDataView.ProblemId = 0;
       } else {
-        platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
-        problemClassComboBox.SelectedItem = Administrator.Instance.ProblemClasses.FirstOrDefault(a => a.Id == Content.ProblemClassId);
+        platformComboBox.SelectedItem = OKB.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
+        problemClassComboBox.SelectedItem = OKB.Instance.ProblemClasses.FirstOrDefault(a => a.Id == Content.ProblemClassId);
         problemDataView.ProblemId = Content.Id;
       }
@@ -77 +77 @@
           break;
         case "PlatformId":
-          platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
+          platformComboBox.SelectedItem = OKB.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
           break;
         case "ProblemClassId":
-          problemClassComboBox.SelectedItem = Administrator.Instance.ProblemClasses.FirstOrDefault(a => a.Id == Content.ProblemClassId);
+          problemClassComboBox.SelectedItem = OKB.Instance.ProblemClasses.FirstOrDefault(a => a.Id == Content.ProblemClassId);
           break;
       }
@@ -99 +99 @@
 
     private void refreshUsersButton_Click(object sender, System.EventArgs e) {
-      Guid[] ids = Administrator.Instance.GetProblemUsers(Content.Id);
+      Guid[] ids = OKB.Instance.GetProblemUsers(Content.Id);
       if (ids != null) {
-        List<User> users = Administrator.Instance.Users.ToList();
+        List<User> users = OKB.Instance.Users.ToList();
         usersListBox.DataSource = users;
         usersListBox.DisplayMember = "Name";
@@ -112 +112 @@
     }
     private void storeUsersButton_Click(object sender, System.EventArgs e) {
-      if (Administrator.Instance.UpdateProblemUsers(Content.Id, usersListBox.SelectedItems.Cast<User>().Select(u => u.Id).ToArray()))
+      if (OKB.Instance.UpdateProblemUsers(Content.Id, usersListBox.SelectedItems.Cast<User>().Select(u => u.Id).ToArray()))
         storeUsersButton.Enabled = false;
     }