- 글자 크기와 툴바 아이콘 크기 조정

- Material compatibility table 리포트에 추가
- Material compatibility table 정렬되지 않도록
- 탭 패널 아이콘 적용

Radar Graph
- 항목의 폰트 크기 조정
- 영역에 색 지정 데이터는 라인으로
- 이 창을 띄울 땐 무조건 All이 선택되도록
- 데이터가 3개보다 적을 때 팝업

Trend Graph
- 재질 쌍 표시
- 영역 색을 조정

Analysis Table
- 재질 더블클릭 시 Material Table이 선택
This commit is contained in:
2017-06-28 01:26:07 +09:00
parent fae1f8b7c9
commit 879b3abda4
22 changed files with 37375 additions and 129 deletions

65
MainForm.Designer.cs generated
View File

@@ -66,7 +66,10 @@
// //
// toolStripMain // toolStripMain
// //
this.toolStripMain.AutoSize = false;
this.toolStripMain.Font = new System.Drawing.Font("Malgun Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.toolStripMain.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.toolStripMain.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
this.toolStripMain.ImageScalingSize = new System.Drawing.Size(24, 24);
this.toolStripMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripButtonOpen, this.toolStripButtonOpen,
this.toolStripSeparator1, this.toolStripSeparator1,
@@ -78,20 +81,21 @@
this.toolStripSeparator2, this.toolStripSeparator2,
this.toolStripButtonRadarGraph, this.toolStripButtonRadarGraph,
this.toolStripButtonTrendGraph}); this.toolStripButtonTrendGraph});
this.toolStripMain.Location = new System.Drawing.Point(0, 24); this.toolStripMain.Location = new System.Drawing.Point(0, 28);
this.toolStripMain.Name = "toolStripMain"; this.toolStripMain.Name = "toolStripMain";
this.toolStripMain.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; this.toolStripMain.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
this.toolStripMain.Size = new System.Drawing.Size(1184, 25); this.toolStripMain.Size = new System.Drawing.Size(1184, 32);
this.toolStripMain.TabIndex = 0; this.toolStripMain.TabIndex = 0;
this.toolStripMain.Text = "toolStrip1"; this.toolStripMain.Text = "toolStrip1";
// //
// toolStripButtonOpen // toolStripButtonOpen
// //
this.toolStripButtonOpen.AutoSize = false;
this.toolStripButtonOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripButtonOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButtonOpen.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonOpen.Image"))); this.toolStripButtonOpen.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonOpen.Image")));
this.toolStripButtonOpen.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonOpen.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonOpen.Name = "toolStripButtonOpen"; this.toolStripButtonOpen.Name = "toolStripButtonOpen";
this.toolStripButtonOpen.Size = new System.Drawing.Size(23, 22); this.toolStripButtonOpen.Size = new System.Drawing.Size(32, 29);
this.toolStripButtonOpen.Text = "Open DB"; this.toolStripButtonOpen.Text = "Open DB";
this.toolStripButtonOpen.ToolTipText = "Open DB (Ctrl+O)"; this.toolStripButtonOpen.ToolTipText = "Open DB (Ctrl+O)";
this.toolStripButtonOpen.Click += new System.EventHandler(this.toolStripButtonOpen_Click); this.toolStripButtonOpen.Click += new System.EventHandler(this.toolStripButtonOpen_Click);
@@ -99,7 +103,7 @@
// toolStripSeparator1 // toolStripSeparator1
// //
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); this.toolStripSeparator1.Size = new System.Drawing.Size(6, 32);
// //
// toolStripButtonMaterial // toolStripButtonMaterial
// //
@@ -107,7 +111,7 @@
this.toolStripButtonMaterial.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonMaterial.Image"))); this.toolStripButtonMaterial.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonMaterial.Image")));
this.toolStripButtonMaterial.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonMaterial.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonMaterial.Name = "toolStripButtonMaterial"; this.toolStripButtonMaterial.Name = "toolStripButtonMaterial";
this.toolStripButtonMaterial.Size = new System.Drawing.Size(23, 22); this.toolStripButtonMaterial.Size = new System.Drawing.Size(23, 29);
this.toolStripButtonMaterial.Text = "toolStripButton1"; this.toolStripButtonMaterial.Text = "toolStripButton1";
this.toolStripButtonMaterial.ToolTipText = "Material Pair (Ctrl+M)"; this.toolStripButtonMaterial.ToolTipText = "Material Pair (Ctrl+M)";
this.toolStripButtonMaterial.Click += new System.EventHandler(this.toolStripButtonMaterial_Click); this.toolStripButtonMaterial.Click += new System.EventHandler(this.toolStripButtonMaterial_Click);
@@ -115,7 +119,7 @@
// toolStripSeparator3 // toolStripSeparator3
// //
this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25); this.toolStripSeparator3.Size = new System.Drawing.Size(6, 32);
// //
// toolStripButtonResult // toolStripButtonResult
// //
@@ -123,7 +127,7 @@
this.toolStripButtonResult.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonResult.Image"))); this.toolStripButtonResult.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonResult.Image")));
this.toolStripButtonResult.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonResult.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonResult.Name = "toolStripButtonResult"; this.toolStripButtonResult.Name = "toolStripButtonResult";
this.toolStripButtonResult.Size = new System.Drawing.Size(23, 22); this.toolStripButtonResult.Size = new System.Drawing.Size(23, 29);
this.toolStripButtonResult.Text = "toolStripButton1"; this.toolStripButtonResult.Text = "toolStripButton1";
this.toolStripButtonResult.ToolTipText = "Result Table (Ctrl+R)"; this.toolStripButtonResult.ToolTipText = "Result Table (Ctrl+R)";
this.toolStripButtonResult.Click += new System.EventHandler(this.toolStripButtonResult_Click); this.toolStripButtonResult.Click += new System.EventHandler(this.toolStripButtonResult_Click);
@@ -134,7 +138,7 @@
this.toolStripButtonAnalysis.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonAnalysis.Image"))); this.toolStripButtonAnalysis.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonAnalysis.Image")));
this.toolStripButtonAnalysis.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonAnalysis.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonAnalysis.Name = "toolStripButtonAnalysis"; this.toolStripButtonAnalysis.Name = "toolStripButtonAnalysis";
this.toolStripButtonAnalysis.Size = new System.Drawing.Size(23, 22); this.toolStripButtonAnalysis.Size = new System.Drawing.Size(23, 29);
this.toolStripButtonAnalysis.Text = "toolStripButton2"; this.toolStripButtonAnalysis.Text = "toolStripButton2";
this.toolStripButtonAnalysis.ToolTipText = "Analysis Table (Ctrl+A)"; this.toolStripButtonAnalysis.ToolTipText = "Analysis Table (Ctrl+A)";
this.toolStripButtonAnalysis.Click += new System.EventHandler(this.toolStripButtonAnalysis_Click); this.toolStripButtonAnalysis.Click += new System.EventHandler(this.toolStripButtonAnalysis_Click);
@@ -145,7 +149,7 @@
this.toolStripButtonMap.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonMap.Image"))); this.toolStripButtonMap.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonMap.Image")));
this.toolStripButtonMap.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonMap.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonMap.Name = "toolStripButtonMap"; this.toolStripButtonMap.Name = "toolStripButtonMap";
this.toolStripButtonMap.Size = new System.Drawing.Size(23, 22); this.toolStripButtonMap.Size = new System.Drawing.Size(23, 29);
this.toolStripButtonMap.Text = "toolStripButton1"; this.toolStripButtonMap.Text = "toolStripButton1";
this.toolStripButtonMap.ToolTipText = "Material Compatibility Map"; this.toolStripButtonMap.ToolTipText = "Material Compatibility Map";
this.toolStripButtonMap.Click += new System.EventHandler(this.toolStripButtonMap_Click); this.toolStripButtonMap.Click += new System.EventHandler(this.toolStripButtonMap_Click);
@@ -153,7 +157,7 @@
// toolStripSeparator2 // toolStripSeparator2
// //
this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); this.toolStripSeparator2.Size = new System.Drawing.Size(6, 32);
// //
// toolStripButtonRadarGraph // toolStripButtonRadarGraph
// //
@@ -161,7 +165,7 @@
this.toolStripButtonRadarGraph.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonRadarGraph.Image"))); this.toolStripButtonRadarGraph.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonRadarGraph.Image")));
this.toolStripButtonRadarGraph.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonRadarGraph.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonRadarGraph.Name = "toolStripButtonRadarGraph"; this.toolStripButtonRadarGraph.Name = "toolStripButtonRadarGraph";
this.toolStripButtonRadarGraph.Size = new System.Drawing.Size(23, 22); this.toolStripButtonRadarGraph.Size = new System.Drawing.Size(23, 29);
this.toolStripButtonRadarGraph.Text = "toolStripButton3"; this.toolStripButtonRadarGraph.Text = "toolStripButton3";
this.toolStripButtonRadarGraph.ToolTipText = "Radar Graph (Ctrl+D)"; this.toolStripButtonRadarGraph.ToolTipText = "Radar Graph (Ctrl+D)";
this.toolStripButtonRadarGraph.Click += new System.EventHandler(this.toolStripButtonRadarGraph_Click); this.toolStripButtonRadarGraph.Click += new System.EventHandler(this.toolStripButtonRadarGraph_Click);
@@ -172,7 +176,7 @@
this.toolStripButtonTrendGraph.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonTrendGraph.Image"))); this.toolStripButtonTrendGraph.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonTrendGraph.Image")));
this.toolStripButtonTrendGraph.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonTrendGraph.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonTrendGraph.Name = "toolStripButtonTrendGraph"; this.toolStripButtonTrendGraph.Name = "toolStripButtonTrendGraph";
this.toolStripButtonTrendGraph.Size = new System.Drawing.Size(23, 22); this.toolStripButtonTrendGraph.Size = new System.Drawing.Size(23, 29);
this.toolStripButtonTrendGraph.Text = "toolStripButton4"; this.toolStripButtonTrendGraph.Text = "toolStripButton4";
this.toolStripButtonTrendGraph.ToolTipText = "Trend Graph (Ctrl+T)"; this.toolStripButtonTrendGraph.ToolTipText = "Trend Graph (Ctrl+T)";
this.toolStripButtonTrendGraph.Click += new System.EventHandler(this.toolStripButtonTrendGraph_Click); this.toolStripButtonTrendGraph.Click += new System.EventHandler(this.toolStripButtonTrendGraph_Click);
@@ -196,6 +200,7 @@
// menuStrip // menuStrip
// //
this.menuStrip.BackColor = System.Drawing.SystemColors.Control; this.menuStrip.BackColor = System.Drawing.SystemColors.Control;
this.menuStrip.Font = new System.Drawing.Font("Malgun Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem, this.fileToolStripMenuItem,
this.tableToolStripMenuItem, this.tableToolStripMenuItem,
@@ -204,7 +209,7 @@
this.aToolStripMenuItem}); this.aToolStripMenuItem});
this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Location = new System.Drawing.Point(0, 0);
this.menuStrip.Name = "menuStrip"; this.menuStrip.Name = "menuStrip";
this.menuStrip.Size = new System.Drawing.Size(1184, 24); this.menuStrip.Size = new System.Drawing.Size(1184, 28);
this.menuStrip.TabIndex = 3; this.menuStrip.TabIndex = 3;
this.menuStrip.Text = "menuStrip1"; this.menuStrip.Text = "menuStrip1";
// //
@@ -215,26 +220,26 @@
this.recentToolStripMenuItem, this.recentToolStripMenuItem,
this.exitToolStripMenuItem}); this.exitToolStripMenuItem});
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Size = new System.Drawing.Size(44, 24);
this.fileToolStripMenuItem.Text = "File"; this.fileToolStripMenuItem.Text = "File";
// //
// openDBToolStripMenuItem // openDBToolStripMenuItem
// //
this.openDBToolStripMenuItem.Name = "openDBToolStripMenuItem"; this.openDBToolStripMenuItem.Name = "openDBToolStripMenuItem";
this.openDBToolStripMenuItem.Size = new System.Drawing.Size(123, 22); this.openDBToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.openDBToolStripMenuItem.Text = "Open DB"; this.openDBToolStripMenuItem.Text = "Open DB";
this.openDBToolStripMenuItem.Click += new System.EventHandler(this.openDBToolStripMenuItem_Click); this.openDBToolStripMenuItem.Click += new System.EventHandler(this.openDBToolStripMenuItem_Click);
// //
// recentToolStripMenuItem // recentToolStripMenuItem
// //
this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; this.recentToolStripMenuItem.Name = "recentToolStripMenuItem";
this.recentToolStripMenuItem.Size = new System.Drawing.Size(123, 22); this.recentToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.recentToolStripMenuItem.Text = "Recent"; this.recentToolStripMenuItem.Text = "Recent";
// //
// exitToolStripMenuItem // exitToolStripMenuItem
// //
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
this.exitToolStripMenuItem.Size = new System.Drawing.Size(123, 22); this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Text = "Exit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
// //
@@ -245,27 +250,27 @@
this.analysisTableToolStripMenuItem, this.analysisTableToolStripMenuItem,
this.materialCompatibilityMapToolStripMenuItem}); this.materialCompatibilityMapToolStripMenuItem});
this.tableToolStripMenuItem.Name = "tableToolStripMenuItem"; this.tableToolStripMenuItem.Name = "tableToolStripMenuItem";
this.tableToolStripMenuItem.Size = new System.Drawing.Size(47, 20); this.tableToolStripMenuItem.Size = new System.Drawing.Size(58, 24);
this.tableToolStripMenuItem.Text = "Table"; this.tableToolStripMenuItem.Text = "Table";
// //
// resultTableToolStripMenuItem // resultTableToolStripMenuItem
// //
this.resultTableToolStripMenuItem.Name = "resultTableToolStripMenuItem"; this.resultTableToolStripMenuItem.Name = "resultTableToolStripMenuItem";
this.resultTableToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.resultTableToolStripMenuItem.Size = new System.Drawing.Size(266, 24);
this.resultTableToolStripMenuItem.Text = "Result Table"; this.resultTableToolStripMenuItem.Text = "Result Table";
this.resultTableToolStripMenuItem.Click += new System.EventHandler(this.resultTableToolStripMenuItem_Click); this.resultTableToolStripMenuItem.Click += new System.EventHandler(this.resultTableToolStripMenuItem_Click);
// //
// analysisTableToolStripMenuItem // analysisTableToolStripMenuItem
// //
this.analysisTableToolStripMenuItem.Name = "analysisTableToolStripMenuItem"; this.analysisTableToolStripMenuItem.Name = "analysisTableToolStripMenuItem";
this.analysisTableToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.analysisTableToolStripMenuItem.Size = new System.Drawing.Size(266, 24);
this.analysisTableToolStripMenuItem.Text = "Analysis Table"; this.analysisTableToolStripMenuItem.Text = "Analysis Table";
this.analysisTableToolStripMenuItem.Click += new System.EventHandler(this.analysisTableToolStripMenuItem_Click); this.analysisTableToolStripMenuItem.Click += new System.EventHandler(this.analysisTableToolStripMenuItem_Click);
// //
// materialCompatibilityMapToolStripMenuItem // materialCompatibilityMapToolStripMenuItem
// //
this.materialCompatibilityMapToolStripMenuItem.Name = "materialCompatibilityMapToolStripMenuItem"; this.materialCompatibilityMapToolStripMenuItem.Name = "materialCompatibilityMapToolStripMenuItem";
this.materialCompatibilityMapToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.materialCompatibilityMapToolStripMenuItem.Size = new System.Drawing.Size(266, 24);
this.materialCompatibilityMapToolStripMenuItem.Text = "Material Compatibility Map"; this.materialCompatibilityMapToolStripMenuItem.Text = "Material Compatibility Map";
this.materialCompatibilityMapToolStripMenuItem.Click += new System.EventHandler(this.materialCompatibilityMapToolStripMenuItem_Click); this.materialCompatibilityMapToolStripMenuItem.Click += new System.EventHandler(this.materialCompatibilityMapToolStripMenuItem_Click);
// //
@@ -275,13 +280,13 @@
this.radarGraphToolStripMenuItem, this.radarGraphToolStripMenuItem,
this.trendGraphToolStripMenuItem}); this.trendGraphToolStripMenuItem});
this.graphToolStripMenuItem.Name = "graphToolStripMenuItem"; this.graphToolStripMenuItem.Name = "graphToolStripMenuItem";
this.graphToolStripMenuItem.Size = new System.Drawing.Size(51, 20); this.graphToolStripMenuItem.Size = new System.Drawing.Size(63, 24);
this.graphToolStripMenuItem.Text = "Graph"; this.graphToolStripMenuItem.Text = "Graph";
// //
// radarGraphToolStripMenuItem // radarGraphToolStripMenuItem
// //
this.radarGraphToolStripMenuItem.Name = "radarGraphToolStripMenuItem"; this.radarGraphToolStripMenuItem.Name = "radarGraphToolStripMenuItem";
this.radarGraphToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.radarGraphToolStripMenuItem.Size = new System.Drawing.Size(164, 24);
this.radarGraphToolStripMenuItem.Text = "Radar Graph"; this.radarGraphToolStripMenuItem.Text = "Radar Graph";
this.radarGraphToolStripMenuItem.Click += new System.EventHandler(this.radarGraphToolStripMenuItem_Click); this.radarGraphToolStripMenuItem.Click += new System.EventHandler(this.radarGraphToolStripMenuItem_Click);
// //
@@ -289,7 +294,7 @@
// //
this.trendGraphToolStripMenuItem.Enabled = false; this.trendGraphToolStripMenuItem.Enabled = false;
this.trendGraphToolStripMenuItem.Name = "trendGraphToolStripMenuItem"; this.trendGraphToolStripMenuItem.Name = "trendGraphToolStripMenuItem";
this.trendGraphToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.trendGraphToolStripMenuItem.Size = new System.Drawing.Size(164, 24);
this.trendGraphToolStripMenuItem.Text = "Trend Graph"; this.trendGraphToolStripMenuItem.Text = "Trend Graph";
this.trendGraphToolStripMenuItem.Click += new System.EventHandler(this.trendGraphToolStripMenuItem_Click); this.trendGraphToolStripMenuItem.Click += new System.EventHandler(this.trendGraphToolStripMenuItem_Click);
// //
@@ -298,13 +303,13 @@
this.reportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.reportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.allToolStripMenuItem}); this.allToolStripMenuItem});
this.reportToolStripMenuItem.Name = "reportToolStripMenuItem"; this.reportToolStripMenuItem.Name = "reportToolStripMenuItem";
this.reportToolStripMenuItem.Size = new System.Drawing.Size(54, 20); this.reportToolStripMenuItem.Size = new System.Drawing.Size(66, 24);
this.reportToolStripMenuItem.Text = "Report"; this.reportToolStripMenuItem.Text = "Report";
// //
// allToolStripMenuItem // allToolStripMenuItem
// //
this.allToolStripMenuItem.Name = "allToolStripMenuItem"; this.allToolStripMenuItem.Name = "allToolStripMenuItem";
this.allToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.allToolStripMenuItem.Size = new System.Drawing.Size(179, 24);
this.allToolStripMenuItem.Text = "Export to Excel"; this.allToolStripMenuItem.Text = "Export to Excel";
this.allToolStripMenuItem.Click += new System.EventHandler(this.allToolStripMenuItem_Click); this.allToolStripMenuItem.Click += new System.EventHandler(this.allToolStripMenuItem_Click);
// //
@@ -313,13 +318,13 @@
this.aToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.aToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.aboutToolStripMenuItem}); this.aboutToolStripMenuItem});
this.aToolStripMenuItem.Name = "aToolStripMenuItem"; this.aToolStripMenuItem.Name = "aToolStripMenuItem";
this.aToolStripMenuItem.Size = new System.Drawing.Size(44, 20); this.aToolStripMenuItem.Size = new System.Drawing.Size(53, 24);
this.aToolStripMenuItem.Text = "Help"; this.aToolStripMenuItem.Text = "Help";
// //
// aboutToolStripMenuItem // aboutToolStripMenuItem
// //
this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
this.aboutToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.aboutToolStripMenuItem.Size = new System.Drawing.Size(120, 24);
this.aboutToolStripMenuItem.Text = "About"; this.aboutToolStripMenuItem.Text = "About";
this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
// //
@@ -327,9 +332,9 @@
// //
this.dockPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.dockPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.dockPanel.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingWindow; this.dockPanel.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingWindow;
this.dockPanel.Location = new System.Drawing.Point(0, 49); this.dockPanel.Location = new System.Drawing.Point(0, 60);
this.dockPanel.Name = "dockPanel"; this.dockPanel.Name = "dockPanel";
this.dockPanel.Size = new System.Drawing.Size(1184, 690); this.dockPanel.Size = new System.Drawing.Size(1184, 679);
this.dockPanel.TabIndex = 2; this.dockPanel.TabIndex = 2;
// //
// MainForm // MainForm

