diff --git a/CutList/CutList.csproj b/CutList/CutList.csproj index b7def40..ea38d2f 100644 --- a/CutList/CutList.csproj +++ b/CutList/CutList.csproj @@ -101,7 +101,7 @@ - + MainForm.cs diff --git a/CutList/Forms/MainForm.Designer.cs b/CutList/Forms/MainForm.Designer.cs index 9d4c62e..eea73ef 100644 --- a/CutList/Forms/MainForm.Designer.cs +++ b/CutList/Forms/MainForm.Designer.cs @@ -124,7 +124,7 @@ // // itemBindingSource // - this.itemBindingSource.DataSource = typeof(CutList.UIItem); + this.itemBindingSource.DataSource = typeof(CutList.Models.Item); // // label1 // diff --git a/CutList/Forms/MainForm.cs b/CutList/Forms/MainForm.cs index 06b3d7c..b2a3c72 100644 --- a/CutList/Forms/MainForm.cs +++ b/CutList/Forms/MainForm.cs @@ -1,4 +1,5 @@ -using Newtonsoft.Json; +using CutList.Models; +using Newtonsoft.Json; using SawCut; using SawCut.Nesting; using SimpleExpressionEvaluator; @@ -15,13 +16,13 @@ namespace CutList.Forms { public partial class MainForm : Form { - private BindingList items; + private BindingList items; public MainForm() { InitializeComponent(); - items = new BindingList(); + items = new BindingList(); items.ListChanged += Items_ListChanged; itemBindingSource.DataSource = items; @@ -98,7 +99,7 @@ namespace CutList.Forms if (openFileDialog.ShowDialog() == DialogResult.OK) { var data = File.ReadAllText(openFileDialog.FileName); - items = JsonConvert.DeserializeObject>(data); + items = JsonConvert.DeserializeObject>(data); dataGridView1.ClearSelection(); itemBindingSource.DataSource = items; @@ -287,7 +288,7 @@ namespace CutList.Forms { if (e.ColumnIndex == lengthDataGridViewTextBoxColumn.Index) { - var item = dataGridView1.Rows[e.RowIndex].DataBoundItem as UIItem; + var item = dataGridView1.Rows[e.RowIndex].DataBoundItem as Item; if (item == null) return; diff --git a/CutList/Forms/ResultsForm.Designer.cs b/CutList/Forms/ResultsForm.Designer.cs index 027e787..dc65731 100644 --- a/CutList/Forms/ResultsForm.Designer.cs +++ b/CutList/Forms/ResultsForm.Designer.cs @@ -202,7 +202,7 @@ // // uIItemBindingSource // - this.uIItemBindingSource.DataSource = typeof(CutList.UIItem); + this.uIItemBindingSource.DataSource = typeof(CutList.Models.Item); // // menuStrip1 // diff --git a/CutList/Models/UIItem.cs b/CutList/Models/Item.cs similarity index 95% rename from CutList/Models/UIItem.cs rename to CutList/Models/Item.cs index 15160ec..ac9240e 100644 --- a/CutList/Models/UIItem.cs +++ b/CutList/Models/Item.cs @@ -2,11 +2,11 @@ using SawCut; using System; -namespace CutList +namespace CutList.Models { - public class UIItem + public class Item { - public UIItem() + public Item() { }