Changeset 16544 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views

Timestamp:

01/22/19 09:15:40 (5 years ago)

Author:

chaider

Message:

#2971

• Added editorconfig
• Added Getter for intervals in NamedIntervals class
• Changed GridView to show starting values of dataset

Location:

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (3 diffs)
• Regression/NamedIntervalsView.Designer.cs (copied) (copied from branches/2971_named_intervals/HeuristicLab.Data.Views/3.3/BoolMatrixView.Designer.cs) (3 diffs)
• Regression/NamedIntervalsView.cs (copied) (copied from branches/2971_named_intervals/HeuristicLab.Data.Views/3.3/BoolMatrixView.cs) (2 diffs)
• Regression/NamedIntervalsView.resx (added)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -41 +41 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -306 +306 @@
     <Compile Include="ProblemDataView.Designer.cs">
       <DependentUpon>ProblemDataView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Regression\NamedIntervalsView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Regression\NamedIntervalsView.Designer.cs">
+      <DependentUpon>NamedIntervalsView.cs</DependentUpon>
     </Compile>
     <Compile Include="Regression\ConfidenceRegressionSolutionEstimatedValuesView.cs">
@@ -575 +581 @@
       <DependentUpon>AbstractFeatureCorrelationView.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Regression\NamedIntervalsView.resx">
+      <DependentUpon>NamedIntervalsView.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/NamedIntervalsView.Designer.cs

@@ -1 @@
-namespace HeuristicLab.Data.Views {
-  partial class BoolMatrixView {
+namespace HeuristicLab.Problems.DataAnalysis.Views {
+  partial class NamedIntervalsView {
     /// <summary> 
     /// Required designer variable.
@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
-      this.pictureBox = new System.Windows.Forms.PictureBox();
-      ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+      this.dataGridView = new System.Windows.Forms.DataGridView();
+      this.groupBox1 = new System.Windows.Forms.GroupBox();
+      ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+      this.groupBox1.SuspendLayout();
       this.SuspendLayout();
       // 
-      // pictureBox
+      // dataGridView
       // 
-      this.pictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)
+      this.dataGridView.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.pictureBox.Location = new System.Drawing.Point(3, 3);
-      this.pictureBox.Name = "pictureBox";
-      this.pictureBox.Size = new System.Drawing.Size(144, 144);
-      this.pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-      this.pictureBox.TabIndex = 0;
-      this.pictureBox.TabStop = false;
+      this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+      this.dataGridView.Location = new System.Drawing.Point(6, 19);
+      this.dataGridView.Name = "dataGridView";
+      this.dataGridView.RowHeadersWidth = 120;
+      this.dataGridView.Size = new System.Drawing.Size(461, 378);
+      this.dataGridView.TabIndex = 0;
+      this.dataGridView.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_CellEndEdit);
+      this.dataGridView.CellValidating += new System.Windows.Forms.DataGridViewCellValidatingEventHandler(this.dataGridView_CellValidating);
+      this.dataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_CellValueChanged);
       // 
-      // BoolMatrixView
+      // groupBox1
+      // 
+      this.groupBox1.Controls.Add(this.dataGridView);
+      this.groupBox1.Location = new System.Drawing.Point(6, 4);
+      this.groupBox1.Name = "groupBox1";
+      this.groupBox1.Size = new System.Drawing.Size(473, 403);
+      this.groupBox1.TabIndex = 1;
+      this.groupBox1.TabStop = false;
+      this.groupBox1.Text = "Interval Boundaries";
+      // 
+      // NamedIntervalsView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.pictureBox);
-      this.Name = "BoolMatrixView";
-      ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+      this.Controls.Add(this.groupBox1);
+      this.Name = "NamedIntervalsView";
+      this.Size = new System.Drawing.Size(482, 410);
+      ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+      this.groupBox1.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -53 +70 @@
     #endregion
 
-    private System.Windows.Forms.PictureBox pictureBox;
+    protected System.Windows.Forms.DataGridView dataGridView;
+    private System.Windows.Forms.GroupBox groupBox1;
   }
 }

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/NamedIntervalsView.cs

@@ -23 +23 @@
 using System.ComponentModel;
 using System.Drawing;
-using HeuristicLab.Core.Views;
+using System.Linq;
+using System.Security.Permissions;
+using System.Windows.Forms;
 using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
+using HeuristicLab.Problems.DataAnalysis.Implementation;
 