View File

@@ -42,6 +42,8 @@ namespace friction
Theme.Apply(toolStripMain); Theme.Apply(toolStripMain);
Theme.Apply(statusStrip); Theme.Apply(statusStrip);
dockPanel.Font = new Font(dockPanel.Font.FontFamily, 12.0f);
Config.Init(); Config.Init();
UpdateRecentFile(); UpdateRecentFile();
if(Config.OPTION.WindowBound.Width > 0) if(Config.OPTION.WindowBound.Width > 0)
@@ -101,6 +103,8 @@ namespace friction
m_AnalysisPanel.UpdateData(m_DataHandler); m_AnalysisPanel.UpdateData(m_DataHandler);
OpenPanel(m_AnalysisPanel); OpenPanel(m_AnalysisPanel);
m_CompatibilityPanel.UpdateData(m_DataHandler);
toolStripStatusLabel.Text = m_DBFileName; toolStripStatusLabel.Text = m_DBFileName;
Config.OPTION.AddRecentFile(m_DBFileName); Config.OPTION.AddRecentFile(m_DBFileName);
@@ -116,7 +120,9 @@ namespace friction
if (panel.IsHidden == true) if (panel.IsHidden == true)
panel.IsHidden = false; panel.IsHidden = false;
if(panel.DockState == DockState.DockTopAutoHide || panel.ShowIcon = true;
if (panel.DockState == DockState.DockTopAutoHide ||
panel.DockState == DockState.DockBottomAutoHide || panel.DockState == DockState.DockBottomAutoHide ||
panel.DockState == DockState.DockLeftAutoHide || panel.DockState == DockState.DockLeftAutoHide ||
panel.DockState == DockState.DockRightAutoHide) panel.DockState == DockState.DockRightAutoHide)
@@ -183,6 +189,7 @@ namespace friction
m_Report.MaterialSpring = m_DataHandler.GetCurSpring(); m_Report.MaterialSpring = m_DataHandler.GetCurSpring();
m_Report.MaterialTable = m_DataHandler.GetCurTable(); m_Report.MaterialTable = m_DataHandler.GetCurTable();
m_Report.AnalysisData = m_AnalysisPanel.GetData(); m_Report.AnalysisData = m_AnalysisPanel.GetData();
m_Report.CompatibilityData = m_CompatibilityPanel.GetData();
m_Report.RadarChart = m_RadarGraphPanel.CopyChart(); m_Report.RadarChart = m_RadarGraphPanel.CopyChart();
@@ -277,7 +284,7 @@ namespace friction
#endregion #endregion
#region Events from panels #region Events from panels
public void OnApplyData(string strSpring, string strTable) public void OnApplyData(object sender, string strSpring, string strTable)
{ {
Console.WriteLine("[MainForm::OnApply] start"); Console.WriteLine("[MainForm::OnApply] start");
@@ -302,6 +309,9 @@ namespace friction
m_TrendGraphPanel.UpdateGraph(); m_TrendGraphPanel.UpdateGraph();
} }
if (sender != m_MaterialPanel)
m_MaterialPanel.SelectTable(strTable);
m_AnalysisPanel.UpdateData(m_DataHandler); m_AnalysisPanel.UpdateData(m_DataHandler);
} }

