Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -1275,7 +1275,7 @@ namespace OTSDataType
                                 // total measured area 
                                 poPropItem = new CPropItem();
                                 nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.TOTAL_AREA;
-                                poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, true);
+                                poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.DOUBLE, true, true);
                                 a_listPropItems.Add(poPropItem);
 
                                 // total particles 
@@ -1287,7 +1287,7 @@ namespace OTSDataType
                                 // total particle area
                                 poPropItem = new CPropItem();
                                 nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.TOTAL_PARTICLE_AREA;
-                                poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, true);
+                                poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.DOUBLE, true, true);
                                 a_listPropItems.Add(poPropItem);
                             }
                         }

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSDisplaySampleGrid.cs

@@ -55,7 +55,7 @@ namespace OTSMeasureApp
         public int m_PropWindow_Y = 0;
 
      //   int Cur_Grid_Rows = 0;           //临时用于计算用的grid行号
-        public static int Const_Grid_Row = 45;    //总行数
+        public static int Const_Grid_Row = 46;    //总行数
         public static int Const_Grid_Column = 3;   //总列数
 
 
@@ -1064,7 +1064,7 @@ namespace OTSMeasureApp
                     break;
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.TOTAL_AREA:              //检测面积(正整数,不含0)
-                    if (false == rg_zzs_bhl.Match(in_str.Trim()).Success)
+                    if (false == rg_fds_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "100000";
                         MessageBox.Show("The detection area of the sample is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
@@ -1082,7 +1082,7 @@ namespace OTSMeasureApp
                     break;
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.TOTAL_PARTICLE_AREA:              //颗粒面积(正整数,不含0)
-                    if (false == rg_zzs_bhl.Match(in_str.Trim()).Success)
+                    if (false == rg_fds_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "10000";
                         MessageBox.Show("The particle area of the sample is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);