Changeset 168

Timestamp:

04/23/08 00:35:19 (17 years ago)

Author:

gkronber

Message:

fixed #118

Location:

trunk/sources

Files:

• HeuristicLab.DataAnalysis/DatasetView.cs (modified) (5 diffs)
• HeuristicLab.StructureIdentification/StructIdProblemInjectorView.Designer.cs (modified) (10 diffs)
• HeuristicLab.StructureIdentification/StructIdProblemInjectorView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.DataAnalysis/DatasetView.cs

@@ -33 +33 @@
       set {
         Item = value;
-        Item.Changed += new EventHandler(Item_Changed);
+        Refresh();
       }
     }
 
-    void Item_Changed(object sender, EventArgs e) {
-      Refresh();
-    }
-
-    public DatasetView() : base() {
+    public DatasetView()
+      : base() {
       InitializeComponent();
       openFileDialog = new OpenFileDialog();
     }
 
-    public DatasetView(Dataset dataset) :this() {
+    public DatasetView(Dataset dataset)
+      : this() {
       this.Dataset = dataset;
     }
@@ -52 +50 @@
     protected override void UpdateControls() {
       base.UpdateControls();
-      if(Dataset != null) {
+      if (Dataset != null) {
         int rows = Dataset.Rows;
         int columns = Dataset.Columns;
-
         nameTextBox.Text = Dataset.Name;
         rowsTextBox.Text = rows + "";
@@ -61 +58 @@
         dataGridView.ColumnCount = columns;
         dataGridView.RowCount = rows;
-        for(int i = 0; i < rows; i++) {
-          for(int j = 0; j < columns; j++) {
+        for (int i = 0; i < rows; i++) {
+          for (int j = 0; j < columns; j++) {
             dataGridView.Rows[i].Cells[j].Value = Dataset.GetValue(i, j);
           }
@@ -85 +82 @@
 
     private void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
-      if(ValidateData((string)e.FormattedValue)) {
+      if (ValidateData((string)e.FormattedValue)) {
         SetArrayElement(e.RowIndex, e.ColumnIndex, (string)e.FormattedValue);
         e.Cancel = false;
@@ -97 +94 @@
       double result;
       double.TryParse(element, out result);
-      if(result != Dataset.GetValue(row, column)) {
+      if (result != Dataset.GetValue(row, column)) {
         Dataset.SetValue(row, column, result);
         Dataset.FireChanged();

trunk/sources/HeuristicLab.StructureIdentification/StructIdProblemInjectorView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.nameLabel = new System.Windows.Forms.Label();
-      this.nameTextBox = new System.Windows.Forms.TextBox();
       this.importInstanceButton = new System.Windows.Forms.Button();
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
       this.tabControl = new System.Windows.Forms.TabControl();
       this.dataTabPage = new System.Windows.Forms.TabPage();
-      this.variablesLabel = new System.Windows.Forms.Label();
-      this.variablesTextBox = new System.Windows.Forms.TextBox();
-      this.samplesLabel = new System.Windows.Forms.Label();
-      this.samplesTextBox = new System.Windows.Forms.TextBox();
       this.variableInfosTabPage = new System.Windows.Forms.TabPage();
       this.operatorBaseVariableInfosView = new HeuristicLab.Core.OperatorBaseVariableInfosView();
       this.descriptionTabPage = new System.Windows.Forms.TabPage();
       this.operatorBaseDescriptionView = new HeuristicLab.Core.OperatorBaseDescriptionView();
+      this.datasetView = new HeuristicLab.DataAnalysis.DatasetView();
       this.tabControl.SuspendLayout();
       this.dataTabPage.SuspendLayout();
@@ -65 +60 @@
       this.SuspendLayout();
       // 
-      // nameLabel
-      // 
-      this.nameLabel.Anchor = System.Windows.Forms.AnchorStyles.Left;
-      this.nameLabel.AutoSize = true;
-      this.nameLabel.Location = new System.Drawing.Point(6, 9);
-      this.nameLabel.Name = "nameLabel";
-      this.nameLabel.Size = new System.Drawing.Size(38, 13);
-      this.nameLabel.TabIndex = 0;
-      this.nameLabel.Text = "Name:";
-      // 
-      // nameTextBox
-      // 
-      this.nameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-      this.nameTextBox.Location = new System.Drawing.Point(62, 6);
-      this.nameTextBox.Name = "nameTextBox";
-      this.nameTextBox.ReadOnly = true;
-      this.nameTextBox.Size = new System.Drawing.Size(166, 20);
-      this.nameTextBox.TabIndex = 1;
-      // 
       // importInstanceButton
       // 
-      this.importInstanceButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-      this.importInstanceButton.Location = new System.Drawing.Point(6, 105);
+      this.importInstanceButton.Location = new System.Drawing.Point(6, 6);
       this.importInstanceButton.Name = "importInstanceButton";
-      this.importInstanceButton.Size = new System.Drawing.Size(256, 21);
+      this.importInstanceButton.Size = new System.Drawing.Size(129, 21);
       this.importInstanceButton.TabIndex = 6;
       this.importInstanceButton.Text = "&Import...";
@@ -111 +86 @@
       this.tabControl.Name = "tabControl";
       this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(276, 184);
+      this.tabControl.Size = new System.Drawing.Size(507, 451);
       this.tabControl.TabIndex = 0;
       // 
       // dataTabPage
       // 
-      this.dataTabPage.Controls.Add(this.variablesLabel);
-      this.dataTabPage.Controls.Add(this.variablesTextBox);
-      this.dataTabPage.Controls.Add(this.samplesLabel);
-      this.dataTabPage.Controls.Add(this.samplesTextBox);
-      this.dataTabPage.Controls.Add(this.nameLabel);
+      this.dataTabPage.Controls.Add(this.datasetView);
       this.dataTabPage.Controls.Add(this.importInstanceButton);
-      this.dataTabPage.Controls.Add(this.nameTextBox);
       this.dataTabPage.Location = new System.Drawing.Point(4, 22);
       this.dataTabPage.Name = "dataTabPage";
       this.dataTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.dataTabPage.Size = new System.Drawing.Size(268, 158);
+      this.dataTabPage.Size = new System.Drawing.Size(499, 425);
       this.dataTabPage.TabIndex = 0;
       this.dataTabPage.Text = "Data";
       this.dataTabPage.UseVisualStyleBackColor = true;
-      // 
-      // variablesLabel
-      // 
-      this.variablesLabel.Anchor = System.Windows.Forms.AnchorStyles.Left;
-      this.variablesLabel.AutoSize = true;
-      this.variablesLabel.Location = new System.Drawing.Point(6, 61);
-      this.variablesLabel.Name = "variablesLabel";
-      this.variablesLabel.Size = new System.Drawing.Size(53, 13);
-      this.variablesLabel.TabIndex = 9;
-      this.variablesLabel.Text = "Variables:";
-      // 
-      // variablesTextBox
-      // 
-      this.variablesTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-      this.variablesTextBox.Location = new System.Drawing.Point(62, 58);
-      this.variablesTextBox.Name = "variablesTextBox";
-      this.variablesTextBox.ReadOnly = true;
-      this.variablesTextBox.Size = new System.Drawing.Size(81, 20);
-      this.variablesTextBox.TabIndex = 10;
-      // 
-      // samplesLabel
-      // 
-      this.samplesLabel.Anchor = System.Windows.Forms.AnchorStyles.Left;
-      this.samplesLabel.AutoSize = true;
-      this.samplesLabel.Location = new System.Drawing.Point(6, 35);
-      this.samplesLabel.Name = "samplesLabel";
-      this.samplesLabel.Size = new System.Drawing.Size(50, 13);
-      this.samplesLabel.TabIndex = 7;
-      this.samplesLabel.Text = "Samples:";
-      // 
-      // samplesTextBox
-      // 
-      this.samplesTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-      this.samplesTextBox.Location = new System.Drawing.Point(62, 32);
-      this.samplesTextBox.Name = "samplesTextBox";
-      this.samplesTextBox.ReadOnly = true;
-      this.samplesTextBox.Size = new System.Drawing.Size(81, 20);
-      this.samplesTextBox.TabIndex = 8;
       // 
       // variableInfosTabPage
@@ -175 +107 @@
       this.variableInfosTabPage.Name = "variableInfosTabPage";
       this.variableInfosTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.variableInfosTabPage.Size = new System.Drawing.Size(268, 158);
+      this.variableInfosTabPage.Size = new System.Drawing.Size(499, 425);
       this.variableInfosTabPage.TabIndex = 1;
       this.variableInfosTabPage.Text = "Variable Infos";
@@ -187 +119 @@
       this.operatorBaseVariableInfosView.Name = "operatorBaseVariableInfosView";
       this.operatorBaseVariableInfosView.Operator = null;
-      this.operatorBaseVariableInfosView.Size = new System.Drawing.Size(262, 152);
+      this.operatorBaseVariableInfosView.Size = new System.Drawing.Size(493, 419);
       this.operatorBaseVariableInfosView.TabIndex = 0;
       // 
@@ -196 +128 @@
       this.descriptionTabPage.Name = "descriptionTabPage";
       this.descriptionTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.descriptionTabPage.Size = new System.Drawing.Size(268, 158);
+      this.descriptionTabPage.Size = new System.Drawing.Size(499, 425);
       this.descriptionTabPage.TabIndex = 2;
       this.descriptionTabPage.Text = "Description";
@@ -208 +140 @@
       this.operatorBaseDescriptionView.Name = "operatorBaseDescriptionView";
       this.operatorBaseDescriptionView.Operator = null;
-      this.operatorBaseDescriptionView.Size = new System.Drawing.Size(262, 152);
+      this.operatorBaseDescriptionView.Size = new System.Drawing.Size(493, 419);
       this.operatorBaseDescriptionView.TabIndex = 0;
+      // 
+      // datasetView
+      // 
+      this.datasetView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.datasetView.Caption = "View";
+      this.datasetView.Location = new System.Drawing.Point(6, 33);
+      this.datasetView.Name = "datasetView";
+      this.datasetView.Size = new System.Drawing.Size(487, 386);
+      this.datasetView.TabIndex = 7;
       // 
       // StructIdProblemInjectorView
@@ -217 +160 @@
       this.Controls.Add(this.tabControl);
       this.Name = "StructIdProblemInjectorView";
-      this.Size = new System.Drawing.Size(276, 184);
+      this.Size = new System.Drawing.Size(507, 451);
       this.tabControl.ResumeLayout(false);
       this.dataTabPage.ResumeLayout(false);
-      this.dataTabPage.PerformLayout();
       this.variableInfosTabPage.ResumeLayout(false);
       this.descriptionTabPage.ResumeLayout(false);
@@ -229 +171 @@
     #endregion
 
-    private System.Windows.Forms.Label nameLabel;
-    private System.Windows.Forms.TextBox nameTextBox;
     private System.Windows.Forms.Button importInstanceButton;
     private System.Windows.Forms.OpenFileDialog openFileDialog;
@@ -239 +179 @@
     private System.Windows.Forms.TabPage descriptionTabPage;
     private HeuristicLab.Core.OperatorBaseDescriptionView operatorBaseDescriptionView;
-    private System.Windows.Forms.Label variablesLabel;
-    private System.Windows.Forms.TextBox variablesTextBox;
-    private System.Windows.Forms.Label samplesLabel;
-    private System.Windows.Forms.TextBox samplesTextBox;
+    private HeuristicLab.DataAnalysis.DatasetView datasetView;
   }
 }

trunk/sources/HeuristicLab.StructureIdentification/StructIdProblemInjectorView.cs

@@ -61 +61 @@
       base.UpdateControls();
       if (StructIdProblemInjector == null) {
-        nameTextBox.Text = "-";
-        variablesTextBox.Text = "-";
-        samplesTextBox.Text = "-";
         importInstanceButton.Enabled = false;
       } else {
         Dataset dataset = (Dataset)StructIdProblemInjector.GetVariable("Dataset").Value;
-        nameTextBox.Text = dataset.Name;
-        samplesTextBox.Text = dataset.Rows+"";
-        variablesTextBox.Text = dataset.Columns+"";
+        datasetView.Dataset = dataset;
         importInstanceButton.Enabled = true;
       }