View File

@@ -167,34 +167,34 @@
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAELSURBVDhPYxhcwH/7dgXv3ZsdoFwMAJIDqYFyMYHvzs0N YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAELSURBVDhPYxhcwH/7dgXv3ZsdoFwMAJIDqYFyMYHvzs0N
vru2/IdyMQBIDqQGykUFKYuPvY9ffPBr/Pyjv0FsbDhu8cFfyfMPfgOxodoQwHfi7v+kYKg2BGjff+N/ vru2/IdyMQBIDqQGykUFKYuPvY9bfOBr/Pyjv0FsbDh28YFfyfMOfAOxodoQwHfi7v+kYKg2BGjff+N/
274b/1uBuBmIm/Ze/98IxPVAXLfn+v+aPdf+V+++9r8SiqHaEODw26//97z6+H/rs7f/QWwQDeJjEzvw 274b/1uBuBmIm/Ze/98IxPVAXLfn+v+aPdf+V+++9r8SiqHaEODw26//97z6+H/rs7f/QWwQDeJjEzvw
9gt2AxovXv4PCqgtLz+D6aKzF7GKgdRCtSEASHD5wxf/W67cAtry5X/n1dv/Z917hlUMpwEzb9//n3vq 9gt2AxovXv4PCqgtLz+D6aKzF7GKgdRCtSEASHD5wxf/W67cAtry5X/n1dv/Z917hlUMpwEzb9//n3vq
FFhxwenT//tv3MMqhtOA9qvX/4fs2w12bhiQLrtwFasYTgNIwVBtCHD49WcHUjBU24ADBgYAPIaMIohq FFhxwenT//tv3MMqhtOA9qvX/4fs2w12bhiQLrtwFasYTgNIwVBtCHD49WcHUjBU24ADBgYAKxuMHM+h
wJwAAAAASUVORK5CYII= n2IAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="toolStripButtonRadarGraph.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="toolStripButtonRadarGraph.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFbSURBVDhPYxh8wGfmJi6fSbtLfSfuPu8ycffPyP27/hft YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFbSURBVDhPYxh8wGfmJi6fSbtLfSfuPu88cffPyP27/hft
3/81a/uRTZlbDgtClWEHXlP2yvv2774O1PwfhlOOHvhfdeE0GBcfO/EjZeN+C6hyVACyGV0zCOedOgo3 3/81a/uRTZlbDgtClWEHXlP2yvv2774O1PwfhlOOHvhfdeE0GBcfO/EjZeN+C6hyVACyGV0zCOedOgo3
AGZI6O4z/FBtCOA7YU8Zumbvvp1X848d/45sAAhn7Dy2AaoNAYC2X0AxYNLOBKgUQ/qOw7ORDQCFCVQK AGZI6O4z/FBtCOA7YU8Zumbvvp1X848d/45sAAhn7Dy2AaoNAYC2X0AxYNLOBKgUQ/qOw7ORDQCFCVQK
AUABhmwzVBgOQE6HGVB57tR/qDACIBvgNXHXFagwBPz/z7jiwZsfu199/r/1xaf/q5++xzTAu3/HOZgB AUABhmwzVBgOQE6HGVB57tR/qDACIBvgNXHXFagwBPz/z7j8wZsfu199/r/1xaf/q5++xzTAu3/HOZgB
IOwzYVciVIqhfNP5tsNvv/6H4bV3Xn2BSiGAz8TdRcgGQPE1MJ6w+3/55otwA6adfrAWqg0BQnqPcYKc IOwzYVciVIqhfNP5tsNvv/6H4bV3Xn2BSiGAz8TdRcgGQPE1MJ6w+3/55otwA6adfrAWqg0BQnqPcYKc
jmYAHHtP2PU/ffnJ/+uvvv5ef+IWH1QbKvCZsFsOnyFuvTtuJs3ZbwJVjh3Yz9/PAfHOrrO+/Zu+g/HE jmYAHHtP2PU/ffnJ/+uvvP5ef+IWH1QbKvCZsFsOnyFuvTtuJs3ZbwJVjh3Yz9/PAfHOrrO+/Ru/g/HE
3WeA/AKQHFTZoAEMDACJ+j5OaUipqgAAAABJRU5ErkJggg== 3WeA/AKQHFTZoAEMDAB+FD5H91aCSgAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="toolStripButtonTrendGraph.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="toolStripButtonTrendGraph.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEpSURBVDhPY6A7COk9xuk1Za88lIsdBE7bKeY7aac1lIsC YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEpSURBVDhPY6A7COk9xuk1Za88lIsdBE7bKeY7aac1lIsC
/CbtXunbsemfV/8uTagQJvCdtHuT78Td//2n7DSACoHB8RefxTsP3rruM2Hnbv/+/QJQYUww6eitw3Hz /CbtXunbvvGfV/8uTagQJvCdtHuT78Td//2n7DSACoHB8RefxTsP3rruM2Hnbv/+/QJQYUww6eitw3Hz
D23d8+LDgcNvPrvaz9/PceDtZ91Dr7+sKD17Vqrq/MlAqFJMcOjNl7pNj14EVJ47ZQ/iL732vNuna/Ov D23d8+LDgcNvPrvaz9/PceDtZ91Dr7+sKD17Vqrq/MlAqFJMcOjNl7pNj14EVJ47ZQ/iL732vNunc9Ov
vDUnL4H45edO6FedPz0BxMYAB998DT785msOsiK/ybukAibte+IzcVc1iI/VALfeHULBk/ccb9595QCI vDUnL4H45edO6FedPz0BxMYAB998DT785msOsiK/ybukAibte+IzcVc1iI/VALfeHULBk/ccb9595QCI
j66o8vyZgKrzx6RBbKwGgELUZeLuv74Tdi0B8TEMuHC6H+hvcIBiNQAE0nccds3YeVQMxCbLAHyKRooB j66o8vyZgKrzx6RBbKwGgELUeeLuv74Tdi0B8TEMuHC6H+hvcIBiNQAE0nccds3YeVQMxCbLAHyKRooB
oBRWeOwYJ4hdf38/ByzaQACfHIWAgQEA8cf9UGxcQysAAAAASUVORK5CYII= oBRWeOwYJ4hdf38/ByzaQACfHIWAgQEA49D9S+nmzuwAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -28,6 +28,7 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PanelAnalysis));
this.dgvAnalysis = new System.Windows.Forms.DataGridView(); this.dgvAnalysis = new System.Windows.Forms.DataGridView();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
@@ -59,6 +60,7 @@
this.dgvAnalysis.RowTemplate.Height = 23; this.dgvAnalysis.RowTemplate.Height = 23;
this.dgvAnalysis.Size = new System.Drawing.Size(856, 546); this.dgvAnalysis.Size = new System.Drawing.Size(856, 546);
this.dgvAnalysis.TabIndex = 0; this.dgvAnalysis.TabIndex = 0;
this.dgvAnalysis.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAnalysis_CellContentDoubleClick);
// //
// tableLayoutPanel1 // tableLayoutPanel1
// //
@@ -214,6 +216,7 @@
this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.dgvAnalysis); this.Controls.Add(this.dgvAnalysis);
this.HideOnClose = true; this.HideOnClose = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "PanelAnalysis"; this.Name = "PanelAnalysis";
this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.Document; this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.Document;
this.TabText = "Analysis Table"; this.TabText = "Analysis Table";

