Changeset 13753

Timestamp:

04/12/16 14:35:31 (9 years ago)

Author:

jkarder

Message:

#1265: worked on visualization

• brought back support for SnapToGrid methods
• updated license headers

Location:

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3

Files:

• Chart.cs (modified) (2 diffs)
• HeuristicLab.Visualization-3.3.csproj (modified) (1 diff)
• Interfaces/IChart.cs (modified) (1 diff)
• Interfaces/IDrawable.cs (added)
• Interfaces/IGrid.cs (modified) (1 diff)
• Interfaces/IPrimitive.cs (modified) (2 diffs)
• Plugin.cs.frame (modified) (1 diff)
• Primitives/Grid.cs (modified) (8 diffs)
• Properties/AssemblyInfo.frame (modified) (2 diffs)
• RenderStages/GridRenderStage.cs (modified) (1 diff)
• RenderStages/GroupRenderStage.cs (modified) (1 diff)

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Chart.cs

@@ -81 +81 @@
     public double MinimumZoomDistance { get; set; }
     public IGroup Group { get; protected set; }
+    public IGrid Grid { get; protected set; }
 
     public Chart(PointD lowerLeft, PointD upperRight) {
@@ -89 +90 @@
       Scale = 1.0;
       Group = new Group(this);
+      Grid = new Grid(this);
       renderStages = new List<RenderStage> {
         new BackgroundColorRenderStage(this),

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/HeuristicLab.Visualization-3.3.csproj

@@ -133 +133 @@
     <Compile Include="ChartModes\PanChartMode.cs" />
     <Compile Include="ChartModes\RulerChartMode.cs" />
+    <Compile Include="Interfaces\IDrawable.cs" />
     <Compile Include="PrimitiveAttribute.cs" />
     <Compile Include="Primitives\Grid.cs" />

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Interfaces/IChart.cs

@@ -37 +37 @@
     SizeD WorldToPixelRatio { get; }
     IGroup Group { get; }
+    IGrid Grid { get; }
 
     PointD TransformPixelToWorld(Point point);

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Interfaces/IGrid.cs

@@ -1 @@
-
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
 namespace HeuristicLab.Visualization {
-  public interface IGrid {
+  public interface IGrid : IDrawable {
     PointD Origin { get; set; }
     double XPrecision { get; }

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Interfaces/IPrimitive.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Visualization {
-  public interface IPrimitive {
+  public interface IPrimitive : IDrawable {
     Pen Pen { get; set; }
     Brush Brush { get; set; }
@@ -41 +41 @@
     Cursor GetCursor(PointD point);
     string GetToolTipText(PointD point);
-
-    void PreDraw(Graphics graphics);
-    void Draw(Graphics graphics);
-    void PostDraw(Graphics graphics);
-
-    event EventHandler RedrawRequired;
   }
 }

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Primitives/Grid.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Drawing;
 
@@ -7 +28 @@
 
     public virtual PointD Origin { get; set; }
-    public virtual PointD Offset { get; set; }
-    public virtual SizeD Size { get; set; }
-
     public virtual double XPrecision { get; set; }
     public virtual double YPrecision { get; set; }
@@ -33 +51 @@
     }
 
-    public Grid(IChart chart, PointD offset, SizeD size)
-      : this(chart, offset, size, 1) { }
-    public Grid(IChart chart, PointD offset, SizeD size, double precision)
-      : base(chart) {
+    public Grid(IChart chart) : this(chart, 1.0) { }
+    public Grid(IChart chart, double precision) : base(chart) {
       Origin = new PointD(0, 0);
-      Offset = offset;
-      Size = size;
       XPrecision = precision;
       YPrecision = precision;
@@ -48 +62 @@
     }
 
-    public override void Move(Offset delta) {
-      Offset += delta;
-    }
+    public override void Move(Offset delta) { }
 
-    public override void Move(PointD point, Offset delta) {
-      Move(delta);
-    }
+    public override void Move(PointD point, Offset delta) { }
 
     public override void SnapToGrid(IGrid grid) { }
@@ -61 +71 @@
 
     public override void Draw(Graphics graphics) {
-      if (!(Size.Width > 0) || !(Size.Height > 0)) return;
+      if (!(Chart.Size.Width > 0) || !(Chart.Size.Height > 0)) return;
       graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit;
       var pen = new Pen(Color.LightGray, 1.0f);
-      var pixelSize = Chart.TransformWorldToPixel(Size); // size of the drawing area in pixel coordinates
+      var pixelSize = Chart.TransformWorldToPixel(Chart.Size); // size of the drawing area in pixel coordinates
 
       var numberOfXParallelLines = (int)Math.Floor(pixelSize.Height / (double)CellSpacing); // how many x parallel lines can be drawn
       var numberOfYParallelLines = (int)Math.Floor(pixelSize.Width / (double)CellSpacing); // how many y parallel lines can be drawn
       if (numberOfXParallelLines <= 0 || numberOfYParallelLines <= 0) return;
-      var cellWorldSize = new SizeD(Size.Width / numberOfYParallelLines, Size.Height / numberOfXParallelLines); // the cellSize in world coordinates
+      var cellWorldSize = new SizeD(Chart.Size.Width / numberOfYParallelLines, Chart.Size.Height / numberOfXParallelLines); // the cellSize in world coordinates
       cellWorldSize.Width = Math.Pow(10, Math.Floor(Math.Log10(cellWorldSize.Width)));
       cellWorldSize.Height = Math.Pow(10, Math.Floor(Math.Log10(cellWorldSize.Width)));
@@ -81 +91 @@
         cellPixelSize = Chart.TransformWorldToPixel(cellWorldSize);
       }
-      var firstX = Math.Floor(Offset.X / cellWorldSize.Width) * cellWorldSize.Width;
-      var firstY = Math.Floor(Offset.Y / cellWorldSize.Height) * cellWorldSize.Height;
+      var firstX = Math.Floor(Chart.LowerLeft.X / cellWorldSize.Width) * cellWorldSize.Width;
+      var firstY = Math.Floor(Chart.LowerLeft.Y / cellWorldSize.Height) * cellWorldSize.Height;
       double x = firstX, y = firstY;
       var axisyLabel = new Font(FontFamily.GenericMonospace, 7.0f, FontStyle.Regular, GraphicsUnit.Point, 0);
@@ -88 +98 @@
       var axisDrawing = new SolidBrush(Color.DarkGray);
       try {
-        var bottom = Chart.TransformWorldToPixel(Size).Height;
-        while (x <= Offset.X + Size.Width) {
+        var bottom = Chart.TransformWorldToPixel(Chart.Size).Height;
+        while (x <= Chart.LowerLeft.X + Chart.Size.Width) {
           var start = Chart.TransformWorldToPixel(new PointD(x, firstY));
-          var end = Chart.TransformWorldToPixel(new PointD(x, Offset.Y + Size.Height));
+          var end = Chart.TransformWorldToPixel(new PointD(x, Chart.LowerLeft.Y + Chart.Size.Height));
           graphics.DrawLine(pen, start, end);
           var axis = x.ToString("0.##");
@@ -98 +108 @@
           x += cellWorldSize.Width;
         }
-        while (y <= Offset.Y + Size.Height) {
+        while (y <= Chart.LowerLeft.Y + Chart.Size.Height) {
           var start = Chart.TransformWorldToPixel(new PointD(firstX, y));
-          var end = Chart.TransformWorldToPixel(new PointD(Offset.X + Size.Width, y));
+          var end = Chart.TransformWorldToPixel(new PointD(Chart.LowerLeft.X + Chart.Size.Width, y));
           graphics.DrawLine(pen, start, end);
           graphics.DrawString(y.ToString("0.##"), axisxLabel, axisDrawing, 0, start.Y);

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Properties/AssemblyInfo.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2016 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/RenderStages/GridRenderStage.cs

@@ -27 +27 @@
 
     public override void Render(Graphics graphics) {
-      var grid = new Grid(chart, chart.LowerLeft, chart.Size);
-      grid.PreDraw(graphics);
-      grid.Draw(graphics);
-      grid.PostDraw(graphics);
+      if (chart.Grid == null) return;
+
+      chart.Grid.PreDraw(graphics);
+      chart.Grid.Draw(graphics);
+      chart.Grid.PostDraw(graphics);
     }
   }

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/RenderStages/GroupRenderStage.cs

@@ -27 +27 @@
 
     public override void Render(Graphics graphics) {
+      if (chart.Group == null) return;
+
       chart.Group.PreDraw(graphics);
       chart.Group.Draw(graphics);