ソースを参照

add Add the total area ratio

cxs 2 週間 前
コミット
594fd6e232

+ 3 - 11
OTSIncAReportApp/1-UI/Control_Grids/CompositionDistributionGrid.cs

@@ -123,13 +123,7 @@ namespace OTSIncAReportGrids
             gridView.AddSpanHeader(1, gridView.Columns.Count - 1, filename);
             
                 FieldData fielddata = new FieldData(path);
-                //Dictionary<string, object> sampleMembers = ((Dictionary<string, object>)((Dictionary<string, object>)result.ResultInfo["Sample"])["Members"]);
-                //Dictionary<string, object> semDataMsr = (Dictionary<string, object>)sampleMembers["SEMDataMsr"];
                 double scanFieldSize = result.GetScanFieldSizeX();
-                //Dictionary<string, object> imageScanParam = (Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)sampleMembers["MsrParams"])["Members"])["ImageScanParam"];
-                //string ImageResolution = imageScanParam["ImageResolution"].ToString();
-                //double wide = Convert.ToDouble(ImageResolution.Split('_')[1]);
-                //double high = Convert.ToDouble(ImageResolution.Split('_')[2]);
                 double wide = result.GetImageWidth();
                 double high = result.GetImageHeight();
                 double pixelSize = scanFieldSize / wide;
@@ -229,11 +223,6 @@ namespace OTSIncAReportGrids
                         }
                         gridView.Rows[add_rowindex].Cells[k].Style.BackColor = Color.Azure;
                     }
-                    //else if (gridView.Columns[k].Name == "TypeName")
-                    //{
-                    //    gridView.Rows[add_rowindex].Cells[k].Value = name;
-                    //    gridView.Rows[add_rowindex].Cells[k].Style.BackColor = Color.Azure;
-                    //}
                     else if (gridView.Columns[k].Name.ToLower() == "arearadio")
                     {
                         if (totalArea == 0)
@@ -265,6 +254,9 @@ namespace OTSIncAReportGrids
                 if (gridView.Rows[a1].Cells[3].Value == null)
                         gridView.Rows[a1].Cells[3].Value = 0;
                     gridView.Rows[a1].Cells[3].Value = Convert.ToInt32(gridView.Rows[a1].Cells[3].Value) + Convert.ToInt32(gridView.Rows[j].Cells[3].Value);
+                if(gridView.Rows[a1].Cells[4].Value == null)
+                    gridView.Rows[a1].Cells[4].Value = 0;
+                gridView.Rows[a1].Cells[4].Value = Convert.ToDouble(gridView.Rows[a1].Cells[4].Value) + Convert.ToDouble(gridView.Rows[j].Cells[4].Value);
             }
             SetDataGridViewStyle(gridView);
             panel1.Controls.Add(gridView);