Changeset 6482 for branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding.Views/3.3

Timestamp:

06/27/11 15:51:15 (13 years ago)

Author:

jhelm

Message:

#1329: Applied some changes to the ScheduleView. Added TaskNr properties to ScheduledTask to make specific selection of tasks in the view possible.

Location:

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding.Views/3.3

Files:

• . (modified) (1 prop)
• GanttChart.cs (modified) (5 diffs)
• HeuristicLab.Encodings.ScheduleEncoding.Views-3.3.csproj (modified) (1 diff)
• JobDataPoint.cs (added)
• Plugin.cs (deleted)
• Properties (modified) (1 prop)
• Properties/AssemblyInfo.cs (deleted)
• ScheduleView.Designer.cs (modified) (1 diff)
• ScheduleView.cs (modified) (3 diffs)

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding.Views/3.3

@@ -1 +1 @@
 HeuristicLab.Encodings.ScheduleEncoding.Views-3.3.csproj.user
+Plugin.cs
 bin
 obj

@@ -1 +1 @@
 HeuristicLab.Encodings.ScheduleEncoding.Views-3.3.csproj.user
+Plugin.cs
 bin
 obj

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/GanttChart.cs

@@ -11 +11 @@
     private IDictionary<int, Color> jobColors = new SortedDictionary<int, Color>();
     private IDictionary<string, int> rowNames = new Dictionary<string, int>();
-    
+
 
     public GanttChart() {
@@ -21 +21 @@
       if (!jobColors.ContainsKey(jobNr)) {
         Random r = new Random(jobNr + 1);
-        jobColors[jobNr] = Color.FromArgb (r.Next(256),r.Next(256),r.Next(256));
+        jobColors[jobNr] = Color.FromArgb(r.Next(256), r.Next(256), r.Next(256));
         chart.Legends[0].CustomItems.Clear();
         if (jobColors.Count > 1) {
@@ -28 +28 @@
             chart.Legends[0].CustomItems.Add(c, "Job#" + (i++));
           }
-        }   
+        }
       }
     }
@@ -39 +39 @@
     }
 
-    public void AddData(string rowName, int jobNr, double start, double end, string tooltip, bool showLabel = true) {
+    public void AddData(string rowName, int jobNr, int taskNr, double start, double end, string tooltip, bool showLabel = true) {
       AddRowName(rowName);
-      var point = new DataPoint(rowNames[rowName], new double[] { start, end });
+      AddJobColor(jobNr);
+      JobDataPoint point = new JobDataPoint(rowNames[rowName], new double[] { start, end }, jobNr, taskNr);
       point.Color = jobColors[jobNr];
       point.AxisLabel = rowName;
@@ -56 +57 @@
 
     void chart_MouseClick(object sender, MouseEventArgs e) {
-      var pos = e.Location;
-      var results = chart.HitTest(pos.X, pos.Y, false, ChartElementType.DataPoint);
-      foreach (DataPoint dp in chart.Series[0].Points) {
-        Color newColor = Color.FromArgb(255, dp.Color);
-        dp.Color = newColor;
-      }
-      foreach (var result in results) {
-        if (result.ChartElementType == ChartElementType.DataPoint) {
-          Color currentColor = chart.Series[0].Points[result.PointIndex].Color;
-          foreach (DataPoint dp in result.Series.Points) {
-            if (dp.Color != currentColor) {
-              Color newColor = Color.FromArgb(0, dp.Color);
-              dp.Color = newColor;
-            }
-          }
+      Point pos = e.Location;
+      HitTestResult[] results = chart.HitTest(pos.X, pos.Y, false, ChartElementType.DataPoint);
+      ResetDataColors();
+
+      foreach (HitTestResult result in results) {
+        if (result.ChartElementType == ChartElementType.DataPoint && result.Object.GetType() == typeof(JobDataPoint)) {
+          int currentJobNr = (result.Object as JobDataPoint).JobNr;
+          int currentTaskNr = (result.Object as JobDataPoint).TaskNr;
+
+          HighlightTaskAndJob(currentJobNr, currentTaskNr);
         }
       }
     }
+
+    public void ResetDataColors() {
+      foreach (DataPoint dp in chart.Series[0].Points) {
+        if (dp.GetType() == typeof(JobDataPoint))
+          dp.Color = jobColors[(dp as JobDataPoint).JobNr];
+      }
+    }
+
+    public void HighlightTaskAndJob(int jobNr, int taskNr) {
+      foreach (DataPoint dp in chart.Series[0].Points) {
+        if (dp.GetType() == typeof(JobDataPoint) && ((dp as JobDataPoint).JobNr == jobNr) && ((dp as JobDataPoint).TaskNr == taskNr)) {
+          Color newColor = Color.FromArgb(255, dp.Color);
+          dp.Color = newColor;
+        } else if (dp.GetType() == typeof(JobDataPoint) && ((dp as JobDataPoint).JobNr == jobNr)) {
+          Color newColor = Color.FromArgb(180, dp.Color);
+          dp.Color = newColor;
+        } else if (dp.GetType() == typeof(JobDataPoint) && !((dp as JobDataPoint).JobNr == jobNr)) {
+          Color newColor = Color.FromArgb(0, dp.Color);
+          dp.Color = newColor;
+        }
+      }
+    }
+
   }
 }

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/HeuristicLab.Encodings.ScheduleEncoding.Views-3.3.csproj

@@ -56 +56 @@
       <DependentUpon>GanttChart.cs</DependentUpon>
     </Compile>
+    <Compile Include="JobDataPoint.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/ScheduleView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.ganttChart = new GanttChart();
+      this.ganttChart = new HeuristicLab.Encodings.ScheduleEncoding.Views.GanttChart();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/ScheduleView.cs

@@ -72 +72 @@
         foreach (ScheduledTask t in content.Resources[resCount].Tasks) {
           int categoryNr = 0;
-          string toolTip = "Task#";// +t.TaskNr;
+          string toolTip = "Task#" + t.TaskNr;
           string categoryName = "ScheduleTasks";
           if (t is ScheduledTask) {
@@ -79 +79 @@
             toolTip = categoryName + " - " + toolTip;
           }
-          ganttChart.AddJobColor(categoryNr);
           ganttChart.AddData("Resource" + r.Index,
             categoryNr,
+            t.TaskNr,
             t.StartTime,
             t.EndTime,
@@ -88 +88 @@
         resCount++;
       }
+    }
+
+    private void RefreshChartInformations(Schedule content) {
+
     }
 

@@ -1 +1 @@
 HeuristicLab.Encodings.ScheduleEncoding.Views-3.3.csproj.user
+Plugin.cs
 bin
 obj