Преглед изворни кода

change the DoHolePreview aquireimage sequence parameter to snake(meander).

gsp пре 4 месеци
родитељ
комит
15ecc30632

+ 2 - 2
Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData RunMode="ProfessionalMode" SysType="IncA">
   <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="NoSTDDB" SteelTechnology="0" UseSysSTD="true" />
-  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="2:MATRIX" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
+  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="0:AUTO" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
     <Member RegName="BGGray" end="255" start="80" />
     <Member RegName="IncArea" end="100" start="2" />
     <Member RegName="ParticleGray" end="255" start="0" />
@@ -11,5 +11,5 @@
     <Member RegName="XAxis" end="55000" start="-55000" />
     <Member RegName="YAxis" end="55000" start="-55000" />
   </Member>
-  <Member RegName="XrayParam" AnalyExpCount="1000" IfAutoId="true" KnownElements="C,N,O,F,Na,Mg,Al,Si,P,S,Ca,Ti,V,Cr,Mn,Fe,Zr,Nb,Mo,La,Ce" MidAnalyAQTime="200" QuantifyMinSize="1" ScanMode="1:FeatureMode" SmallPartAQTime="200" UseFilter="false" UsingXray="true" XrayLimit="50" />
+  <Member RegName="XrayParam" AnalyExpCount="1000" IfAutoId="true" KnownElements="C,N,O,F,Na,Mg,Al,Si,P,S,Ca,Ti,V,Cr,Mn,Fe,Zr,Nb,Mo,La,Ce" MidAnalyAQTime="200" QuantifyMinSize="1" ScanMode="0:PointMode" SmallPartAQTime="200" UseFilter="false" UsingXray="true" XrayLimit="50" />
 </XMLData>

+ 1 - 1
OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CMeasure.cs

@@ -443,7 +443,7 @@ namespace OTSModelSharp
             // Set image scan param
             COTSImgScanPrm poImageScanParam = new COTSImgScanPrm();
             poImageScanParam.SetStopMode(((int)OTS_MEASURE_STOP_MODE.CoverMode).ToString());
-            poImageScanParam.SetStartImageMode(OTS_GET_IMAGE_MODE.Zshape);
+            poImageScanParam.SetStartImageMode(OTS_GET_IMAGE_MODE.Snake);
             poImageScanParam.SetScanImageSpeed(OTS_IMAGE_SCANSPEED_OPTIONS.low);
        
 

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

@@ -223,12 +223,6 @@ namespace OTSModelSharp
             Size sizePixelImage = RESOLUTION_VALUE[nResulotionId];
 
 
-            // get dwell time 
-            OTS_IMAGE_SCANSPEED_OPTIONS nDwellTime = pImgScanParam.GetScanImageSpeed();
-
-            // convert dwell time to bruker dwell time 
-            //long nBrukerDwellTime = DWELLTIME_BRUKER_VALUES[2];// choose the third option, so the dwell time will be 4 . there's no need to change here. it shoud be a const.
-
 
             if (!pScanController.Init())
             {