Handle several conflicts

OTSCommon/DBOperate/Model/Particle.cs

@@ -24,7 +24,7 @@ namespace OTSCommon.DBOperate.Model
         //FeatureList
         public List<Segment> SegmentList { set; get; }
         //XRayData
-        public byte[] XRayData { set; get; }
+        public byte[] XRayData { set; get; } = new byte[8000];
         //ElementList
         public List<Element> ElementList { set; get; }
 

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -111,6 +111,7 @@ namespace OTSDataType
         public void SetSwitch(bool a_bSwitch) { m_bSwitch = a_bSwitch; }
 
         // measurement parameter 
+        
         public CSampleParam GetMsrParams() { return m_poMsrParams; }
         public void SetMsrParams(CSampleParam a_poMsrParams)
         {

OTSIncAMeasureApp/1-OTSMeasure/Measure/ParamData/COTSMsrPrjResultData.cs

@@ -56,7 +56,6 @@ namespace OTSModelSharp
         public COTSMsrPrjResultData()
         {
             Init();
-
         }
 
         // initialization
@@ -184,6 +183,7 @@ namespace OTSModelSharp
 
             }
 
+
             if (m_listSamples.Count > 0)
             {
                 m_nWorkingSampeIndex = 0;

OTSIncAMeasureApp/2-OTSMeasureParamManage/COTSMeasureParam.cs

@@ -858,15 +858,10 @@ namespace OTSMeasureApp
                     }
                 }
             }
-
-
-
             return true;
         }
         bool IsMeasureCompletedSmpl(COTSSample a_pSample)
         {
-            // safety check
-
             if (a_pSample.GetMsrStatus().GetStatus() != OTSDataType.OTS_MSR_SAMPLE_STATUS.COMPLETED)
             {
 
@@ -874,6 +869,16 @@ namespace OTSMeasureApp
             }
             return true;
         }
+
+
+
+
+
+
+
+
+
+
         string GetSampleErrorWarnString(SAMPLE_FAULT_WARN_CODE a_nSampleFaultWarn)
         {