-namespace HeuristicLab.Data.Views {
+namespace HeuristicLab.Problems.DataAnalysis.Views {
 
-  [View("BoolMatrixView")]
-  [Content(typeof(BoolMatrix), IsDefaultView = false)]
-  public sealed partial class BoolMatrixView : ItemView {
-    private BackgroundWorker worker;
+  [View("NamedIntervals View")]
+  [Content(typeof(NamedIntervals), true)]
+  public partial class NamedIntervalsView : AsynchronousContentView {
 
-    public new BoolMatrix Content {
-      get { return (BoolMatrix)base.Content; }
-      set { base.Content = value; }
+    public new NamedIntervals Content {
+      get => (NamedIntervals)base.Content; 
+      set => base.Content = value; 
     }
 
-    public BoolMatrixView() {
-      InitializeComponent();
+    public DataGridView DataGridView {
+      get => dataGridView;
     }
 
-    protected override void DeregisterContentEvents() {
-      Content.ToStringChanged -= Content_ToStringChanged;
-      base.DeregisterContentEvents();
-    }
-
-    protected override void RegisterContentEvents() {
-      base.RegisterContentEvents();
-      Content.ToStringChanged += Content_ToStringChanged;
-    }
-
-    private void Content_ToStringChanged(object sender, EventArgs e) {
-      Rebuild();
-    }
-
-    private void Rebuild() {
-      int width = pictureBox.Width;
-      int height = pictureBox.Height;
-      int tileWidth = width / Content.Columns;
-      int tileHeight = height / Content.Rows;
-      int border = (int)Math.Round((tileWidth + tileHeight) / 2.0 * 0.05);
-      var bitmap = new Bitmap(width, height);
-
-      if (worker != null)
-        worker.CancelAsync();
-
-      if (tileWidth == 0 || tileHeight == 0) {
-        using (Graphics g = Graphics.FromImage(bitmap)) {
-          g.DrawString("BoolMatrix is too big to draw.", DefaultFont, new SolidBrush(Color.Black), 10.0f, height / 2.0f);
-          g.Flush();
-        }
-        pictureBox.Image = bitmap;
-        return;
-      }
-
-      worker = new BackgroundWorker();
-      worker.WorkerSupportsCancellation = true;
-      worker.DoWork += (s, a) => {
-        using (Graphics g = Graphics.FromImage(bitmap)) {
-          for (int i = 0; i < Content.Rows; i++) {
-            for (int j = 0; j < Content.Columns; j++) {
-              if (worker.CancellationPending) {
-                a.Cancel = true;
-                break;
-              }
-              g.FillRectangle(Content[i, j] ? Brushes.Black : Brushes.White, i * tileWidth, j * tileHeight,
-                                                                    tileWidth - border, tileHeight - border);
-            }
-          }
-          g.Flush();
-        }
-      };
-      worker.RunWorkerCompleted += (s, a) => {
-        if (!a.Cancelled)
-          pictureBox.Image = bitmap;
-        if (!worker.CancellationPending)
-          worker = null;
-      };
-      worker.RunWorkerAsync();
+    public NamedIntervalsView() {
+      InitializeComponent();
+      setColumnNames();
+      dataGridView.AutoGenerateColumns = false;
+      dataGridView.AllowUserToAddRows = false;
     }
 
@@ -105 +55 @@
       base.OnContentChanged();
       if (Content == null) {
-        pictureBox.Image = new Bitmap(1, 1);
-      } else {
-        Rebuild();
+        DataGridView.Rows.Clear();
+        DataGridView.Columns.Clear();
+      } else if (!DataGridView.IsCurrentCellInEditMode) {
+        UpdateData();
       }
+    }
+
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      dataGridView.Enabled = Content != null;
+      dataGridView.ReadOnly = ReadOnly;
+    }
+
+    protected void UpdateData() {
+      var variablesCount = Content.VariableIntervals.Count;
+
+      DataGridViewRow[] rows = new DataGridViewRow[variablesCount];
+      for (var i = 0; i < variablesCount; ++i) {
+        var row = new DataGridViewRow();
+        rows[i] = row;
+      }
+      dataGridView.Rows.AddRange(rows);
+
+      setRowsHeader();
+      FillRows();
+
+      dataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.ColumnHeader);
+      dataGridView.AutoResizeRowHeadersWidth(DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders);
+      dataGridView.Enabled = true;
+
+    }
+
+    protected void FillRows() {
+      for (var i = 0; i < dataGridView.RowCount; ++i) {
+        var key = (string)dataGridView.Rows[i].HeaderCell.Value;
+        dataGridView.Rows[i].Cells[0].Value = Content.VariableIntervals[key].LowerBound;
+        dataGridView.Rows[i].Cells[1].Value = Content.VariableIntervals[key].UpperBound;
+      }
+    }
+
+    protected void setRowsHeader() {   
+      for (var i = 0; i < Content.VariableIntervals.Count; ++i) {
+        var item = Content.VariableIntervals.ElementAt(i);
+        dataGridView.Rows[i].HeaderCell.Value = item.Key;
+      }
+    }
+
+    protected void setColumnNames() {
+      dataGridView.Columns.Add("lowerBound", "Lower Bound");
+      dataGridView.Columns.Add("upperBound", "Upper Bound");
+    }
+
+    private void dataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e) {
+      
+    }
+
+    private void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
+      double value;
+
+      if (!double.TryParse(e.FormattedValue.ToString(), out value)) {
+        dataGridView.Rows[e.RowIndex].ErrorText = "Value has to be a double value";
+        e.Cancel = true;
+      } else if (string.IsNullOrEmpty(e.FormattedValue.ToString())) {
+        dataGridView.Rows[e.RowIndex].ErrorText = "Value has to best";
+        e.Cancel = true;
+      } else if (double.Parse(dataGridView.Rows[e.RowIndex].Cells[0].Value.ToString()) >
+                 double.Parse(dataGridView.Rows[e.RowIndex].Cells[1].Value.ToString())) {
+        dataGridView.Rows[e.RowIndex].ErrorText = "Lower Bound of Interval has to be smaller than Upper Bound";
+        e.Cancel = true;
+      }
+    }
+
+    private void dataGridView_CellEndEdit(object sender, DataGridViewCellEventArgs e) {
+      dataGridView.Rows[e.RowIndex].ErrorText = string.Empty;
     }
   }