View File

@@ -69,7 +69,7 @@ namespace friction
return; return;
lbSpring.Text = "Material Spring: " +strSpring; lbSpring.Text = "Material Spring: " +strSpring;
lbSpring.ForeColor = Color.Orange; lbSpring.ForeColor = Theme.Orange;
dgvAnalysis.Columns.Clear(); dgvAnalysis.Columns.Clear();
dgvAnalysis.Rows.Clear(); dgvAnalysis.Rows.Clear();
@@ -165,5 +165,14 @@ namespace friction
return dt; return dt;
} }
private void dgvAnalysis_CellContentDoubleClick(object sender, DataGridViewCellEventArgs e)
{
if(dgvAnalysis.Columns[e.ColumnIndex].HeaderText == "Table")
{
string strTable = dgvAnalysis.Rows[e.RowIndex].Cells[e.ColumnIndex].Value as string;
m_Owner.OnApplyData(this, m_CurSpring, strTable);
}
}
} }
} }

File diff suppressed because it is too large Load Diff

View File

@@ -28,6 +28,7 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PanelCompatibility));
this.dgvMap = new System.Windows.Forms.DataGridView(); this.dgvMap = new System.Windows.Forms.DataGridView();
((System.ComponentModel.ISupportInitialize)(this.dgvMap)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvMap)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
@@ -52,6 +53,7 @@
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.dgvMap); this.Controls.Add(this.dgvMap);
this.HideOnClose = true; this.HideOnClose = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "PanelCompatibility"; this.Name = "PanelCompatibility";
this.Text = "Material Compatibility Map"; this.Text = "Material Compatibility Map";
((System.ComponentModel.ISupportInitialize)(this.dgvMap)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvMap)).EndInit();

View File

@@ -44,6 +44,7 @@ namespace friction
{ {
int iCol = dgvMap.Columns.Add(table, table); int iCol = dgvMap.Columns.Add(table, table);
dgvMap.Columns[iCol].Width = 29; dgvMap.Columns[iCol].Width = 29;
dgvMap.Columns[iCol].SortMode = DataGridViewColumnSortMode.NotSortable;
} }
foreach (var spring in Springs) foreach (var spring in Springs)
@@ -76,6 +77,28 @@ namespace friction
} }
} }
public DataTable GetData()
{
var dt = new DataTable();
dt.Columns.Add(" ");
foreach (DataGridViewColumn column in dgvMap.Columns)
{
if (column.Visible)
dt.Columns.Add(column.HeaderText);
}
object[] cellValues = new object[dgvMap.Columns.Count+1];
foreach (DataGridViewRow row in dgvMap.Rows)
{
cellValues[0] = row.HeaderCell.Value;
for (int i = 0; i < row.Cells.Count; i++)
cellValues[i+1] = row.Cells[i].Value;
dt.Rows.Add(cellValues);
}
return dt;
}
private void DgvMap_CellPainting(object sender, DataGridViewCellPaintingEventArgs e) private void DgvMap_CellPainting(object sender, DataGridViewCellPaintingEventArgs e)
{ {
DataGridView view = sender as DataGridView; DataGridView view = sender as DataGridView;

File diff suppressed because it is too large Load Diff

View File

@@ -28,6 +28,7 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PanelMaterial));
this.lbFileName = new System.Windows.Forms.Label(); this.lbFileName = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
@@ -139,6 +140,7 @@
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.tableLayoutPanel1);
this.HideOnClose = true; this.HideOnClose = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "PanelMaterial"; this.Name = "PanelMaterial";
this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.DockLeft; this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.DockLeft;
this.TabText = "Material Pair"; this.TabText = "Material Pair";

View File

@@ -76,10 +76,10 @@ namespace friction
m_SelectedSpring = lvSpring.Items[iIdx]; m_SelectedSpring = lvSpring.Items[iIdx];
m_SelectedSpring.Font = new Font(lvSpring.Font, FontStyle.Bold); m_SelectedSpring.Font = new Font(lvSpring.Font, FontStyle.Bold);
m_SelectedSpring.ForeColor = Color.Orange; m_SelectedSpring.ForeColor = Theme.Orange;
if(m_SelectedSpring != null && m_SelectedTable != null) if(m_SelectedSpring != null && m_SelectedTable != null)
m_Owner.OnApplyData(m_SelectedSpring.Text, m_SelectedTable.Text); m_Owner.OnApplyData(this, m_SelectedSpring.Text, m_SelectedTable.Text);
} }
private void SelectTable(int iIdx) private void SelectTable(int iIdx)
@@ -92,10 +92,30 @@ namespace friction
m_SelectedTable = lvTable.Items[iIdx]; m_SelectedTable = lvTable.Items[iIdx];
m_SelectedTable.Font = new Font(lvTable.Font, FontStyle.Bold); m_SelectedTable.Font = new Font(lvTable.Font, FontStyle.Bold);
m_SelectedTable.ForeColor = Color.Orange; m_SelectedTable.ForeColor = Theme.Orange;
if (m_SelectedSpring != null && m_SelectedTable != null) if (m_SelectedSpring != null && m_SelectedTable != null)
m_Owner.OnApplyData(m_SelectedSpring.Text, m_SelectedTable.Text); m_Owner.OnApplyData(this, m_SelectedSpring.Text, m_SelectedTable.Text);
}
public void SelectTable(string strTable)
{
if (m_SelectedTable != null)
{
m_SelectedTable.Font = lvTable.Font;
m_SelectedTable.ForeColor = Theme.Forecolor;
}
foreach(ListViewItem item in lvTable.Items)
{
if(item.Text == strTable)
{
m_SelectedTable = item;
item.Font = new Font(lvTable.Font, FontStyle.Bold);
item.ForeColor = Theme.Orange;
break;
}
}
} }
private void lvSpring_MouseDoubleClick(object sender, MouseEventArgs e) private void lvSpring_MouseDoubleClick(object sender, MouseEventArgs e)

File diff suppressed because it is too large Load Diff

View File

@@ -28,14 +28,15 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea3 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend(); System.Windows.Forms.DataVisualization.Charting.Legend legend3 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series(); System.Windows.Forms.DataVisualization.Charting.Series series13 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series(); System.Windows.Forms.DataVisualization.Charting.Series series14 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series(); System.Windows.Forms.DataVisualization.Charting.Series series15 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series4 = new System.Windows.Forms.DataVisualization.Charting.Series(); System.Windows.Forms.DataVisualization.Charting.Series series16 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series5 = new System.Windows.Forms.DataVisualization.Charting.Series(); System.Windows.Forms.DataVisualization.Charting.Series series17 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series6 = new System.Windows.Forms.DataVisualization.Charting.Series(); System.Windows.Forms.DataVisualization.Charting.Series series18 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PanelRadarGraph));
this.chart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.chart = new System.Windows.Forms.DataVisualization.Charting.Chart();
this.lbSpring = new System.Windows.Forms.Label(); this.lbSpring = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit();
@@ -46,62 +47,62 @@
this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
chartArea1.Area3DStyle.Enable3D = true; chartArea3.Area3DStyle.Enable3D = true;
chartArea1.AxisX.MajorGrid.Enabled = false; chartArea3.AxisX.MajorGrid.Enabled = false;
chartArea1.AxisX.MajorTickMark.LineWidth = 0; chartArea3.AxisX.MajorTickMark.LineWidth = 0;
chartArea1.AxisX2.MajorGrid.Enabled = false; chartArea3.AxisX2.MajorGrid.Enabled = false;
chartArea1.BackImageTransparentColor = System.Drawing.Color.Black; chartArea3.BackImageTransparentColor = System.Drawing.Color.Black;
chartArea1.Name = "ChartArea1"; chartArea3.Name = "ChartArea1";
this.chart.ChartAreas.Add(chartArea1); this.chart.ChartAreas.Add(chartArea3);
legend1.Name = "Legend1"; legend3.Name = "Legend1";
this.chart.Legends.Add(legend1); this.chart.Legends.Add(legend3);
this.chart.Location = new System.Drawing.Point(12, 27); this.chart.Location = new System.Drawing.Point(12, 27);
this.chart.Name = "chart"; this.chart.Name = "chart";
series1.ChartArea = "ChartArea1"; series13.ChartArea = "ChartArea1";
series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Radar; series13.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Radar;
series1.IsVisibleInLegend = false; series13.IsVisibleInLegend = false;
series1.Legend = "Legend1"; series13.Legend = "Legend1";
series1.LegendText = "High Risk"; series13.LegendText = "High Risk";
series1.MarkerSize = 0; series13.MarkerSize = 0;
series1.Name = "SeriesHigh"; series13.Name = "SeriesHigh";
series2.ChartArea = "ChartArea1"; series14.ChartArea = "ChartArea1";
series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Radar; series14.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Radar;
series2.IsVisibleInLegend = false; series14.IsVisibleInLegend = false;
series2.Legend = "Legend1"; series14.Legend = "Legend1";
series2.LegendText = "Potential Risk"; series14.LegendText = "Potential Risk";
series2.MarkerSize = 0; series14.MarkerSize = 0;
series2.Name = "SeriesPotential"; series14.Name = "SeriesPotential";
series3.ChartArea = "ChartArea1"; series15.ChartArea = "ChartArea1";
series3.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Radar; series15.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Radar;
series3.IsVisibleInLegend = false; series15.IsVisibleInLegend = false;
series3.Legend = "Legend1"; series15.Legend = "Legend1";
series3.LegendText = "No Risk"; series15.LegendText = "No Risk";
series3.MarkerSize = 0; series15.MarkerSize = 0;
series3.Name = "SeriesNo"; series15.Name = "SeriesNo";
series4.ChartArea = "ChartArea1"; series16.ChartArea = "ChartArea1";
series4.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Radar; series16.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Radar;
series4.Legend = "Legend1"; series16.Legend = "Legend1";
series4.LegendText = "Max"; series16.LegendText = "Max";
series4.MarkerSize = 0; series16.MarkerSize = 0;
series4.Name = "SeriesMax"; series16.Name = "SeriesMax";
series5.ChartArea = "ChartArea1"; series17.ChartArea = "ChartArea1";
series5.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Radar; series17.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Radar;
series5.Legend = "Legend1"; series17.Legend = "Legend1";
series5.LegendText = "Average"; series17.LegendText = "Average";
series5.MarkerSize = 0; series17.MarkerSize = 0;
series5.Name = "SeriesAvg"; series17.Name = "SeriesAvg";
series6.ChartArea = "ChartArea1"; series18.ChartArea = "ChartArea1";
series6.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Radar; series18.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Radar;
series6.Legend = "Legend1"; series18.Legend = "Legend1";
series6.LegendText = "Min"; series18.LegendText = "Min";
series6.MarkerSize = 0; series18.MarkerSize = 0;
series6.Name = "SeriesMin"; series18.Name = "SeriesMin";
this.chart.Series.Add(series1); this.chart.Series.Add(series13);
this.chart.Series.Add(series2); this.chart.Series.Add(series14);
this.chart.Series.Add(series3); this.chart.Series.Add(series15);
this.chart.Series.Add(series4); this.chart.Series.Add(series16);
this.chart.Series.Add(series5); this.chart.Series.Add(series17);
this.chart.Series.Add(series6); this.chart.Series.Add(series18);
this.chart.Size = new System.Drawing.Size(791, 620); this.chart.Size = new System.Drawing.Size(791, 620);
this.chart.TabIndex = 0; this.chart.TabIndex = 0;
this.chart.Text = "chart"; this.chart.Text = "chart";
@@ -124,10 +125,12 @@
this.Controls.Add(this.lbSpring); this.Controls.Add(this.lbSpring);
this.Controls.Add(this.chart); this.Controls.Add(this.chart);
this.HideOnClose = true; this.HideOnClose = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "PanelRadarGraph"; this.Name = "PanelRadarGraph";
this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.Document; this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.Document;
this.TabText = "Radar Graph"; this.TabText = "Radar Graph";
this.Text = "Radar Graph"; this.Text = "Radar Graph";
this.VisibleChanged += new System.EventHandler(this.PanelRadarGraph_VisibleChanged);
((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();

View File

@@ -20,6 +20,7 @@ namespace friction
DataHandler m_DataHandler = null; DataHandler m_DataHandler = null;
string m_CurSpring = ""; string m_CurSpring = "";
bool m_bShowAlert = false;
public PanelRadarGraph(MainForm owner, DataHandler data) public PanelRadarGraph(MainForm owner, DataHandler data)
{ {
@@ -33,13 +34,36 @@ namespace friction
chart.ChartAreas[0].AxisY.Maximum = 10; chart.ChartAreas[0].AxisY.Maximum = 10;
chart.Series["SeriesHigh"].Color = Color.FromArgb(255, 200, 200, 200); //chart.Series["SeriesHigh"].Color = Color.FromArgb(255, 200, 200, 200);
chart.Series["SeriesPotential"].Color = Color.FromArgb(255, 180, 180, 180); //chart.Series["SeriesPotential"].Color = Color.FromArgb(255, 180, 180, 180);
chart.Series["SeriesNo"].Color = Color.FromArgb(255, 140, 140, 140); //chart.Series["SeriesNo"].Color = Color.FromArgb(255, 140, 140, 140);
chart.Series["SeriesHigh"].Color = Theme.Red;
chart.Series["SeriesHigh"].Font = new Font(chart.Series["SeriesNo"].Font.FontFamily, 20.0f);
chart.Series["SeriesPotential"].Color = Theme.Yellow;
chart.Series["SeriesPotential"].Font = new Font(chart.Series["SeriesNo"].Font.FontFamily, 20.0f);
chart.Series["SeriesNo"].Color = Theme.Green;
chart.Series["SeriesNo"].Font = new Font(chart.Series["SeriesNo"].Font.FontFamily, 20.0f);
chart.Series["SeriesMax"].Color = Theme.Red; chart.Series["SeriesMax"].Color = Theme.Red;
chart.Series["SeriesMax"]["RadarDrawingStyle"] = "Line";
chart.Series["SeriesMax"].BorderWidth = 3;
chart.Series["SeriesMax"].Font = new Font(chart.Series["SeriesNo"].Font.FontFamily, 20.0f);
chart.Series["SeriesAvg"].Color = Theme.Yellow; chart.Series["SeriesAvg"].Color = Theme.Yellow;
chart.Series["SeriesAvg"]["RadarDrawingStyle"] = "Line";
chart.Series["SeriesAvg"].BorderWidth = 3;
chart.Series["SeriesAvg"].Font = new Font(chart.Series["SeriesNo"].Font.FontFamily, 20.0f);
chart.Series["SeriesMin"].Color = Theme.Green; chart.Series["SeriesMin"].Color = Theme.Green;
chart.Series["SeriesMin"]["RadarDrawingStyle"] = "Line";
chart.Series["SeriesMin"].BorderWidth = 3;
chart.Series["SeriesMin"].Font = new Font(chart.Series["SeriesNo"].Font.FontFamily, 20.0f);
chart.ChartAreas[0].AxisX.LabelStyle.Font = new Font(chart.ChartAreas[0].AxisX.LabelStyle.Font.FontFamily, 14.0f);
chart.ChartAreas[0].AxisX.MajorGrid.LineWidth = 1; chart.ChartAreas[0].AxisX.MajorGrid.LineWidth = 1;
chart.ChartAreas[0].AxisY.MajorGrid.LineWidth = 1; chart.ChartAreas[0].AxisY.MajorGrid.LineWidth = 1;
@@ -68,7 +92,7 @@ namespace friction
lbSpring.Text = "Material Spring: " + strSpring; lbSpring.Text = "Material Spring: " + strSpring;
lbSpring.BackColor = Color.Transparent; lbSpring.BackColor = Color.Transparent;
lbSpring.ForeColor = Color.Orange; lbSpring.ForeColor = Theme.Orange;
foreach (var series in chart.Series) foreach (var series in chart.Series)
series.Points.Clear(); series.Points.Clear();
@@ -90,6 +114,14 @@ namespace friction
} }
m_CurSpring = strSpring; m_CurSpring = strSpring;
if (graphData.Count < 3)
{
if (Visible == true)
MessageBox.Show(this, "데이터가 부족합니다");
else
m_bShowAlert = true;
}
} }
public Bitmap CopyChart() public Bitmap CopyChart()
@@ -110,5 +142,14 @@ namespace friction
m_Owner.OnRadarSelectTable(strTable); m_Owner.OnRadarSelectTable(strTable);
} }
} }
private void PanelRadarGraph_VisibleChanged(object sender, EventArgs e)
{
if(m_bShowAlert == true)
{
MessageBox.Show(this, "데이터가 부족합니다");
m_bShowAlert = false;
}
}
} }
} }

File diff suppressed because it is too large Load Diff

View File

@@ -28,6 +28,7 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PanelResult));
this.dgvData = new System.Windows.Forms.DataGridView(); this.dgvData = new System.Windows.Forms.DataGridView();
this.lvColumn = new System.Windows.Forms.ListView(); this.lvColumn = new System.Windows.Forms.ListView();
this.lvchColumns = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.lvchColumns = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -83,6 +84,7 @@
this.Controls.Add(this.lvColumn); this.Controls.Add(this.lvColumn);
this.Controls.Add(this.dgvData); this.Controls.Add(this.dgvData);
this.HideOnClose = true; this.HideOnClose = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "PanelResult"; this.Name = "PanelResult";
this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.Document; this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.Document;
this.TabText = "Result Table"; this.TabText = "Result Table";

File diff suppressed because it is too large Load Diff

View File

