Jelajahi Sumber

add BeginMultipleAquisition operation before collecting xray

gsp 1 tahun lalu
induk
melakukan
35d02d10c9

+ 2 - 0
OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -972,6 +972,7 @@ namespace OTSModelSharp
                 }
                 if (smallparts.Count > 0)
                 {
+                   
                     nXRayAQTime = (uint)pXRayParam.GetSmallPartXrayTime();
 
                     log.Info("Begin to collect xraydata:" + smallparts.Count + "(" + nXRayAQTime.ToString() + ") on " + workmode.ToString());
@@ -995,6 +996,7 @@ namespace OTSModelSharp
                 }
                 if (smallparts.Count > 0)
                 {
+                   
                     log.Info("Begin to collect xraydata:" + smallparts.Count + " on " + OTS_X_RAY_SCAN_MODE.PointMode.ToString());
                     nXRayAQTime = (uint)pXRayParam.GetSmallPartXrayTime();
                     m_EDSController.GetXRayByParts(smallparts, nXRayAQTime, true);

+ 4 - 2
OxfordExtenderWrapper/ExtenderWrapper.cs

@@ -467,7 +467,7 @@ namespace OxfordExtenderWrapper
             }
            var chordsList = new ChordList(Chords, m_dImagePixelsize);
             EdSpectrumSettings.ScanSettings.AcquisitionRegion.CreateChordListRegion(chordsList);
-
+            EdSpectrumAcquisitionController.BeginMultipleAcquisition();
             try
             {
                 
@@ -532,7 +532,7 @@ namespace OxfordExtenderWrapper
 
            
             EdSpectrumSettings.ScanSettings.AcquisitionRegion.CreatePointRegion(new System.Windows.Point(p.x * m_dImagePixelsize, p.y * m_dImagePixelsize));
-  
+            EdSpectrumAcquisitionController.BeginMultipleAcquisition();
             try
             {
                 m_bXrayDone = false;
@@ -604,6 +604,7 @@ namespace OxfordExtenderWrapper
 
             var dMilliSecondsTime = PointXrayDatas[0].dMilliSecondsTime;
             SetXrayAcquisitionParam(dMilliSecondsTime);
+            EdSpectrumAcquisitionController.BeginMultipleAcquisition();
             foreach (var prm in PointXrayDatas)
             {
 
@@ -685,6 +686,7 @@ namespace OxfordExtenderWrapper
 
             var dMilliSecondsTime = p[0].dMilliSecondsTime;
             SetXrayAcquisitionParam(p[0].dMilliSecondsTime);
+            EdSpectrumAcquisitionController.BeginMultipleAcquisition();
             foreach (var prm in p)
             {
                 prm.b_quant = a_bElementInfo;