Changeset 8331 for branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.Views

Timestamp:

07/26/12 09:51:13 (12 years ago)

Author:

jkarder

Message:

#1331: merged r8086:8330 from trunk

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs (modified) (7 diffs)
• HeuristicLab.Clients.Hive.Views/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Clients.Hive.Views/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartListView.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive.Views/3.3/TreeView/HiveTaskItemTreeView.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Views/3.3/TreeView/ItemTreeView.cs (modified) (2 diffs)

branches/ScatterSearch (trunk integration)

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs

@@ -31 +31 @@
   [Content(typeof(OptimizerHiveTask), true)]
   public partial class OptimizerHiveTaskView : HiveTaskView {
+    private Progress progress;
     private ProgressView progressView;
 
@@ -44 +45 @@
     public OptimizerHiveTaskView() {
       InitializeComponent();
+      progress = new Progress() {
+        CanBeCanceled = false,
+        ProgressState = ProgressState.Finished
+      };
     }
 
@@ -57 +62 @@
       base.RegisterContentEvents();
       Content.IsControllableChanged += new EventHandler(Content_IsControllableChanged);
+      progressView = new ProgressView(this, progress);
     }
 
     protected override void DeregisterContentEvents() {
       Content.IsControllableChanged -= new EventHandler(Content_IsControllableChanged);
+      if (progressView != null) {
+        progressView.Content = null;
+        progressView.Dispose();
+        progressView = null;
+      }
       base.DeregisterContentEvents();
     }
@@ -74 +85 @@
       var task = System.Threading.Tasks.Task.Factory.StartNew(ResumeTaskAsync);
       task.ContinueWith((t) => {
-        FinishProgressView();
+        progress.Finish();
         ErrorHandling.ShowErrorDialog(this, "An error occured while resuming the task.", t.Exception);
       }, TaskContinuationOptions.OnlyOnFaulted);
@@ -82 +93 @@
       var task = System.Threading.Tasks.Task.Factory.StartNew(PauseTaskAsync);
       task.ContinueWith((t) => {
-        FinishProgressView();
+        progress.Finish();
         ErrorHandling.ShowErrorDialog(this, "An error occured while pausing the task.", t.Exception);
       }, TaskContinuationOptions.OnlyOnFaulted);
@@ -90 +101 @@
       var task = System.Threading.Tasks.Task.Factory.StartNew(StopTaskAsync);
       task.ContinueWith((t) => {
-        FinishProgressView();
+        progress.Finish();
         ErrorHandling.ShowErrorDialog(this, "An error occured while stopping the task.", t.Exception);
       }, TaskContinuationOptions.OnlyOnFaulted);
@@ -97 +108 @@
 
     private void PauseTaskAsync() {
-      IProgress prog = new Progress();
-      prog.Status = "Pausing task. Please be patient for the command to take effect.";
-      SetProgressView(prog);
+      progress.Status = "Pausing task. Please be patient for the command to take effect.";
+      progress.ProgressState = ProgressState.Started;
       Content.Pause();
-      FinishProgressView();
+      progress.Finish();
     }
 
     private void StopTaskAsync() {
-      IProgress prog = new Progress();
-      prog.Status = "Stopping task. Please be patient for the command to take effect.";
-      SetProgressView(prog);
+      progress.Status = "Stopping task. Please be patient for the command to take effect.";
+      progress.ProgressState = ProgressState.Started;
       Content.Stop();
-      FinishProgressView();
+      progress.Finish();
     }
 
     private void ResumeTaskAsync() {
-      IProgress prog = new Progress();
-      prog.Status = "Resuming task. Please be patient for the command to take effect.";
-      SetProgressView(prog);
+      progress.Status = "Resuming task. Please be patient for the command to take effect.";
+      progress.ProgressState = ProgressState.Started;
       Content.Restart();
-      FinishProgressView();
-    }
-
-    private void SetProgressView(IProgress progress) {
-      if (InvokeRequired) {
-        Invoke(new Action<IProgress>(SetProgressView), progress);
-      } else {
-        if (progressView == null) {
-          progressView = new ProgressView(this, progress);
-        } else {
-          progressView.Progress = progress;
-        }
-      }
-    }
-
-    private void FinishProgressView() {
-      if (InvokeRequired) {
-        Invoke(new Action(FinishProgressView));
-      } else {
-        if (progressView != null) {
-          progressView.Finish();
-          progressView = null;
-          SetEnabledStateOfControls();
-        }
-      }
+      progress.Finish();
     }
 

branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.Views/3.3/Plugin.cs.frame

@@ -27 +27 @@
 
 namespace HeuristicLab.Clients.Hive.Views {
-  [Plugin("HeuristicLab.Clients.Hive.Views", "3.3.6.$WCREV$")]
+  [Plugin("HeuristicLab.Clients.Hive.Views", "3.3.7.$WCREV$")]
   [PluginFile("HeuristicLab.Clients.Hive.Views-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Clients.Hive", "3.3")]

branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.Views/3.3/Properties/AssemblyInfo.cs.frame

@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartListView.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using System.Windows.Forms;
+using System.Windows.Forms.DataVisualization.Charting;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -31 +34 @@
   [Content(typeof(StateLogListList), true)]
   public sealed partial class StateLogGanttChartListView : ItemView {
+    private IList<LegendItem> invisibleLegendItems;
+
     public new StateLogListList Content {
       get { return (StateLogListList)base.Content; }
@@ -38 +43 @@
     public StateLogGanttChartListView() {
       InitializeComponent();
+      invisibleLegendItems = new List<LegendItem>();
     }
 
     protected override void DeregisterContentEvents() {
       // Deregister your event handlers here
+      ganttChart.chart.MouseMove -= new System.Windows.Forms.MouseEventHandler(chart_MouseDown);
+      ganttChart.chart.MouseDown -= new System.Windows.Forms.MouseEventHandler(chart_MouseDown);
+      ganttChart.chart.CustomizeLegend -= new EventHandler<CustomizeLegendEventArgs>(chart_CustomizeLegend);
       base.DeregisterContentEvents();
     }
@@ -48 +57 @@
       base.RegisterContentEvents();
       // Register your event handlers here
+      ganttChart.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(chart_MouseMove);
+      ganttChart.chart.MouseDown += new System.Windows.Forms.MouseEventHandler(chart_MouseDown);
+      ganttChart.chart.CustomizeLegend += new EventHandler<CustomizeLegendEventArgs>(chart_CustomizeLegend);
     }
 
@@ -75 +87 @@
           for (int i = Content.Count - 1; i >= 0; i--) {
             for (int j = 0; j < Content[i].Count - 1; j++) {
-              if (Content[i][j].State != TaskState.Offline)
+              if (Content[i][j].State != TaskState.Offline && invisibleLegendItems.All(x => x.Name != Content[i][j].State.ToString()))
                 AddData(ganttChart, i.ToString(), Content[i][j], Content[i][j + 1], upperLimit);
             }
-            if (Content[i].Count > 0) {
+            if (Content[i].Count > 0 && invisibleLegendItems.All(x => x.Name != Content[i][Content[i].Count - 1].State.ToString())) {
               AddData(ganttChart, i.ToString(), Content[i][Content[i].Count - 1], null, upperLimit);
             }
@@ -113 +125 @@
       base.SetEnabledStateOfControls();
     }
+
+    #region Events
+    void chart_MouseMove(object sender, System.Windows.Forms.MouseEventArgs e) {
+      HitTestResult result = ganttChart.chart.HitTest(e.X, e.Y);
+      if (result.ChartElementType == ChartElementType.LegendItem)
+        Cursor = Cursors.Hand;
+      else
+        Cursor = Cursors.Default;
+    }
+
+    private void chart_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e) {
+      HitTestResult result = ganttChart.chart.HitTest(e.X, e.Y);
+      if (result.ChartElementType == ChartElementType.LegendItem)
+        ToggleLegendItemVisibility(result.Object as LegendItem);
+      ganttChart.Reset();
+      OnContentChanged();
+    }
+
+    private void chart_CustomizeLegend(object sender, CustomizeLegendEventArgs e) {
+      foreach (var item in e.LegendItems)
+        foreach (var cell in item.Cells)
+          cell.ForeColor = invisibleLegendItems.Any(x => x.Name == item.Name) ? Color.Gray : Color.Black;
+    }
+    #endregion
+
+    #region Helpers
+    private void ToggleLegendItemVisibility(LegendItem legendItem) {
+      var item = invisibleLegendItems.FirstOrDefault(x => x.Name == legendItem.Name);
+      if (item != null) invisibleLegendItems.Remove(item);
+      else invisibleLegendItems.Add(legendItem);
+    }
+    #endregion
   }
 }

branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.Views/3.3/TreeView/HiveTaskItemTreeView.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
@@ -42 +41 @@
     }
 
-    #region Register Content Events
-    protected override void DeregisterContentEvents() {
-      // TODO: Deregister your event handlers on the Content here
-      base.DeregisterContentEvents();
-    }
-    protected override void RegisterContentEvents() {
-      base.RegisterContentEvents();
-      // TODO: Register your event handlers on the Content here
-    }
-    #endregion
-
-    protected override void OnContentChanged() {
-      base.OnContentChanged();
-      if (Content == null) {
-        // TODO: Put code here when content is null
-      } else {
-        // TODO: Put code here when content has been changed and is not null
-      }
-    }
-
-    protected override void SetEnabledStateOfControls() {
-      base.SetEnabledStateOfControls();
-      // TODO: Put code here to enable or disable controls based on whether the Content is/not null or the view is ReadOnly
-    }
-
-    #region Event Handlers
-    // TODO: Put event handlers here
-    #endregion
-
-    #region Child Control Events
-    protected override void addButton_Click(object sender, EventArgs e) {
+    protected override void AddItem() {
       IOptimizer optimizer = CreateItem<IOptimizer>();
       if (optimizer != null) {
@@ -88 +57 @@
     }
 
-    protected override void removeButton_Click(object sender, EventArgs e) {
-      base.removeButton_Click(sender, e);
-
-      if (treeView.SelectedNode != null) {
-        var selectedItem = (HiveTask)treeView.SelectedNode.Tag;
-        var parentItem = GetParentItem(selectedItem);
-        if (parentItem == null) {
-          Content.Remove((HiveTask)treeView.SelectedNode.Tag);
-        } else {
-          var experiment = parentItem.ItemTask.Item as Experiment;
-          if (experiment != null) {
-            experiment.Optimizers.Remove(((OptimizerTask)selectedItem.ItemTask).Item);
-          }
+    protected override void RemoveItem(HiveTask item) {
+      var parentItem = GetParentItem(item);
+      if (parentItem == null) {
+        Content.Remove(item);
+      } else {
+        var experiment = parentItem.ItemTask.Item as Experiment;
+        if (experiment != null) {
+          experiment.Optimizers.Remove(((OptimizerTask)item.ItemTask).Item);
         }
       }
     }
-    #endregion
 
     protected override ICollection<IItemTreeNodeAction<HiveTask>> GetTreeNodeItemActions(HiveTask selectedItem) {

branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.Views/3.3/TreeView/ItemTreeView.cs

@@ -36 +36 @@
   [View("ItemTree View")]
   [Content(typeof(ItemCollection<>), IsDefaultView = false)]
-  public partial class ItemTreeView<T> : ItemView where T : class, IItemTree<T> {
+  public abstract partial class ItemTreeView<T> : ItemView where T : class, IItemTree<T> {
     public new ItemCollection<T> Content {
       get { return (ItemCollection<T>)base.Content; }
@@ -360 +360 @@
 
     protected virtual void addButton_Click(object sender, EventArgs e) {
-      T item = CreateItem<T>();
-      if (item != null)
-        Content.Add(item);
+      AddItem();
     }
 
     protected virtual void removeButton_Click(object sender, EventArgs e) {
       if (treeView.SelectedNode != null) {
+        RemoveItem(treeView.SelectedNode.Tag as T);
         detailsViewHost.Content = null;
       }
     }
+
+    protected abstract void AddItem();
+
+    protected abstract void RemoveItem(T item);
 
     protected virtual void showDetailsCheckBox_CheckedChanged(object sender, EventArgs e) {

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll