From 5e26c490b83f4fe23139a3bdde5f2230cfd84640 Mon Sep 17 00:00:00 2001 From: mjjo53 Date: Thu, 15 Jun 2017 23:47:36 +0900 Subject: [PATCH] =?UTF-8?q?-=20form=20=EC=9D=B4=EB=A6=84=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20-=20UI=20=EC=88=98=EC=A0=95=20-=20Result=20Panel=20?= =?UTF-8?q?Column=20=EC=97=B0=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataExcel.cs | 86 --------- DataHandler.cs | 146 ++++++++++++++++ MainForm.Designer.cs | 236 ++++++++++++++++++++++++- MainForm.cs | 74 ++++++-- MainForm.resx | 260 ++++++++++++++++++---------- PanelMaterial.Designer.cs | 125 +++++++++++++ PanelMaterial.cs | 49 ++++++ RowPanel.resx => PanelMaterial.resx | 0 PanelResult.Designer.cs | 114 ++++++++++++ PanelResult.cs | 69 ++++++++ TablePanel.resx => PanelResult.resx | 0 RowPanel.Designer.cs | 80 --------- RowPanel.cs | 31 ---- TablePanel.Designer.cs | 84 --------- TablePanel.cs | 45 ----- dockpanelsuite | 2 +- friction.csproj | 22 +-- 17 files changed, 972 insertions(+), 451 deletions(-) delete mode 100644 DataExcel.cs create mode 100644 DataHandler.cs create mode 100644 PanelMaterial.Designer.cs create mode 100644 PanelMaterial.cs rename RowPanel.resx => PanelMaterial.resx (100%) create mode 100644 PanelResult.Designer.cs create mode 100644 PanelResult.cs rename TablePanel.resx => PanelResult.resx (100%) delete mode 100644 RowPanel.Designer.cs delete mode 100644 RowPanel.cs delete mode 100644 TablePanel.Designer.cs delete mode 100644 TablePanel.cs diff --git a/DataExcel.cs b/DataExcel.cs deleted file mode 100644 index 4e46611..0000000 --- a/DataExcel.cs +++ /dev/null @@ -1,86 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using OfficeOpenXml; -using System.IO; -using System.Data; - -namespace friction -{ - public class DataHandler - { - DataTable m_Data = new DataTable(); - - List m_Material1 = new List(); - List m_Material2 = new List(); - - public void LoadData2(string strFileName) - { - FileInfo newFile = new FileInfo(strFileName); - ExcelPackage package = new ExcelPackage(newFile); - ExcelWorksheet Sheet = package.Workbook.Worksheets[1]; - - m_Data.Clear(); - - // read column - for (int iCol = Sheet.Dimension.Start.Column; iCol <= Sheet.Dimension.End.Column; iCol++) - { - string strCol = (string)Sheet.Cells[Sheet.Dimension.Start.Row, iCol].Value; - m_Data.Columns.Add(new DataColumn(strCol)); - } - - // read data - for (int iRow = Sheet.Dimension.Start.Row + 1; iRow <= Sheet.Dimension.End.Row; iRow++) - { - DataRow newRow = m_Data.NewRow(); - - for (int iCol = Sheet.Dimension.Start.Column; iCol <= Sheet.Dimension.End.Column; iCol++) - { - var value = Sheet.Cells[iRow, iCol].Value; - - if (value is double) - { - float fData = (float)(double)value; - newRow[iCol-1] = fData; - } - else - { - string strData = ""; - if (value != null) - strData = (string)value; - - newRow[iCol-1] = strData; - } - } - - m_Data.Rows.Add(newRow); - } - - m_Material1 = (from r in m_Data.AsEnumerable() - select r["Material spring"]).Distinct().Cast().ToList(); - - m_Material2 = (from r in m_Data.AsEnumerable() - select r["material 2 table"]).Distinct().Cast().ToList(); - - - Console.WriteLine("end"); - } - - public List GetMaterial1() - { - return m_Material1; - } - - public List GetMaterial2() - { - return m_Material2; - } - - public DataTable GetData() - { - return m_Data; - } - } -} diff --git a/DataHandler.cs b/DataHandler.cs new file mode 100644 index 0000000..842d0e0 --- /dev/null +++ b/DataHandler.cs @@ -0,0 +1,146 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using OfficeOpenXml; +using System.IO; +using System.Data; + +namespace friction +{ + public class DataHandler + { + DataTable m_Data = new DataTable(); + + string m_strFileName = ""; + string m_strFilePath = ""; + + List m_ColumnsNames = new List(); + List m_ActiveColumns = new List(); + List m_NonactiveColumns = new List(); + List m_Material1 = new List(); + List m_Material2 = new List(); + + Dictionary m_ColumnMap = new Dictionary(); + + public DataHandler() + { + m_ColumnMap["spring"] = "Material spring"; + m_ColumnMap["table"] = "material 2 table"; + m_ColumnMap["priority"] = "Risk priority number"; + m_ColumnMap["force"] = "normal force"; + m_ColumnMap["temp"] = "Temperature"; + m_ColumnMap["humidity"] = "Relative humidity"; + m_ColumnMap["velocity"] = "Relative velocity"; + } + + public void LoadData2(string strFilePath) + { + using (ExcelPackage package = new ExcelPackage()) + { + using (var stream = new FileStream(strFilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) + package.Load(stream); + ExcelWorksheet Sheet = package.Workbook.Worksheets[1]; + + m_Data.Columns.Clear(); + m_Data.Rows.Clear(); + + // read column + for (int iCol = Sheet.Dimension.Start.Column; iCol <= Sheet.Dimension.End.Column; iCol++) + { + string strCol = (string)Sheet.Cells[Sheet.Dimension.Start.Row, iCol].Value; + m_Data.Columns.Add(new DataColumn(strCol)); + } + + // read data + for (int iRow = Sheet.Dimension.Start.Row + 1; iRow <= Sheet.Dimension.End.Row; iRow++) + { + DataRow newRow = m_Data.NewRow(); + + for (int iCol = Sheet.Dimension.Start.Column; iCol <= Sheet.Dimension.End.Column; iCol++) + { + var value = Sheet.Cells[iRow, iCol].Value; + + if (value is double) + { + float fData = (float)(double)value; + newRow[iCol - 1] = fData; + } + else + { + string strData = ""; + if (value != null) + { + strData = (string)value; + strData = strData.Trim(); + } + + newRow[iCol - 1] = strData; + } + } + + m_Data.Rows.Add(newRow); + } + } + + + m_Material1 = (from r in m_Data.AsEnumerable() + select r[m_ColumnMap["spring"]]).Distinct().Cast().ToList(); + + m_Material2 = (from r in m_Data.AsEnumerable() + select r[m_ColumnMap["table"]]).Distinct().Cast().ToList(); + + m_ColumnsNames = (from c in m_Data.Columns.Cast() + select c.ColumnName).ToList(); + + + m_ActiveColumns.Clear(); + m_NonactiveColumns.Clear(); + for (int i=0; i< m_ColumnsNames.Count; i++) + { + if(m_Data.Columns[i].DataType == typeof(string)) + { + if(m_Data.AsEnumerable().Any(r => (string)r[i] != "")) + m_ActiveColumns.Add(m_ColumnsNames[i]); + else + m_NonactiveColumns.Add(m_ColumnsNames[i]); + } + else + { + m_ActiveColumns.Add(m_ColumnsNames[i]); + } + } + } + + public DataTable GetData() + { + return m_Data; + } + + public List GetMaterialSpring() + { + return m_Material1; + } + + public List GetMaterialTable() + { + return m_Material2; + } + + public List GetColumns() + { + return m_ColumnsNames; + } + + public List GetActiveColumns() + { + return m_ActiveColumns; + } + + public List GetNonactiveColumns() + { + return m_NonactiveColumns; + } + } +} diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index 0964aa9..a518646 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -31,19 +31,49 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.toolStripMain = new System.Windows.Forms.ToolStrip(); this.toolStripButtonOpen = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButtonMaterial = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButtonResult = new System.Windows.Forms.ToolStripButton(); + this.toolStripButtonAnalysis = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButtonRadarGraph = new System.Windows.Forms.ToolStripButton(); + this.toolStripButtonTrendGraph = new System.Windows.Forms.ToolStripButton(); this.statusStrip = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.dockPanel = new WeifenLuo.WinFormsUI.Docking.DockPanel(); + this.menuStrip = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openDBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tableToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.resultTableToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.analysisTableToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.graphToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.radarGraphToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.trendGraphToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.reportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.allToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMain.SuspendLayout(); this.statusStrip.SuspendLayout(); + this.menuStrip.SuspendLayout(); this.SuspendLayout(); // // toolStripMain // this.toolStripMain.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.toolStripMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButtonOpen}); - this.toolStripMain.Location = new System.Drawing.Point(0, 0); + this.toolStripButtonOpen, + this.toolStripSeparator1, + this.toolStripButtonMaterial, + this.toolStripSeparator3, + this.toolStripButtonResult, + this.toolStripButtonAnalysis, + this.toolStripSeparator2, + this.toolStripButtonRadarGraph, + this.toolStripButtonTrendGraph}); + this.toolStripMain.Location = new System.Drawing.Point(0, 24); this.toolStripMain.Name = "toolStripMain"; this.toolStripMain.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; this.toolStripMain.Size = new System.Drawing.Size(947, 25); @@ -57,9 +87,80 @@ this.toolStripButtonOpen.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonOpen.Name = "toolStripButtonOpen"; this.toolStripButtonOpen.Size = new System.Drawing.Size(23, 22); - this.toolStripButtonOpen.Text = "toolStripButton1"; + this.toolStripButtonOpen.Text = "Open DB"; + this.toolStripButtonOpen.ToolTipText = "Open DB (Ctrl+O)"; this.toolStripButtonOpen.Click += new System.EventHandler(this.toolStripButtonOpen_Click); // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + // + // toolStripButtonMaterial + // + this.toolStripButtonMaterial.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButtonMaterial.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonMaterial.Image"))); + this.toolStripButtonMaterial.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonMaterial.Name = "toolStripButtonMaterial"; + this.toolStripButtonMaterial.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonMaterial.Text = "toolStripButton1"; + this.toolStripButtonMaterial.ToolTipText = "Material Pair (Ctrl+M)"; + this.toolStripButtonMaterial.Click += new System.EventHandler(this.toolStripButtonMaterial_Click); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25); + // + // toolStripButtonResult + // + this.toolStripButtonResult.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButtonResult.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonResult.Image"))); + this.toolStripButtonResult.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonResult.Name = "toolStripButtonResult"; + this.toolStripButtonResult.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonResult.Text = "toolStripButton1"; + this.toolStripButtonResult.ToolTipText = "Result Table (Ctrl+R)"; + this.toolStripButtonResult.Click += new System.EventHandler(this.toolStripButtonResult_Click); + // + // toolStripButtonAnalysis + // + this.toolStripButtonAnalysis.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButtonAnalysis.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonAnalysis.Image"))); + this.toolStripButtonAnalysis.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonAnalysis.Name = "toolStripButtonAnalysis"; + this.toolStripButtonAnalysis.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonAnalysis.Text = "toolStripButton2"; + this.toolStripButtonAnalysis.ToolTipText = "Analysis Table (Ctrl+A)"; + this.toolStripButtonAnalysis.Click += new System.EventHandler(this.toolStripButtonAnalysis_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + // + // toolStripButtonRadarGraph + // + this.toolStripButtonRadarGraph.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButtonRadarGraph.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonRadarGraph.Image"))); + this.toolStripButtonRadarGraph.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonRadarGraph.Name = "toolStripButtonRadarGraph"; + this.toolStripButtonRadarGraph.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonRadarGraph.Text = "toolStripButton3"; + this.toolStripButtonRadarGraph.ToolTipText = "Radar Graph (Ctrl+D)"; + this.toolStripButtonRadarGraph.Click += new System.EventHandler(this.toolStripButtonRadarGraph_Click); + // + // toolStripButtonTrendGraph + // + this.toolStripButtonTrendGraph.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButtonTrendGraph.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonTrendGraph.Image"))); + this.toolStripButtonTrendGraph.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonTrendGraph.Name = "toolStripButtonTrendGraph"; + this.toolStripButtonTrendGraph.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonTrendGraph.Text = "toolStripButton4"; + this.toolStripButtonTrendGraph.ToolTipText = "Trend Graph (Ctrl+T)"; + this.toolStripButtonTrendGraph.Click += new System.EventHandler(this.toolStripButtonTrendGraph_Click); + // // statusStrip // this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -80,12 +181,108 @@ // this.dockPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.dockPanel.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingWindow; - this.dockPanel.Location = new System.Drawing.Point(0, 25); + this.dockPanel.Location = new System.Drawing.Point(0, 49); this.dockPanel.Name = "dockPanel"; - this.dockPanel.ShowDocumentIcon = true; - this.dockPanel.Size = new System.Drawing.Size(947, 598); + this.dockPanel.Size = new System.Drawing.Size(947, 574); this.dockPanel.TabIndex = 2; // + // menuStrip + // + this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem, + this.tableToolStripMenuItem, + this.graphToolStripMenuItem, + this.reportToolStripMenuItem}); + this.menuStrip.Location = new System.Drawing.Point(0, 0); + this.menuStrip.Name = "menuStrip"; + this.menuStrip.Size = new System.Drawing.Size(947, 24); + this.menuStrip.TabIndex = 3; + this.menuStrip.Text = "menuStrip1"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.openDBToolStripMenuItem, + this.recentToolStripMenuItem, + this.exitToolStripMenuItem}); + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Text = "File"; + // + // openDBToolStripMenuItem + // + this.openDBToolStripMenuItem.Name = "openDBToolStripMenuItem"; + this.openDBToolStripMenuItem.Size = new System.Drawing.Size(123, 22); + this.openDBToolStripMenuItem.Text = "Open DB"; + // + // recentToolStripMenuItem + // + this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; + this.recentToolStripMenuItem.Size = new System.Drawing.Size(123, 22); + this.recentToolStripMenuItem.Text = "Recent"; + // + // exitToolStripMenuItem + // + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + this.exitToolStripMenuItem.Size = new System.Drawing.Size(123, 22); + this.exitToolStripMenuItem.Text = "Exit"; + // + // tableToolStripMenuItem + // + this.tableToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.resultTableToolStripMenuItem, + this.analysisTableToolStripMenuItem}); + this.tableToolStripMenuItem.Name = "tableToolStripMenuItem"; + this.tableToolStripMenuItem.Size = new System.Drawing.Size(47, 20); + this.tableToolStripMenuItem.Text = "Table"; + // + // resultTableToolStripMenuItem + // + this.resultTableToolStripMenuItem.Name = "resultTableToolStripMenuItem"; + this.resultTableToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.resultTableToolStripMenuItem.Text = "Result Table"; + // + // analysisTableToolStripMenuItem + // + this.analysisTableToolStripMenuItem.Name = "analysisTableToolStripMenuItem"; + this.analysisTableToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.analysisTableToolStripMenuItem.Text = "Analysis Table"; + // + // graphToolStripMenuItem + // + this.graphToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.radarGraphToolStripMenuItem, + this.trendGraphToolStripMenuItem}); + this.graphToolStripMenuItem.Name = "graphToolStripMenuItem"; + this.graphToolStripMenuItem.Size = new System.Drawing.Size(51, 20); + this.graphToolStripMenuItem.Text = "Graph"; + // + // radarGraphToolStripMenuItem + // + this.radarGraphToolStripMenuItem.Name = "radarGraphToolStripMenuItem"; + this.radarGraphToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.radarGraphToolStripMenuItem.Text = "Radar Graph"; + // + // trendGraphToolStripMenuItem + // + this.trendGraphToolStripMenuItem.Name = "trendGraphToolStripMenuItem"; + this.trendGraphToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.trendGraphToolStripMenuItem.Text = "Trend Graph"; + // + // reportToolStripMenuItem + // + this.reportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.allToolStripMenuItem}); + this.reportToolStripMenuItem.Name = "reportToolStripMenuItem"; + this.reportToolStripMenuItem.Size = new System.Drawing.Size(54, 20); + this.reportToolStripMenuItem.Text = "Report"; + // + // allToolStripMenuItem + // + this.allToolStripMenuItem.Name = "allToolStripMenuItem"; + this.allToolStripMenuItem.Size = new System.Drawing.Size(88, 22); + this.allToolStripMenuItem.Text = "All"; + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -94,12 +291,16 @@ this.Controls.Add(this.dockPanel); this.Controls.Add(this.statusStrip); this.Controls.Add(this.toolStripMain); + this.Controls.Add(this.menuStrip); + this.MainMenuStrip = this.menuStrip; this.Name = "MainForm"; - this.Text = "Form1"; + this.Text = "Material Stick-Slip Analysis"; this.toolStripMain.ResumeLayout(false); this.toolStripMain.PerformLayout(); this.statusStrip.ResumeLayout(false); this.statusStrip.PerformLayout(); + this.menuStrip.ResumeLayout(false); + this.menuStrip.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -112,6 +313,27 @@ private System.Windows.Forms.StatusStrip statusStrip; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel; private WeifenLuo.WinFormsUI.Docking.DockPanel dockPanel; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripButton toolStripButtonResult; + private System.Windows.Forms.ToolStripButton toolStripButtonAnalysis; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripButton toolStripButtonRadarGraph; + private System.Windows.Forms.ToolStripButton toolStripButtonTrendGraph; + private System.Windows.Forms.MenuStrip menuStrip; + private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem openDBToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem recentToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem tableToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem resultTableToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem analysisTableToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem graphToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem radarGraphToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem trendGraphToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem reportToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem allToolStripMenuItem; + private System.Windows.Forms.ToolStripButton toolStripButtonMaterial; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; } } diff --git a/MainForm.cs b/MainForm.cs index e01d40a..ff33fc5 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -14,17 +14,33 @@ namespace friction public partial class MainForm : Form { string m_DBFileName = ""; - DataHandler m_DataLoader = new DataHandler(); - TablePanel m_TablePanel = null; - RowPanel m_RowPanel = null; + DataHandler m_DataHandler = new DataHandler(); + PanelMaterial m_MaterialPanel = null; + PanelResult m_ResultPanel = null; public MainForm() { InitializeComponent(); dockPanel.Theme = new VS2015DarkTheme(); - m_TablePanel = new TablePanel(this); - m_RowPanel = new RowPanel(this); + m_MaterialPanel = new PanelMaterial(this); + m_ResultPanel = new PanelResult(this); + } + + private void OpenPanel(DockContent panel) + { + if (panel.Visible == false) + panel.Show(dockPanel); + if (panel.IsHidden == true) + panel.IsHidden = false; + + if(panel.DockState == DockState.DockTopAutoHide || + panel.DockState == DockState.DockBottomAutoHide || + panel.DockState == DockState.DockLeftAutoHide || + panel.DockState == DockState.DockRightAutoHide) + { + dockPanel.ActiveAutoHideContent = panel; + } } private void toolStripButtonOpen_Click(object sender, EventArgs e) @@ -32,28 +48,56 @@ namespace friction OpenFileDialog ofd = new OpenFileDialog(); ofd.Filter = "엑셀 파일 (*.xlsx)|*.xlsx|엑셀 파일 (*.xls)|*.xls|전체|*"; DialogResult result = ofd.ShowDialog(); - if(result == DialogResult.OK) + if (result == DialogResult.OK) { m_DBFileName = ofd.FileName; - m_DataLoader.LoadData2(m_DBFileName); - UpdateTablePanel(); + m_DataHandler.LoadData2(m_DBFileName); + + m_MaterialPanel.UpdateData(m_DataHandler); + OpenPanel(m_MaterialPanel); + + m_ResultPanel.UpdateData(m_DataHandler); + OpenPanel(m_ResultPanel); toolStripStatusLabel.Text = m_DBFileName; } } - private void UpdateTablePanel() + private void toolStripButtonMaterial_Click(object sender, EventArgs e) { - m_TablePanel.UpdateData(m_DataLoader); - if(m_TablePanel.Visible == false) - m_TablePanel.Show(dockPanel); + OpenPanel(m_MaterialPanel); } + private void toolStripButtonResult_Click(object sender, EventArgs e) + { + OpenPanel(m_ResultPanel); + } + + private void toolStripButtonAnalysis_Click(object sender, EventArgs e) + { + + } + + private void toolStripButtonRadarGraph_Click(object sender, EventArgs e) + { + + } + + private void toolStripButtonTrendGraph_Click(object sender, EventArgs e) + { + + } + + #region Events from panels public void OnApplyData() { - m_RowPanel.UpdateData(m_DataLoader); - if (m_RowPanel.Visible == false) - m_RowPanel.Show(dockPanel); + } + + public void OnColumnChecked(string strColumn, bool bChecked) + { + + } + #endregion } } diff --git a/MainForm.resx b/MainForm.resx index b5f22f6..e838a59 100644 --- a/MainForm.resx +++ b/MainForm.resx @@ -124,100 +124,178 @@ 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 + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== 144, 17 + + 254, 17 + \ No newline at end of file diff --git a/PanelMaterial.Designer.cs b/PanelMaterial.Designer.cs new file mode 100644 index 0000000..73085b9 --- /dev/null +++ b/PanelMaterial.Designer.cs @@ -0,0 +1,125 @@ +namespace friction +{ + partial class PanelMaterial + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.cbMaterialTable = new System.Windows.Forms.ComboBox(); + this.cbMaterialSpring = new System.Windows.Forms.ComboBox(); + this.btApply = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // cbMaterialTable + // + this.cbMaterialTable.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbMaterialTable.FormattingEnabled = true; + this.cbMaterialTable.Location = new System.Drawing.Point(32, 122); + this.cbMaterialTable.Name = "cbMaterialTable"; + this.cbMaterialTable.Size = new System.Drawing.Size(121, 20); + this.cbMaterialTable.TabIndex = 1; + // + // cbMaterialSpring + // + this.cbMaterialSpring.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbMaterialSpring.FormattingEnabled = true; + this.cbMaterialSpring.Location = new System.Drawing.Point(32, 61); + this.cbMaterialSpring.Name = "cbMaterialSpring"; + this.cbMaterialSpring.Size = new System.Drawing.Size(121, 20); + this.cbMaterialSpring.TabIndex = 2; + // + // btApply + // + this.btApply.Location = new System.Drawing.Point(32, 179); + this.btApply.Name = "btApply"; + this.btApply.Size = new System.Drawing.Size(75, 23); + this.btApply.TabIndex = 3; + this.btApply.Text = "Apply"; + this.btApply.UseVisualStyleBackColor = true; + this.btApply.Click += new System.EventHandler(this.btApply_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Malgun Gothic", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label1.Location = new System.Drawing.Point(12, 9); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(0, 25); + this.label1.TabIndex = 4; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(30, 46); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(90, 12); + this.label2.TabIndex = 5; + this.label2.Text = "Material Spring"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(30, 107); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(86, 12); + this.label3.TabIndex = 6; + this.label3.Text = "Material Table"; + // + // PanelMaterial + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(284, 261); + this.ControlBox = false; + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.btApply); + this.Controls.Add(this.cbMaterialSpring); + this.Controls.Add(this.cbMaterialTable); + this.HideOnClose = true; + this.Name = "PanelMaterial"; + this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.DockLeft; + this.TabText = "Material Pair"; + this.Text = "Material Pair"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.ComboBox cbMaterialTable; + private System.Windows.Forms.ComboBox cbMaterialSpring; + private System.Windows.Forms.Button btApply; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + } +} \ No newline at end of file diff --git a/PanelMaterial.cs b/PanelMaterial.cs new file mode 100644 index 0000000..23420c8 --- /dev/null +++ b/PanelMaterial.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using WeifenLuo.WinFormsUI.Docking; + +namespace friction +{ + public partial class PanelMaterial : DockContent + { + MainForm m_Owner = null; + + public PanelMaterial(MainForm owner) + { + InitializeComponent(); + + m_Owner = owner; + this.ApplyTheme(); + } + + public void UpdateData(DataHandler data) + { + var MaterialSpring = data.GetMaterialSpring(); + var MaterialTable = data.GetMaterialTable(); + + cbMaterialSpring.Items.Clear(); + cbMaterialSpring.Items.Add("All"); + foreach (var x in MaterialSpring) + cbMaterialSpring.Items.Add(x); + cbMaterialSpring.SelectedIndex = 0; + + cbMaterialTable.Items.Clear(); + cbMaterialTable.Items.Add("All"); + foreach (var x in MaterialTable) + cbMaterialTable.Items.Add(x); + cbMaterialTable.SelectedIndex = 0; + } + + private void btApply_Click(object sender, EventArgs e) + { + m_Owner.OnApplyData(); + } + } +} diff --git a/RowPanel.resx b/PanelMaterial.resx similarity index 100% rename from RowPanel.resx rename to PanelMaterial.resx diff --git a/PanelResult.Designer.cs b/PanelResult.Designer.cs new file mode 100644 index 0000000..52e4dde --- /dev/null +++ b/PanelResult.Designer.cs @@ -0,0 +1,114 @@ +namespace friction +{ + partial class PanelResult + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.ListViewGroup listViewGroup1 = new System.Windows.Forms.ListViewGroup("Active Columns", System.Windows.Forms.HorizontalAlignment.Left); + System.Windows.Forms.ListViewGroup listViewGroup2 = new System.Windows.Forms.ListViewGroup("Nonactive Columns", System.Windows.Forms.HorizontalAlignment.Left); + this.dgvData = new System.Windows.Forms.DataGridView(); + this.lvColumn = new System.Windows.Forms.ListView(); + this.lvchCheck = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.lvchColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + ((System.ComponentModel.ISupportInitialize)(this.dgvData)).BeginInit(); + this.SuspendLayout(); + // + // dgvData + // + this.dgvData.AllowUserToOrderColumns = true; + this.dgvData.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.dgvData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvData.Location = new System.Drawing.Point(3, 3); + this.dgvData.Name = "dgvData"; + this.dgvData.RowTemplate.Height = 23; + this.dgvData.Size = new System.Drawing.Size(713, 724); + this.dgvData.TabIndex = 0; + // + // lvColumn + // + this.lvColumn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.lvColumn.CheckBoxes = true; + this.lvColumn.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.lvchCheck, + this.lvchColumn}); + this.lvColumn.FullRowSelect = true; + listViewGroup1.Header = "Active Columns"; + listViewGroup1.Name = "lvgActiveColumn"; + listViewGroup2.Header = "Nonactive Columns"; + listViewGroup2.Name = "lbgNonactiveColumn"; + this.lvColumn.Groups.AddRange(new System.Windows.Forms.ListViewGroup[] { + listViewGroup1, + listViewGroup2}); + this.lvColumn.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; + this.lvColumn.Location = new System.Drawing.Point(722, 3); + this.lvColumn.MultiSelect = false; + this.lvColumn.Name = "lvColumn"; + this.lvColumn.Size = new System.Drawing.Size(199, 724); + this.lvColumn.TabIndex = 1; + this.lvColumn.UseCompatibleStateImageBehavior = false; + this.lvColumn.View = System.Windows.Forms.View.Details; + this.lvColumn.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.lvColumn_ItemChecked); + // + // lvchCheck + // + this.lvchCheck.Text = ""; + this.lvchCheck.Width = 25; + // + // lvchColumn + // + this.lvchColumn.Text = "Columns"; + this.lvchColumn.Width = 200; + // + // PanelResult + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(922, 723); + this.ControlBox = false; + this.Controls.Add(this.lvColumn); + this.Controls.Add(this.dgvData); + this.HideOnClose = true; + this.Name = "PanelResult"; + this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.Document; + this.TabText = "Result Table"; + this.Text = "Result Table"; + ((System.ComponentModel.ISupportInitialize)(this.dgvData)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.DataGridView dgvData; + private System.Windows.Forms.ListView lvColumn; + private System.Windows.Forms.ColumnHeader lvchColumn; + private System.Windows.Forms.ColumnHeader lvchCheck; + } +} \ No newline at end of file diff --git a/PanelResult.cs b/PanelResult.cs new file mode 100644 index 0000000..29a7951 --- /dev/null +++ b/PanelResult.cs @@ -0,0 +1,69 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using WeifenLuo.WinFormsUI.Docking; + +namespace friction +{ + public partial class PanelResult : DockContent + { + MainForm m_Owner = null; + + public PanelResult(MainForm owner) + { + InitializeComponent(); + + m_Owner = owner; + } + + public void UpdateData(DataHandler dataHandler) + { + dgvData.DataSource = dataHandler.GetData(); + + + Dictionary CacheChecked = new Dictionary(); + foreach (ListViewItem item in lvColumn.Items) + { + string key = item.SubItems[1].Text; + bool bChecked = item.Checked; + CacheChecked.Add(key, bChecked); + } + + lvColumn.Groups[0].Items.Clear(); + lvColumn.Groups[1].Items.Clear(); + lvColumn.Items.Clear(); + + List> Columns = new List>() { dataHandler.GetActiveColumns(), dataHandler.GetNonactiveColumns() }; + for(int iGroup=0; iGroup - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.dgvData = new System.Windows.Forms.DataGridView(); - this.lbColumn = new System.Windows.Forms.CheckedListBox(); - ((System.ComponentModel.ISupportInitialize)(this.dgvData)).BeginInit(); - this.SuspendLayout(); - // - // dgvData - // - this.dgvData.AllowUserToOrderColumns = true; - this.dgvData.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.dgvData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvData.Location = new System.Drawing.Point(3, 3); - this.dgvData.Name = "dgvData"; - this.dgvData.RowTemplate.Height = 23; - this.dgvData.Size = new System.Drawing.Size(713, 724); - this.dgvData.TabIndex = 0; - // - // lbColumn - // - this.lbColumn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); - this.lbColumn.FormattingEnabled = true; - this.lbColumn.Location = new System.Drawing.Point(719, 3); - this.lbColumn.Name = "lbColumn"; - this.lbColumn.Size = new System.Drawing.Size(200, 724); - this.lbColumn.TabIndex = 1; - // - // RowPanel - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(922, 723); - this.Controls.Add(this.lbColumn); - this.Controls.Add(this.dgvData); - this.HideOnClose = true; - this.Name = "RowPanel"; - this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.Document; - this.Text = "Row Data"; - ((System.ComponentModel.ISupportInitialize)(this.dgvData)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.DataGridView dgvData; - private System.Windows.Forms.CheckedListBox lbColumn; - } -} \ No newline at end of file diff --git a/RowPanel.cs b/RowPanel.cs deleted file mode 100644 index 64aa624..0000000 --- a/RowPanel.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using WeifenLuo.WinFormsUI.Docking; - -namespace friction -{ - public partial class RowPanel : DockContent - { - MainForm m_Owner = null; - - public RowPanel(MainForm owner) - { - InitializeComponent(); - - m_Owner = owner; - } - - public void UpdateData(DataHandler dataHandler) - { - dgvData.DataSource = dataHandler.GetData(); - dgvData.Update(); - } - } -} diff --git a/TablePanel.Designer.cs b/TablePanel.Designer.cs deleted file mode 100644 index d2d90c3..0000000 --- a/TablePanel.Designer.cs +++ /dev/null @@ -1,84 +0,0 @@ -namespace friction -{ - partial class TablePanel - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.cbMaterial2 = new System.Windows.Forms.ComboBox(); - this.cbMaterial1 = new System.Windows.Forms.ComboBox(); - this.btApply = new System.Windows.Forms.Button(); - this.SuspendLayout(); - // - // cbMaterial2 - // - this.cbMaterial2.FormattingEnabled = true; - this.cbMaterial2.Location = new System.Drawing.Point(32, 122); - this.cbMaterial2.Name = "cbMaterial2"; - this.cbMaterial2.Size = new System.Drawing.Size(121, 20); - this.cbMaterial2.TabIndex = 1; - // - // cbMaterial1 - // - this.cbMaterial1.FormattingEnabled = true; - this.cbMaterial1.Location = new System.Drawing.Point(32, 61); - this.cbMaterial1.Name = "cbMaterial1"; - this.cbMaterial1.Size = new System.Drawing.Size(121, 20); - this.cbMaterial1.TabIndex = 2; - // - // btApply - // - this.btApply.Location = new System.Drawing.Point(32, 179); - this.btApply.Name = "btApply"; - this.btApply.Size = new System.Drawing.Size(75, 23); - this.btApply.TabIndex = 3; - this.btApply.Text = "Apply"; - this.btApply.UseVisualStyleBackColor = true; - this.btApply.Click += new System.EventHandler(this.btApply_Click); - // - // TablePanel - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(284, 261); - this.Controls.Add(this.btApply); - this.Controls.Add(this.cbMaterial1); - this.Controls.Add(this.cbMaterial2); - this.HideOnClose = true; - this.Name = "TablePanel"; - this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.DockLeft; - this.Text = "TablePanel"; - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.ComboBox cbMaterial2; - private System.Windows.Forms.ComboBox cbMaterial1; - private System.Windows.Forms.Button btApply; - } -} \ No newline at end of file diff --git a/TablePanel.cs b/TablePanel.cs deleted file mode 100644 index ef8359d..0000000 --- a/TablePanel.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using WeifenLuo.WinFormsUI.Docking; - -namespace friction -{ - public partial class TablePanel : DockContent - { - MainForm m_Owner = null; - - public TablePanel(MainForm owner) - { - InitializeComponent(); - - m_Owner = owner; - this.ApplyTheme(); - } - - public void UpdateData(DataHandler data) - { - var Material1 = data.GetMaterial1(); - var Material2 = data.GetMaterial2(); - - cbMaterial1.Items.Clear(); - foreach(var x in Material1) - cbMaterial1.Items.Add(x); - - cbMaterial2.Items.Clear(); - foreach (var x in Material2) - cbMaterial2.Items.Add(x); - } - - private void btApply_Click(object sender, EventArgs e) - { - m_Owner.OnApplyData(); - } - } -} diff --git a/dockpanelsuite b/dockpanelsuite index dc15750..7cd07b4 160000 --- a/dockpanelsuite +++ b/dockpanelsuite @@ -1 +1 @@ -Subproject commit dc15750c0a148b33f2bbfeef3beb906a93cbd11c +Subproject commit 7cd07b4ec87d47f3f87a7b1110f0fcc5bc448aeb diff --git a/friction.csproj b/friction.csproj index 47abf9e..355d466 100644 --- a/friction.csproj +++ b/friction.csproj @@ -50,7 +50,7 @@ - + Form @@ -59,17 +59,17 @@ - + Form - - RowPanel.cs + + PanelResult.cs - + Form - - TablePanel.cs + + PanelMaterial.cs MainForm.cs @@ -83,11 +83,11 @@ True Resources.resx - - RowPanel.cs + + PanelResult.cs - - TablePanel.cs + + PanelMaterial.cs