Changeset 2311 for trunk

Timestamp:

08/26/09 11:35:26 (15 years ago)

Author:

mkommend

Message:

• implemented GetVariableValues in dataset
• added row number in rowheaders of dataset view

(ticket #726)

Location:

trunk/sources/HeuristicLab.DataAnalysis/3.2

Files:

• Dataset.cs (modified) (1 diff)
• DatasetView.cs (modified) (4 diffs)
• DatasetView.designer.cs (modified) (5 diffs)

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

@@ -147 +147 @@
       }
       throw new ArgumentException("The variable name " + variableName + " was not found.");
+    }
+
+    public double[] GetVariableValues(int variableIndex, int start, int end) {
+      if (start < 0 || !(start <= end))
+        throw new ArgumentException("Start must be between 0 and end (" + end + ").");
+      if (end > rows || end < start)
+        throw new ArgumentException("End must be between start (" + start + ") and dataset rows (" + rows + ").");
+
+      double[] values = new double[end - start];
+      for (int i = 0; i < end - start; i++)
+        values[i] = GetValue(i + start, variableIndex);
+      return values;
+    }
+
+    public double[] GetVariableValues(int variableIndex) {
+      return GetVariableValues(variableIndex, 0, this.rows);
+    }
+
+    public double[] GetVariableValues(string variableName, int start, int end) {
+      return GetVariableValues(GetVariableIndex(variableName), start, end);
+    }
+
+    public double[] GetVariableValues(string variableName) {
+      return GetVariableValues(variableName, 0, this.rows);
     }
 

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

@@ -69 +69 @@
         // have been updated (and their SortMode set to 'NotSortable') we switch back to SelectionMode=ColumnHeaderSelect.
         dataGridView.SelectionMode = DataGridViewSelectionMode.CellSelect;
-        dataGridView.RowHeadersWidthSizeMode = DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+        //dataGridView.RowHeadersWidthSizeMode = DataGridViewRowHeadersWidthSizeMode.DisableResizing;
         int rows = Dataset.Rows;
         int columns = Dataset.Columns;
@@ -90 +90 @@
         }
         dataGridView.SelectionMode = DataGridViewSelectionMode.ColumnHeaderSelect; // switch back to column selection
-        dataGridView.RowHeadersWidthSizeMode = DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders;
+        //dataGridView.RowHeadersWidthSizeMode = DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders;
       } else {
         rowsTextBox.Text = "1";
@@ -97 +97 @@
         dataGridView.RowCount = 1;
       }
+      UpdateRowHeaders();
+      this.dataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.DisplayedCells);
+    }
+
+    private void UpdateRowHeaders() {
+      for (int i = dataGridView.FirstDisplayedScrollingRowIndex; i < dataGridView.FirstDisplayedScrollingRowIndex + dataGridView.DisplayedRowCount(true); i++)
+        dataGridView.Rows[i].HeaderCell.Value = i.ToString();
+      this.dataGridView.AutoResizeRowHeadersWidth(DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders);
+      dataGridView.Invalidate();
+    }
+
+    private void dataGridView_Scroll(object sender, ScrollEventArgs e) {
+      UpdateRowHeaders();
+    }
+
+    private void dataGridView_Resize(object sender, EventArgs e) {
+      UpdateRowHeaders();
     }
 
@@ -175 +192 @@
       Refresh();
     }
+
+  
   }
 }

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

@@ -100 +100 @@
       this.dataGridView.Size = new System.Drawing.Size(554, 485);
       this.dataGridView.TabIndex = 3;
+      this.dataGridView.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dataGridView_Scroll);
       this.dataGridView.CellValidating += new System.Windows.Forms.DataGridViewCellValidatingEventHandler(this.dataGridView_CellValidating);
+      this.dataGridView.Resize += new System.EventHandler(this.dataGridView_Resize);
       // 
       // contextMenuStrip
@@ -110 +112 @@
             this.originalValuesToolStripMenuItem});
       this.contextMenuStrip.Name = "contextMenuStrip";
-      this.contextMenuStrip.Size = new System.Drawing.Size(187, 92);
+      this.contextMenuStrip.Size = new System.Drawing.Size(198, 92);
       // 
       // scaleValuesToolStripMenuItem
       // 
       this.scaleValuesToolStripMenuItem.Name = "scaleValuesToolStripMenuItem";
-      this.scaleValuesToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+      this.scaleValuesToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
       this.scaleValuesToolStripMenuItem.Text = "Scale values [0..1]";
       this.scaleValuesToolStripMenuItem.Click += new System.EventHandler(this.scaleValuesToolStripMenuItem_Click);
@@ -122 +124 @@
       // 
       this.scaleValuesmanuallyToolStripMenuItem.Name = "scaleValuesmanuallyToolStripMenuItem";
-      this.scaleValuesmanuallyToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+      this.scaleValuesmanuallyToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
       this.scaleValuesmanuallyToolStripMenuItem.Text = "Scale values (manually)";
       this.scaleValuesmanuallyToolStripMenuItem.Click += new System.EventHandler(this.scaleValuesmanuallyToolStripMenuItem_Click);
@@ -129 +131 @@
       // 
       this.showScalingToolStripMenuItem.Name = "showScalingToolStripMenuItem";
-      this.showScalingToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+      this.showScalingToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
       this.showScalingToolStripMenuItem.Text = "Show scaling...";
       this.showScalingToolStripMenuItem.Click += new System.EventHandler(this.showScalingToolStripMenuItem_Click);
@@ -136 +138 @@
       // 
       this.originalValuesToolStripMenuItem.Name = "originalValuesToolStripMenuItem";
-      this.originalValuesToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+      this.originalValuesToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
       this.originalValuesToolStripMenuItem.Text = "Unscale values";
       this.originalValuesToolStripMenuItem.Click += new System.EventHandler(this.originalValuesToolStripMenuItem_Click);