Changeset 1608 for trunk/sources/HeuristicLab.Visualization/3.2/LineChart.cs

Timestamp:

04/18/09 14:41:09 (15 years ago)

Author:

bspisic

Message:

Model.Title bug fixed (#590)

File:

• trunk/sources/HeuristicLab.Visualization/3.2/LineChart.cs (modified) (12 diffs)

trunk/sources/HeuristicLab.Visualization/3.2/LineChart.cs

@@ -83 +83 @@
     private void UpdateLayout() {
       canvas.ClearShapes();
+
+      titleShape.Text = model.Title;
 
       foreach (YAxisDescriptor yAxisDescriptor in model.YAxes) {
@@ -249 +251 @@
     public void setLegendBottom() {
       // legend bottom
-      legendShape.BoundingBox = new RectangleD(100, 10, canvasUI.Width, canvasUI.Height/*legendShape.GetHeight4Rows()*/);
+      legendShape.BoundingBox = new RectangleD(100, 10, canvasUI.Width, canvasUI.Height /*legendShape.GetHeight4Rows()*/);
       legendShape.ClippingArea = new RectangleD(0, 0, legendShape.BoundingBox.Width, legendShape.BoundingBox.Height);
       legendShape.Row = true;
@@ -393 +395 @@
           LineShape lineShape = new LineShape(i - 1, row[i - 1], i, row[i], row.Color, row.Thickness, row.Style);
           rowEntry.LinesShape.AddShape(lineShape);
-          rowEntry.LinesShape.AddMarkerShape(new MarkerShape(i-1,row[i-1],8,row.Color));
-        }
-        if(row.Count>0)
+          rowEntry.LinesShape.AddMarkerShape(new MarkerShape(i - 1, row[i - 1], 8, row.Color));
+        }
+        if (row.Count > 0) {
           rowEntry.LinesShape.AddMarkerShape(new MarkerShape((row.Count - 1), row[(row.Count - 1)], 8, row.Color));
+        }
       }
 
@@ -410 +413 @@
                                                         row.Style);
           rowEntry.LinesShape.AddShape(lineShape);
-          
         } else {
           LineShape lineShape = rowEntry.LinesShape.GetShape(0);
@@ -417 +419 @@
         }
       } else {
-        if (index > rowEntry.LinesShape.Count + 1) {    //MarkersShape is on position zero
+        if (index > rowEntry.LinesShape.Count + 1) {
+          //MarkersShape is on position zero
           throw new NotImplementedException();
         }
@@ -429 +432 @@
             rowEntry.LinesShape.AddMarkerShape(new MarkerShape(index, row[index], 8, row.Color));
           }
-        } else if(action == Action.Modified){
+        } else if (action == Action.Modified) {
           // not the first value
           if (index > 0) {
             rowEntry.LinesShape.GetShape(index - 1).Y2 = value;
-            ((MarkerShape) rowEntry.LinesShape.markersShape.GetShape(index - 1)).Y = value;
+            ((MarkerShape)rowEntry.LinesShape.markersShape.GetShape(index - 1)).Y = value;
           }
 
@@ -439 +442 @@
           if (index > 0 && index < row.Count - 1) {
             rowEntry.LinesShape.GetShape(index).Y1 = value;
-            ((MarkerShape) rowEntry.LinesShape.markersShape.GetShape(index)).Y = value;
+            ((MarkerShape)rowEntry.LinesShape.markersShape.GetShape(index)).Y = value;
           }
         }
@@ -454 +457 @@
 
     private void OnModelChanged() {
-      titleShape.Text = model.Title;
-
       canvasUI.Invalidate();
     }
@@ -524 +525 @@
     }
 
-    private void canvasUI1_KeyDown(object sender, KeyEventArgs e) {
-    }
+    private void canvasUI1_KeyDown(object sender, KeyEventArgs e) {}
 
     private void canvasUI1_MouseDown(object sender, MouseEventArgs e) {
@@ -582 +582 @@
           world = Transform.ToWorld(e.Location, rowEntry.LinesShape.Viewport, rowEntry.LinesShape.ClippingArea);
 
-          double y1 = world.Y - (world.Y - rowEntry.LinesShape.ClippingArea.Y1) * zoomFactor;
+          double y1 = world.Y - (world.Y - rowEntry.LinesShape.ClippingArea.Y1)*zoomFactor;
           double y2 = world.Y + (rowEntry.LinesShape.ClippingArea.Y2 - world.Y)*zoomFactor;
 
@@ -631 +631 @@
 
       public LineShape GetShape(int index) {
-        return (LineShape)shapes[index];     //shapes[0] is markersShape!!
+        return (LineShape)shapes[index]; //shapes[0] is markersShape!!
       }
     }
@@ -658 +658 @@
     }
 
-    private class YAxisInfo { 
+    private class YAxisInfo {
       private readonly Grid grid = new Grid();
       private readonly YAxis yAxis = new YAxis();