@@ -28,6 +28,7 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PanelTrendGraph));
this.trendChart = new LiveCharts.WinForms.CartesianChart(); this.trendChart = new LiveCharts.WinForms.CartesianChart();
this.rbHumidity = new System.Windows.Forms.RadioButton(); this.rbHumidity = new System.Windows.Forms.RadioButton();
this.rbTemp = new System.Windows.Forms.RadioButton(); this.rbTemp = new System.Windows.Forms.RadioButton();
@@ -35,6 +36,7 @@
this.rbVelocity = new System.Windows.Forms.RadioButton(); this.rbVelocity = new System.Windows.Forms.RadioButton();
this.rbForce = new System.Windows.Forms.RadioButton(); this.rbForce = new System.Windows.Forms.RadioButton();
this.panelGraph = new System.Windows.Forms.Panel(); this.panelGraph = new System.Windows.Forms.Panel();
this.lbPair = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.panelGraph.SuspendLayout(); this.panelGraph.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
@@ -69,7 +71,7 @@
this.rbTemp.Appearance = System.Windows.Forms.Appearance.Button; this.rbTemp.Appearance = System.Windows.Forms.Appearance.Button;
this.rbTemp.AutoSize = true; this.rbTemp.AutoSize = true;
this.rbTemp.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.rbTemp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.rbTemp.Location = new System.Drawing.Point(76, 20); this.rbTemp.Location = new System.Drawing.Point(77, 19);
this.rbTemp.Name = "rbTemp"; this.rbTemp.Name = "rbTemp";
this.rbTemp.Size = new System.Drawing.Size(89, 24); this.rbTemp.Size = new System.Drawing.Size(89, 24);
this.rbTemp.TabIndex = 1; this.rbTemp.TabIndex = 1;
@@ -96,7 +98,7 @@
this.rbVelocity.Appearance = System.Windows.Forms.Appearance.Button; this.rbVelocity.Appearance = System.Windows.Forms.Appearance.Button;
this.rbVelocity.AutoSize = true; this.rbVelocity.AutoSize = true;
this.rbVelocity.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.rbVelocity.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.rbVelocity.Location = new System.Drawing.Point(226, 19); this.rbVelocity.Location = new System.Drawing.Point(225, 19);
this.rbVelocity.Name = "rbVelocity"; this.rbVelocity.Name = "rbVelocity";
this.rbVelocity.Size = new System.Drawing.Size(62, 24); this.rbVelocity.Size = new System.Drawing.Size(62, 24);
this.rbVelocity.TabIndex = 1; this.rbVelocity.TabIndex = 1;
@@ -109,7 +111,7 @@
this.rbForce.Appearance = System.Windows.Forms.Appearance.Button; this.rbForce.Appearance = System.Windows.Forms.Appearance.Button;
this.rbForce.AutoSize = true; this.rbForce.AutoSize = true;
this.rbForce.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.rbForce.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.rbForce.Location = new System.Drawing.Point(171, 20); this.rbForce.Location = new System.Drawing.Point(171, 19);
this.rbForce.Name = "rbForce"; this.rbForce.Name = "rbForce";
this.rbForce.Size = new System.Drawing.Size(49, 24); this.rbForce.Size = new System.Drawing.Size(49, 24);
this.rbForce.TabIndex = 1; this.rbForce.TabIndex = 1;
@@ -128,15 +130,25 @@
this.panelGraph.Size = new System.Drawing.Size(742, 603); this.panelGraph.Size = new System.Drawing.Size(742, 603);
this.panelGraph.TabIndex = 3; this.panelGraph.TabIndex = 3;
// //
// lbPair
//
this.lbPair.AutoSize = true;
this.lbPair.Location = new System.Drawing.Point(327, 28);
this.lbPair.Name = "lbPair";
this.lbPair.Size = new System.Drawing.Size(0, 12);
this.lbPair.TabIndex = 4;
//
// PanelTrendGraph // PanelTrendGraph
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(762, 674); this.ClientSize = new System.Drawing.Size(762, 674);
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.lbPair);
this.Controls.Add(this.panelGraph); this.Controls.Add(this.panelGraph);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.HideOnClose = true; this.HideOnClose = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "PanelTrendGraph"; this.Name = "PanelTrendGraph";
this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.Document; this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.Document;
this.TabText = "Trend Graph"; this.TabText = "Trend Graph";
@@ -145,6 +157,7 @@
this.groupBox1.PerformLayout(); this.groupBox1.PerformLayout();
this.panelGraph.ResumeLayout(false); this.panelGraph.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout();
} }
@@ -157,5 +170,6 @@
private System.Windows.Forms.RadioButton rbVelocity; private System.Windows.Forms.RadioButton rbVelocity;
private System.Windows.Forms.RadioButton rbForce; private System.Windows.Forms.RadioButton rbForce;
private System.Windows.Forms.Panel panelGraph; private System.Windows.Forms.Panel panelGraph;
private System.Windows.Forms.Label lbPair;
} }
} }

View File

@@ -53,6 +53,7 @@ namespace friction
Theme.Apply(groupBox1); Theme.Apply(groupBox1);
Theme.Apply(rbHumidity); Theme.Apply(rbHumidity);
Theme.Apply(rbTemp); Theme.Apply(rbTemp);
lbPair.ForeColor = Theme.Orange;
@@ -76,7 +77,7 @@ namespace friction
Fill = new SolidColorBrush Fill = new SolidColorBrush
{ {
Color = System.Windows.Media.Color.FromArgb(Theme.Red.A, Theme.Red.R, Theme.Red.G, Theme.Red.B), Color = System.Windows.Media.Color.FromArgb(Theme.Red.A, Theme.Red.R, Theme.Red.G, Theme.Red.B),
Opacity = .75 Opacity = .25
} }
}, },
new AxisSection new AxisSection
@@ -86,7 +87,7 @@ namespace friction
Fill = new SolidColorBrush Fill = new SolidColorBrush
{ {
Color = System.Windows.Media.Color.FromArgb(Theme.Yellow.A, Theme.Yellow.R, Theme.Yellow.G, Theme.Yellow.B), Color = System.Windows.Media.Color.FromArgb(Theme.Yellow.A, Theme.Yellow.R, Theme.Yellow.G, Theme.Yellow.B),
Opacity = .75 Opacity = .25
} }
}, },
new AxisSection new AxisSection
@@ -96,7 +97,7 @@ namespace friction
Fill = new SolidColorBrush Fill = new SolidColorBrush
{ {
Color = System.Windows.Media.Color.FromArgb(Theme.Green.A, Theme.Green.R, Theme.Green.G, Theme.Green.B), Color = System.Windows.Media.Color.FromArgb(Theme.Green.A, Theme.Green.R, Theme.Green.G, Theme.Green.B),
Opacity = .75 Opacity = .25
} }
} }
} }
@@ -181,7 +182,7 @@ namespace friction
System.Windows.Media.Brushes.Green.Clone(), System.Windows.Media.Brushes.Green.Clone(),
System.Windows.Media.Brushes.IndianRed.Clone() }; System.Windows.Media.Brushes.IndianRed.Clone() };
foreach (var brush in brushes) foreach (var brush in brushes)
brush.Opacity = 0.75; brush.Opacity = 1;
trendChart.Series = new SeriesCollection trendChart.Series = new SeriesCollection
{ {
@@ -212,6 +213,7 @@ namespace friction
Values = TrendPoints, Values = TrendPoints,
PointGeometry = DefaultGeometries.None, PointGeometry = DefaultGeometries.None,
StrokeThickness = 4, StrokeThickness = 4,
Stroke = System.Windows.Media.Brushes.Orange,
}, },
}; };
@@ -426,6 +428,8 @@ namespace friction
m_CurSpring = strSpring; m_CurSpring = strSpring;
m_CurTable = strTable; m_CurTable = strTable;
m_GraphType = Type; m_GraphType = Type;
lbPair.Text = string.Format("{0} vs {1}", strSpring, strTable);
} }
private void rbHumidity_CheckedChanged(object sender, EventArgs e) private void rbHumidity_CheckedChanged(object sender, EventArgs e)

File diff suppressed because it is too large Load Diff

View File

