Changeset 1390 for trunk/sources

Timestamp:

03/21/09 13:43:10 (16 years ago)

Author:

bspisic

Message:

Panning and zooming (#424) Implemented deactivating of YAxis clipping in OptionsDialog

Location:

trunk/sources

Files:

• HeuristicLab.Visualization.Test/LineChartTests.cs (modified) (1 diff)
• HeuristicLab.Visualization/LineChart.cs (modified) (2 diffs)
• HeuristicLab.Visualization/Options/OptionsDialog.cs (modified) (1 diff)
• HeuristicLab.Visualization/YAxisDescriptor.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Visualization.Test/LineChartTests.cs

@@ -100 +100 @@
       row3.Label = "Die Blaue";
       row3.YAxis = yaxis2;
+      row3.YAxis.Label = "Die Blaue";
 
       model.AddDataRow(row1);
       model.AddDataRow(row2);
       model.AddDataRow(row3);
+
+      row1.YAxis.Label = "Rot und Grün";
 
       Random rand = new Random(42);

trunk/sources/HeuristicLab.Visualization/LineChart.cs

@@ -443 +443 @@
 
       foreach (RowEntry rowEntry in rowEntries) {
-        clippingArea = Translate.ClippingArea(startPoint, endPoint, rowEntry.LinesShape.ClippingArea, rowEntry.LinesShape.Viewport);
-        SetClipY(rowEntry, clippingArea.Y1, clippingArea.Y2);
+        if (rowEntry.DataRow.YAxis.ClipChangeable) {
+          clippingArea = Translate.ClippingArea(startPoint, endPoint, rowEntry.LinesShape.ClippingArea, rowEntry.LinesShape.Viewport);
+          SetClipY(rowEntry, clippingArea.Y1, clippingArea.Y2);
+        }
       }
 
@@ -460 +462 @@
 
       foreach (RowEntry rowEntry in rowEntries) {
-        clippingArea = Transform.ToWorld(rectangle, rowEntry.LinesShape.Viewport, rowEntry.LinesShape.ClippingArea);
-
-        SetClipY(rowEntry, clippingArea.Y1, clippingArea.Y2);
+        if (rowEntry.DataRow.YAxis.ClipChangeable) {
+          clippingArea = Transform.ToWorld(rectangle, rowEntry.LinesShape.Viewport, rowEntry.LinesShape.ClippingArea);
+
+          SetClipY(rowEntry, clippingArea.Y1, clippingArea.Y2);
+        }
       }
 

trunk/sources/HeuristicLab.Visualization/Options/OptionsDialog.cs

@@ -106 +106 @@
         dataRowsFlowLayout.Controls.Add(chkbox);
       }
+
+      for (int i = 0; i < model.YAxes.Count; i++) {
+        YAxisDescriptor yAxisDescriptor = model.YAxes[i];
+
+        CheckBox chkbox = new CheckBox();
+        chkbox.Text = yAxisDescriptor.Label;
+        chkbox.Checked = yAxisDescriptor.ClipChangeable;
+        chkbox.CheckedChanged += delegate { yAxisDescriptor.ClipChangeable = chkbox.Checked; };
+
+        dataRowsFlowLayout.Controls.Add(chkbox);
+      }
     }
 

trunk/sources/HeuristicLab.Visualization/YAxisDescriptor.cs

@@ -11 +11 @@
     private bool showYAxis = true;
     private string label = "";
+    public bool ClipChangeable = true;
 
     public event YAxisDescriptorChangedHandler YAxisDescriptorChanged;
@@ -72 +73 @@
     }
 
+    public bool Zoom_ {
+      get { return ClipChangeable; }
+      set { ClipChangeable = value; }
+    }
+
     public void AddDataRow(IDataRow row) {
       if (row.YAxis != null) {