Rename some parameters

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ListOfSimilarParticles.cs

@@ -116,10 +116,10 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
                 {
                     if (int.Parse(particlesAll.Rows[i]["particleId"].ToString()) > -1)
                     {
-                        string subt = particlesAll.Rows[i]["SubParticles"].ToString();
+                        string subParticleString = particlesAll.Rows[i]["SubParticles"].ToString();
                         uint[] Analysis_xray = new uint[2000];
                         particlesAll.Rows[i]["XRayDataCount"] = 0;
-                        if (subt == "")
+                        if (subParticleString == "")
                         {
                             string str = " XrayIndex= " + particlesAll.Rows[i]["particleId"].ToString() + " and fieldid = " + particlesAll.Rows[i]["fieldid"].ToString();
                             DataRow[] drs = XRayData.Select(str);
@@ -372,28 +372,28 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
                     {
                         if (enl.Current.Key == "ParticleImage")
                         {
-                            string subt = particles.Rows[i]["SubParticles"].ToString();
+                            string subParticleString = particles.Rows[i]["SubParticles"].ToString();
                             dgV_SimilarParticles.Rows[add_rowindex].Height = 150;
 
 
                             dgV_SimilarParticles.Rows[add_rowindex].Cells[k].Style.BackColor = Color.Azure;
 
                             Bitmap bmap = null;
-                            if (subt != null && subt != "" && subt != "IsSubParticle")
+                            if (subParticleString != null && subParticleString != "" && subParticleString != "IsSubParticle")
                             {
                                 double pix = _result.GetPixelSize();
                                 int width = _result.GetImageWidth();
                                 int height = _result.GetImageHeight();
-                                string substring = "," + subt.Replace(':', '-') + ",";
+                                string substring = "," + subParticleString.Replace(':', '-') + ",";
                                 DataTable dataTable = Particledata.GetParticleAllForBig(substring);//组成拼接颗粒的子颗粒
-                                bmap = fldImgAccess.GetBitmapForMergedParticle(subt, pix, height, width, dataTable);
+                                bmap = fldImgAccess.GetBitmapForMergedParticle(subParticleString, pix, height, width, dataTable);
                                 if (bmap != null)
                                 {
-                                    string[] str = subt.Split(',');
+                                    string[] str = subParticleString.Split(',');
                                     bmap.Tag = new List<string>() { str[0].Split(':')[0], str[0].Split(':')[1] };
                                 }
                             }
-                            else if (subt != "IsSubParticle")
+                            else if (subParticleString != "IsSubParticle")
                             {
                                 if (!fieldpics.Keys.Contains(particles.Rows[i]["fieldid"].ToString()))
                                 {
@@ -752,8 +752,8 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
                     string str = " particleId= " + dgvr.Cells["particleId"].Value.ToString() + " and fieldid = " + dgvr.Cells["fieldid"].Value.ToString();
                     DataRow[] drs = particles.Select(str);
                     DataRow row = drs[0];
-                    string subt = row["SubParticles"].ToString();
-                    if (subt != "" && subt != null)
+                    string subParticleString = row["SubParticles"].ToString();
+                    if (subParticleString != "" && subParticleString != null)
                     {
                         particle = Particledata.GetXrayByParticleTagIDAndFieldID_ForMergeParticle(Convert.ToInt32(dgvr.Cells["particleId"].Value), Convert.ToInt32(dgvr.Cells["fieldid"].Value), out Search_xray, out Analysis_xray);
                         list_celementchemistryclr = particle.ElementList;
@@ -783,7 +783,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
                     int height = _result.GetImageHeight();
                     Dictionary<string, List<Segment>> segsData = new Dictionary<string, List<Segment>>();
 
-                    if (subt == "" || subt == null)
+                    if (subParticleString == "" || subParticleString == null)
                     {
                         int fldid = Convert.ToInt32(dgvr.Cells["fieldid"].Value);
                         int partid = Convert.ToInt32(dgvr.Cells["particleId"].Value);
@@ -795,7 +795,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
                     }
                     else
                     {
-                        string vs = "," + subt.Replace(':', '-') + ",";
+                        string vs = "," + subParticleString.Replace(':', '-') + ",";
                         dataTable = Particledata.GetParticleAllForBig(vs);//组成拼接颗粒的子颗粒
                         foreach (DataRow dow in dataTable.Rows)
                         {
@@ -806,8 +806,8 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
                             segsData.Add(key, listseg);
                         }
                     }
-                    Bitmap bmap = fldImgAccess.GetBitmapForParticleAll(subt, dataTable, pix, height, width);
-                    Bitmap bmap1 = fldImgAccess.GetBitmapForParticleAllWithBlackAndWhite(subt, dataTable, segsData, pix, height, width);
+                    Bitmap bmap = fldImgAccess.GetBitmapForParticleAll(subParticleString, dataTable, pix, height, width);
+                    Bitmap bmap1 = fldImgAccess.GetBitmapForParticleAllWithBlackAndWhite(subParticleString, dataTable, segsData, pix, height, width);
                     control_XRayTable1.SetBitmapOfPictureBox(bmap1, bmap);
                     Invalidate();
                 }

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ParticlesGridDevidePage.cs

@@ -377,8 +377,8 @@ namespace OTSIncAReportGrids
             DataTable XRayData = Particledata.GetXRayData();
             for (int i = 0; i < particlesAll.Rows.Count; i++)
             {
-                string subt = particlesAll.Rows[i]["SubParticles"].ToString();
-                if (subt =="")
+                string subParticleString = particlesAll.Rows[i]["SubParticles"].ToString();
+                if (subParticleString =="")
                 {
                     particlesAll.Rows[i]["XRayDataCount"] = 0;
                     string str = " XrayIndex= " + particlesAll.Rows[i]["particleId"].ToString() + " and fieldid = " + particlesAll.Rows[i]["fieldid"].ToString();
@@ -511,28 +511,28 @@ namespace OTSIncAReportGrids
                     {
                         if (enl.Current.Key == "ParticleImage")
                         {
-                            string subt = particles.Rows[i]["SubParticles"].ToString();
+                            string subParticleString = particles.Rows[i]["SubParticles"].ToString();
                             dgV_ParticlesDevidePage.Rows[add_rowindex].Height = 150;
                             
                             
                             dgV_ParticlesDevidePage.Rows[add_rowindex].Cells[k].Style.BackColor = Color.Azure;
 
                             Bitmap bmap = null;
-                            if (subt != null && subt != "" && subt != "IsSubParticle")
+                            if (subParticleString != null && subParticleString != "" && subParticleString != "IsSubParticle")
                             {
                                 double pix =  result.GetPixelSize();
                                 int width = result.GetImageWidth(); 
                                 int height = result.GetImageHeight();
-                                string vs = "," + subt.Replace(':', '-') + ",";
+                                string vs = "," + subParticleString.Replace(':', '-') + ",";
                                 DataTable dataTable = Particledata.GetParticleAllForBig(vs);//组成拼接颗粒的子颗粒
-                                bmap = fldImgAccess.GetBitmapForMergedParticle(subt, pix, height, width, dataTable);
+                                bmap = fldImgAccess.GetBitmapForMergedParticle(subParticleString, pix, height, width, dataTable);
                                 if (bmap != null)
                                 {
-                                    string[] str = subt.Split(',');
+                                    string[] str = subParticleString.Split(',');
                                     bmap.Tag = new List<string>() { str[0].Split(':')[0], str[0].Split(':')[1] };
                                 }
                             }
-                            else if (subt != "IsSubParticle")
+                            else if (subParticleString != "IsSubParticle")
                             {
                                 if (!fieldpics.Keys.Contains(particles.Rows[i]["fieldid"].ToString()))
                                 {
@@ -2463,8 +2463,8 @@ namespace OTSIncAReportGrids
                     string str = " particleId= " + dgvr.Cells["particleId"].Value.ToString() + " and fieldid = " + dgvr.Cells["fieldid"].Value.ToString();
                     DataRow[] drs = particles.Select(str);
                     DataRow row = drs[0];
-                    string subt = row["SubParticles"].ToString();
-                    if (subt != ""&& subt != null)
+                    string subParticleString = row["SubParticles"].ToString();
+                    if (subParticleString != ""&& subParticleString != null)
                     {
                         particle = Particledata.GetXrayByParticleTagIDAndFieldID_ForMergeParticle(Convert.ToInt32(dgvr.Cells["particleId"].Value), Convert.ToInt32(dgvr.Cells["fieldid"].Value), out Search_xray, out Analysis_xray);
                         list_celementchemistryclr = particle.ElementList;
@@ -2496,7 +2496,7 @@ namespace OTSIncAReportGrids
                     int height = result.GetImageHeight();
                     Dictionary<string, List<Segment>> segsData = new Dictionary<string, List<Segment>>();
 
-                    if (subt == "" || subt == null)
+                    if (subParticleString == "" || subParticleString == null)
                     {
                         int fldid = Convert.ToInt32(dgvr.Cells["fieldid"].Value);
                         int partid = Convert.ToInt32(dgvr.Cells["particleId"].Value);
@@ -2508,7 +2508,7 @@ namespace OTSIncAReportGrids
                     }
                     else
                     {
-                        string vs = "," + subt.Replace(':', '-') + ",";
+                        string vs = "," + subParticleString.Replace(':', '-') + ",";
                         dataTable = Particledata.GetParticleAllForBig(vs);//组成拼接颗粒的子颗粒
                         foreach (DataRow dow in dataTable.Rows)
                         {
@@ -2519,8 +2519,8 @@ namespace OTSIncAReportGrids
                             segsData.Add(key, listseg);
                         }
                     }
-                    Bitmap bmap = fldImgAccess.GetBitmapForParticleAll(subt, dataTable, pix, height, width);
-                    Bitmap bmap1 = fldImgAccess.GetBitmapForParticleAllWithBlackAndWhite(subt, dataTable, segsData, pix, height, width);
+                    Bitmap bmap = fldImgAccess.GetBitmapForParticleAll(subParticleString, dataTable, pix, height, width);
+                    Bitmap bmap1 = fldImgAccess.GetBitmapForParticleAllWithBlackAndWhite(subParticleString, dataTable, segsData, pix, height, width);
                     control_XRayTable1.SetBitmapOfPictureBox(bmap1, bmap);
                     Invalidate();
                     ToolStripMenuItem_SimilarityReclassification.Enabled = true;
@@ -2644,8 +2644,8 @@ namespace OTSIncAReportGrids
             string str = " particleId= " + dgvr.Cells["particleId"].Value.ToString() + " and fieldid = " + dgvr.Cells["fieldid"].Value.ToString();
             DataRow[] drs = particles.Select(str);
             DataRow row = drs[0];
-            string subt = row["SubParticles"].ToString();
-            if (subt != "" && subt != null)
+            string subParticleString = row["SubParticles"].ToString();
+            if (subParticleString != "" && subParticleString != null)
             {
                 Particledata.GetXrayByParticleTagIDAndFieldID_ForMergeParticle(Convert.ToInt32(dgvr.Cells["particleId"].Value), Convert.ToInt32(dgvr.Cells["fieldid"].Value), out Search_xray, out Analysis_xray);
             }

OTSIncAReportApp/1-UI/Control_Grids/ParticlesSizeGrid.cs

@@ -30,9 +30,8 @@ namespace OTSIncAReportGrids
         Hashtable table;
 
         //测量结果
-        ResultFile result = null;
-
-        OTSIncAReportApp.OTSSampleReportInfo.ReportCondition source;
+        ResultFile resultFile = null;
+        OTSIncAReportApp.OTSSampleReportInfo.ReportCondition reportCondition;
         OTSIncAReportApp.frmReportApp m_ReportApp;
 
         int gridheight = 0;
@@ -65,7 +64,7 @@ namespace OTSIncAReportGrids
         /// <summary>
         /// 绑定datagridview数据
         /// </summary>
-        public void BindDataGridView(string path, int num, string filename)
+        public void UpdateDataGrid(string path, int num, string filename)
         {
             List<string> colid = new List<string>() { "rowid", "pname", "color", "TypeId", "Largest", "Total" };
             List<string> colname = new List<string>() { table["str1"].ToString(), table["str8"].ToString(), table["str9"].ToString(), "TypeId", table["str10"].ToString(), table["str11"].ToString() };
@@ -82,7 +81,7 @@ namespace OTSIncAReportGrids
             }
             else
             {
-                con = source.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
+                con = reportCondition.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE).ToString();
             }
 
             string po = "";
@@ -105,7 +104,7 @@ namespace OTSIncAReportGrids
             if (m_ReportApp.m_rstDataMgr.m_RptConfigFile.PartSizeFile == "AUTO.psf")
             {
                 double dn = 99999;
-                string sou = source.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+                string sou = reportCondition.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
                 if (sou.Contains("+"))
                 {
                     for (int i = 0; i < sou.Split('+').Length; i++)
@@ -400,8 +399,8 @@ namespace OTSIncAReportGrids
         public ParticlesSizeGrid(OTSIncAReportApp.frmReportApp ReportApp)
         {
             m_ReportApp = ReportApp;
-            result = m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResultId()];
-            source = m_ReportApp.m_conditionChoose.m_conditionData;
+            resultFile = m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResultId()];
+            reportCondition = m_ReportApp.m_conditionChoose.m_conditionData;
 
 
             InitializeComponent();
@@ -417,7 +416,7 @@ namespace OTSIncAReportGrids
             list_fileName.Clear();
 	
 
-			string sou = source.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+			string sou = reportCondition.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
             if (sou.Contains("+"))
             {
                 for (int i = 0; i < sou.Split('+').Length; i++)
@@ -425,7 +424,7 @@ namespace OTSIncAReportGrids
                     ResultFile resultFile = m_ReportApp.m_rstDataMgr.ResultFilesList.Find(s => s.anotherFileName == sou.Split('+')[i]);
                     if (resultFile != null)
                     {
-                        BindDataGridView(resultFile.FilePath, i, resultFile.anotherFileName);
+                        UpdateDataGrid(resultFile.FilePath, i, resultFile.anotherFileName);
                         list_fileName.Add(resultFile.anotherFileName);
 
 					}
@@ -437,7 +436,7 @@ namespace OTSIncAReportGrids
                 {
                     if (sou == m_ReportApp.m_rstDataMgr.ResultFilesList[i].anotherFileName.ToString())
                     {
-						BindDataGridView(m_ReportApp.m_rstDataMgr.ResultFilesList[i].FilePath, 0, m_ReportApp.m_rstDataMgr.ResultFilesList[i].anotherFileName);
+						UpdateDataGrid(m_ReportApp.m_rstDataMgr.ResultFilesList[i].FilePath, 0, m_ReportApp.m_rstDataMgr.ResultFilesList[i].anotherFileName);
                         list_fileName.Add(m_ReportApp.m_rstDataMgr.ResultFilesList[i].anotherFileName);
 					}
                  
@@ -650,7 +649,7 @@ namespace OTSIncAReportGrids
 
             //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
             //string sou = m_ReportApp.SourceGridData.ConditionItemList[idx].itemVal.ToString();
-            string sou = source.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+            string sou = reportCondition.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
             if (sou.Contains("+"))
             {
                 for (int i = 0; i < sou.Split('+').Length; i++)
@@ -658,13 +657,13 @@ namespace OTSIncAReportGrids
                     ResultFile resultFile = m_ReportApp.m_rstDataMgr.ResultFilesList.Find(s => s.anotherFileName == sou.Split('+')[i]);
                     if (resultFile != null)
                     {
-                        BindDataGridView(resultFile.FilePath, i, resultFile.anotherFileName);
+                        UpdateDataGrid(resultFile.FilePath, i, resultFile.anotherFileName);
                     }
                 }
             }
             else
             {
-                BindDataGridView(m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResultId()].FilePath, 0, m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResultId()].anotherFileName);
+                UpdateDataGrid(m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResultId()].FilePath, 0, m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResultId()].anotherFileName);
             }
         }
 

OTSIncAReportApp/3-ServiceCenter/DataOperation/DataAccess/ParticleData.cs

@@ -954,8 +954,8 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
             {
                 foreach (DataRow MergeParticlesRow in dataTable_MergeParticles.Rows)
                 {
-                    string subt = MergeParticlesRow["SubParticles"].ToString();
-                    string[] sub = subt.Split(',');
+                    string subParticleString = MergeParticlesRow["SubParticles"].ToString();
+                    string[] sub = subParticleString.Split(',');
                     if (row.RowState == DataRowState.Deleted)
                     {
                         break;

OTSIncAReportApp/3-ServiceCenter/DataOperation/ImageAccess/FieldImage.cs

@@ -18,15 +18,15 @@ namespace OTSIncAReportApp._3_ServiceCenter.DataOperation.DataAccess
         /// <summary>
         /// 拼接颗粒黑白图
         /// </summary>
-        /// <param name="substring">拼接字符串</param>
+        /// <param name="subParticleString">拼接字符串</param>
         /// <param name="PartdataTable">组成拼接颗粒的子颗粒</param>
         /// <param name="picHeight">图像高</param>
         /// <param name="picWidth">帧图宽</param>
         ///  <param name="segsData">KEY为FidANDpID</param> 
         /// <returns></returns>
-        public Bitmap GetBlackAndWhiteBitmapForMergedParticle(string substring, double pix, int picHeight, int picWidth,DataTable PartdataTable,Dictionary<string,List<Segment>> segsData)
+        public Bitmap GetBlackAndWhiteBitmapForMergedParticle(string subParticleString, double pix, int picHeight, int picWidth,DataTable PartdataTable,Dictionary<string,List<Segment>> segsData)
         {
-            string vs = "," + substring.Replace(':', '-') + ",";
+            string vs = "," + subParticleString.Replace(':', '-') + ",";
             
             if (PartdataTable.Rows.Count == 0)
             {
@@ -139,14 +139,14 @@ namespace OTSIncAReportApp._3_ServiceCenter.DataOperation.DataAccess
         /// <summary>
         /// 拼接颗粒图
         /// </summary>
-        /// <param name="substring">拼接字符串</param>
+        /// <param name="subParticleString">拼接字符串</param>
         /// <param name="picHeight">图像高</param>
         /// <param name="picWidth">帧图宽</param>
         /// <param name="dataTable">组成拼接颗粒的子颗粒</param>
         /// <returns></returns>
-        public Bitmap GetBitmapForMergedParticle(string substring, double pix, int picHeight, int picWidth,DataTable dataTable)
+        public Bitmap GetBitmapForMergedParticle(string subParticleString, double pix, int picHeight, int picWidth,DataTable dataTable)
         {
-            string vs = "," + substring.Replace(':', '-') + ",";
+            string vs = "," + subParticleString.Replace(':', '-') + ",";
 
            
             if (dataTable.Rows.Count == 0)
@@ -288,18 +288,18 @@ namespace OTSIncAReportApp._3_ServiceCenter.DataOperation.DataAccess
         /// <summary>
         /// 获取全部颗粒图
         /// </summary>
-        /// <param name="substring">拼接颗粒连接字符串</param>
+        /// <param name="subParticleString">拼接颗粒连接字符串</param>
         /// <param name="dataTable">颗粒表</param>
         /// <param name="pix">pixel</param>
         /// <param name="picHeight">帧图高</param>
         /// <param name="picWidth">帧图宽</param>
         /// <returns></returns>
-        public Bitmap GetBitmapForParticleAll(string substring, DataTable dataTable, double pix=0, int picHeight=0, int picWidth=0)
+        public Bitmap GetBitmapForParticleAll(string subParticleString, DataTable dataTable, double pix=0, int picHeight=0, int picWidth=0)
         {
             Bitmap bmap;
-            if(substring != "")
+            if(subParticleString != "")
             {
-                bmap = GetBitmapForMergedParticle(substring, pix, picHeight, picWidth,dataTable);
+                bmap = GetBitmapForMergedParticle(subParticleString, pix, picHeight, picWidth,dataTable);
             }
             else
             {
@@ -310,18 +310,18 @@ namespace OTSIncAReportApp._3_ServiceCenter.DataOperation.DataAccess
         /// <summary>
         /// 获取全部颗粒图
         /// </summary>
-        /// <param name="subsubstring">拼接颗粒连接字符串</param>
+        /// <param name="subParticleString">拼接颗粒连接字符串</param>
         /// <param name="dataTable">颗粒表 或 组成拼接颗粒的子颗粒表</param>
         /// <param name="pix">pixel</param>
         /// <param name="picHeight">帧图高</param>
         /// <param name="picWidth">帧图宽</param>
         /// <returns></returns>
-        public Bitmap GetBitmapForParticleAllWithBlackAndWhite(string subsubstring, DataTable dataTable, Dictionary<string, List<Segment>> segsData, double pix = 0, int picHeight = 0, int picWidth = 0)
+        public Bitmap GetBitmapForParticleAllWithBlackAndWhite(string subParticleString, DataTable dataTable, Dictionary<string, List<Segment>> segsData, double pix = 0, int picHeight = 0, int picWidth = 0)
         {
             Bitmap bmap;
-            if (subsubstring != "")
+            if (subParticleString != "")
             {
-                bmap = GetBlackAndWhiteBitmapForMergedParticle(subsubstring, pix, picHeight, picWidth, dataTable, segsData);
+                bmap = GetBlackAndWhiteBitmapForMergedParticle(subParticleString, pix, picHeight, picWidth, dataTable, segsData);
             }
             else
             {