@@ -16,6 +16,7 @@ namespace friction
public string MaterialSpring { set; get; } public string MaterialSpring { set; get; }
public string MaterialTable { set; get; } public string MaterialTable { set; get; }
public DataTable AnalysisData { set; get; } public DataTable AnalysisData { set; get; }
public DataTable CompatibilityData { set; get; }
public Bitmap RadarChart { set; get; } public Bitmap RadarChart { set; get; }
public Bitmap TrendChartByHumidity { set; get; } public Bitmap TrendChartByHumidity { set; get; }
public Bitmap TrendChartByTemperature { set; get; } public Bitmap TrendChartByTemperature { set; get; }
@@ -37,6 +38,7 @@ namespace friction
Sheet.Cells[iRow, iCol].Value = "Material Spring: " + MaterialSpring; Sheet.Cells[iRow, iCol].Value = "Material Spring: " + MaterialSpring;
Sheet.Cells[iRow, iCol].Style.Font.Bold = true; Sheet.Cells[iRow, iCol].Style.Font.Bold = true;
// analysis table
iRow += 1; iRow += 1;
foreach(DataColumn column in AnalysisData.Columns) foreach(DataColumn column in AnalysisData.Columns)
{ {
@@ -130,9 +132,72 @@ namespace friction
Sheet.Cells[iTableRowStart, iTableColStart, iRow-1, iCol-1].Style.Border.BorderAround(OfficeOpenXml.Style.ExcelBorderStyle.Thick); Sheet.Cells[iTableRowStart, iTableColStart, iRow-1, iCol-1].Style.Border.BorderAround(OfficeOpenXml.Style.ExcelBorderStyle.Thick);
Sheet.Cells[iTableRowStart, iTableColStart, iRow - 1, iCol - 1].AutoFitColumns(); Sheet.Cells[iTableRowStart, iTableColStart, iRow - 1, iCol - 1].AutoFitColumns();
// compatibility table
iRow += 1;
iCol = 2;
foreach (DataColumn column in CompatibilityData.Columns)
{
Sheet.Cells[iRow, iCol].Value = column.ColumnName;
iCol++;
}
iRow++;
iCol = 2;
iTableRowStart = iRow - 1;
iTableColStart = iCol;
dValue = 0;
iNoOfTest = 0;
iAvgRPNColumn = 1;
foreach (DataRow row in CompatibilityData.Rows)
{
iCol = 2;
for (int i = 0; i < CompatibilityData.Columns.Count; i++)
{
if (double.TryParse(row[i].ToString(), out dValue) == true)
{
Sheet.Cells[iRow, iCol].Value = dValue;
Sheet.Cells[iRow, iCol].Style.Fill.PatternType = OfficeOpenXml.Style.ExcelFillStyle.Solid;
var Risk = Config.ANALYSIS.GetRisk((float)dValue);
switch (Risk)
{
case Config.ANALYSIS.RISK.NO:
Sheet.Cells[iRow, iCol].Style.Fill.BackgroundColor.SetColor(Theme.Green);
break;
case Config.ANALYSIS.RISK.POTENTIAL:
Sheet.Cells[iRow, iCol].Style.Fill.BackgroundColor.SetColor(Theme.Yellow);
break;
case Config.ANALYSIS.RISK.HIGH:
Sheet.Cells[iRow, iCol].Style.Fill.BackgroundColor.SetColor(Theme.Red);
break;
}
}
else
{
Sheet.Cells[iRow, iCol].Value = row[i].ToString();
}
iCol++;
}
iRow++;
}
Sheet.Cells[iTableRowStart, iTableColStart, iTableRowStart, iCol - 1].Style.Border.BorderAround(OfficeOpenXml.Style.ExcelBorderStyle.Thin);
Sheet.Cells[iTableRowStart, iTableColStart, iRow - 1, iTableColStart].Style.Border.BorderAround(OfficeOpenXml.Style.ExcelBorderStyle.Thin);
Sheet.Cells[iTableRowStart, iTableColStart, iRow - 1, iCol - 1].Style.Border.BorderAround(OfficeOpenXml.Style.ExcelBorderStyle.Thick);
Sheet.Cells[iTableRowStart, iTableColStart, iRow - 1, iCol - 1].AutoFitColumns();
iRow += 2; iRow += 2;
iCol = 2; iCol = 2;
// radar graph
double dX=0; double dX=0;
double dY=0; double dY=0;
for (int i = 1; i < iCol; i++) for (int i = 1; i < iCol; i++)
@@ -155,10 +220,10 @@ namespace friction
if (TrendChartByHumidity != null) if (TrendChartByHumidity != null)
{ {
Sheet.Cells[52, 2].Value = MaterialSpring + " vs " + MaterialTable; Sheet.Cells[71, 2].Value = MaterialSpring + " vs " + MaterialTable;
Sheet.Cells[52, 2].Style.Font.Bold = true; Sheet.Cells[71, 2].Style.Font.Bold = true;
dY += 10; dY += 20;
var picTrendChartHumidity = Sheet.Drawings.AddPicture("Trend Chart by Humidity", TrendChartByHumidity); var picTrendChartHumidity = Sheet.Drawings.AddPicture("Trend Chart by Humidity", TrendChartByHumidity);
picTrendChartHumidity.SetPosition((int)dY, (int)dX); picTrendChartHumidity.SetPosition((int)dY, (int)dX);
iWidth = TrendChartByHumidity.Width; iWidth = TrendChartByHumidity.Width;
@@ -166,7 +231,7 @@ namespace friction
iHeight = iHeight * 390 / iWidth; iHeight = iHeight * 390 / iWidth;
iWidth = 390; iWidth = 390;
picTrendChartHumidity.SetSize(iWidth, iHeight); picTrendChartHumidity.SetSize(iWidth, iHeight);
Sheet.Cells[64, 2].Value = "by Humidity"; Sheet.Cells[84, 2].Value = "by Humidity";
dX += 400; dX += 400;
@@ -177,7 +242,7 @@ namespace friction
iHeight = iHeight * 390 / iWidth; iHeight = iHeight * 390 / iWidth;
iWidth = 390; iWidth = 390;
picTrendChartTemperature.SetSize(iWidth, iHeight); picTrendChartTemperature.SetSize(iWidth, iHeight);
Sheet.Cells[64, 6].Value = "by Temperature"; Sheet.Cells[84, 8].Value = "by Temperature";
dX -= 400; dX -= 400;
@@ -189,7 +254,7 @@ namespace friction
iHeight = iHeight * 390 / iWidth; iHeight = iHeight * 390 / iWidth;
iWidth = 390; iWidth = 390;
picTrendChartForce.SetSize(iWidth, iHeight); picTrendChartForce.SetSize(iWidth, iHeight);
Sheet.Cells[76, 2].Value = "by Force"; Sheet.Cells[97, 2].Value = "by Force";
dX += 400; dX += 400;
@@ -200,7 +265,7 @@ namespace friction
iHeight = iHeight * 390 / iWidth; iHeight = iHeight * 390 / iWidth;
iWidth = 390; iWidth = 390;
picTrendChartVelocity.SetSize(iWidth, iHeight); picTrendChartVelocity.SetSize(iWidth, iHeight);
Sheet.Cells[76, 6].Value = "by Velocity"; Sheet.Cells[97, 8].Value = "by Velocity";
} }
package.SaveAs(new FileInfo(FilePath)); package.SaveAs(new FileInfo(FilePath));

View File

@@ -21,10 +21,13 @@ namespace friction
public static Color Gray = Color.DarkGray; public static Color Gray = Color.DarkGray;
public static Color White = Color.Snow; public static Color White = Color.Snow;
public static Color Orange = Color.Orange;
public static void Apply(Control ctrl) public static void Apply(Control ctrl)
{ {
ctrl.BackColor = Backcolor; ctrl.BackColor = Backcolor;
ctrl.ForeColor = Forecolor; ctrl.ForeColor = Forecolor;
//ctrl.Font = new Font(ctrl.Font.FontFamily, 11.0f);
} }
public static void Apply(DataGridView ctrl) public static void Apply(DataGridView ctrl)
@@ -37,6 +40,7 @@ namespace friction
ctrl.ColumnHeadersDefaultCellStyle.ForeColor = Forecolor; ctrl.ColumnHeadersDefaultCellStyle.ForeColor = Forecolor;
ctrl.RowHeadersDefaultCellStyle.BackColor = Backcolor; ctrl.RowHeadersDefaultCellStyle.BackColor = Backcolor;
ctrl.RowHeadersDefaultCellStyle.ForeColor = Forecolor; ctrl.RowHeadersDefaultCellStyle.ForeColor = Forecolor;
ctrl.Font = new Font(ctrl.Font.FontFamily, 11.0f);
typeof(DataGridView).InvokeMember("DoubleBuffered", typeof(DataGridView).InvokeMember("DoubleBuffered",
BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.SetProperty, BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.SetProperty,
@@ -47,6 +51,7 @@ namespace friction
{ {
ctrl.BackColor = Backcolor; ctrl.BackColor = Backcolor;
ctrl.ForeColor = Forecolor; ctrl.ForeColor = Forecolor;
ctrl.Font = new Font(ctrl.Font.FontFamily, 11.0f);
ctrl.OwnerDraw = true; ctrl.OwnerDraw = true;
ctrl.DrawColumnHeader += ctrl.DrawColumnHeader +=
new DrawListViewColumnHeaderEventHandler new DrawListViewColumnHeaderEventHandler
@@ -185,7 +190,7 @@ namespace friction
{ {
if(sender is ToolStripMenuItem) if(sender is ToolStripMenuItem)
{ {
((ToolStripMenuItem)sender).ForeColor = Color.Orange; ((ToolStripMenuItem)sender).ForeColor = Orange;
} }
} }