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

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -3849,7 +3849,7 @@ namespace OTSMeasureApp
             }
             iSzie = oValue.Size;
             //although we can initialize the fielddata infomation of one sample here ,but we shouldn't do it here,because this is in the module of HMI interface(view),we must abey the rules of MVC.
-            //WSample.GetSEMDataMsr().SetTotalFields(iFieldCount);
+            WSample.GetSEMDataMsr().SetTotalFields(iFieldCount);
             //WSample.ClearFields();
             //foreach (Point fldcenter in pFields)
             //{