Changeset 2512

Timestamp:

11/19/09 16:21:15 (14 years ago)

Author:

mkommend

Message:

added null check in !datagridView_CellValueNeeded (ticket #4)

File:

• trunk/sources/HeuristicLab.DataAnalysis/3.2/DatasetView.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.DataAnalysis/3.2/DatasetView.cs

@@ -57 +57 @@
           Refresh();
         }));
-      }      
+      }
     }
 
@@ -126 +126 @@
 
     private void dataGridView_CellValueNeeded(object sender, DataGridViewCellValueEventArgs e) {
-      e.Value = Dataset.GetValue(e.RowIndex, e.ColumnIndex);
+      if (this.Dataset == null)
+        e.Value = null;
+      else
+        e.Value = Dataset.GetValue(e.RowIndex, e.ColumnIndex);
     }
 
@@ -143 +146 @@
 
     private void scaleValuesToolStripMenuItem_Click(object sender, EventArgs e) {
-      foreach(DataGridViewColumn column in dataGridView.SelectedColumns) {
+      foreach (DataGridViewColumn column in dataGridView.SelectedColumns) {
         Dataset.ScaleVariable(column.Index);
         column.Name = GetColumnName(column.Index) + " [scaled]";
@@ -151 +154 @@
 
     private void originalValuesToolStripMenuItem_Click(object sender, EventArgs e) {
-      foreach(DataGridViewColumn column in dataGridView.SelectedColumns) {
+      foreach (DataGridViewColumn column in dataGridView.SelectedColumns) {
         Dataset.UnscaleVariable(column.Index);
         column.Name = GetColumnName(column.Index);
       }
-      Refresh();      
+      Refresh();
     }
 
     private string GetColumnName(int index) {
-      if(Dataset.Columns == dataGridView.Columns.Count) {
+      if (Dataset.Columns == dataGridView.Columns.Count) {
         return Dataset.GetVariableName(index);
       } else {
@@ -169 +172 @@
       ManualScalingControl scalingControl = new ManualScalingControl(false);
       double[,] scalingParameters = new double[2, Dataset.Columns];
-      for(int i = 0; i < Dataset.Columns; i++) {
+      for (int i = 0; i < Dataset.Columns; i++) {
         scalingParameters[0, i] = Dataset.ScalingFactor[i];
         scalingParameters[1, i] = Dataset.ScalingOffset[i];
@@ -180 +183 @@
       ManualScalingControl scalingControl = new ManualScalingControl(true);
       double[,] scalingParameters = new double[2, Dataset.Columns];
-      for(int i = 0; i < Dataset.Columns; i++) {
+      for (int i = 0; i < Dataset.Columns; i++) {
         scalingParameters[0, i] = Dataset.ScalingFactor[i];
         scalingParameters[1, i] = Dataset.ScalingOffset[i];
       }
       scalingControl.Data = scalingParameters;
-      if(scalingControl.ShowDialog() == DialogResult.OK) {
-        for(int i = 0; i < Dataset.Columns; i++) {
+      if (scalingControl.ShowDialog() == DialogResult.OK) {
+        for (int i = 0; i < Dataset.Columns; i++) {
           Dataset.ScaleVariable(i, scalingControl.Data[0, i], scalingControl.Data[1, i]);
         }
@@ -193 +196 @@
     }
 
-  
+
   }
 }