Browse Source

improve the OxfordExtender/OxfordSemController.cs,enhance the stable.

gsp 7 months ago
parent
commit
aaa9955e40

+ 0 - 6
.cr/personal/FavoritesList/List.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Root Type="DevExpress.CodeRush.Foundation.CodePlaces.Options.FavoritesListContainer">
-  <Options Language="Neutral">
-    <Groups />
-  </Options>
-</Root>

+ 2 - 2
Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="OffLine" DelayQuantify="true" WeightPercentageToAtomicPercentage="false" />
+  <Member RegName="SemControllerName" Value="Oxford" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="Oxford" DelayQuantify="true" WeightPercentageToAtomicPercentage="false" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

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

@@ -1,15 +1,15 @@
 <?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="fire-resistant_2" SteelTechnology="0" UseSysSTD="false" />
+  <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="fire-resistant_2" SteelTechnology="0" UseSysSTD="true" />
   <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="3:WaterShed" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
-    <Member RegName="BGGray" end="30" start="0" />
-    <Member RegName="IncArea" end="10000" start="25" />
+    <Member RegName="BGGray" end="50" start="0" />
+    <Member RegName="IncArea" end="2000" start="15" />
     <Member RegName="ParticleGray" end="255" start="0" />
   </Member>
   <Member RegName="ImageScanParam" ImageResolution="4:_1536_1024" SatrtImageMode="1:Snake" ScanImageSpeed="0:low" StopMode="0:CoverMode" StopParamArea="10" StopParamFields="100" StopParamMeasTime="360" StopParamParticles="5000" />
-  <Member RegName="StageData" ControlDelay="1000" MinMag="65" scanFieldSize="1270" xAxisDir="0:LEFT_TOWARD" yAxisDir="1:DOWN_TOWARD">
+  <Member RegName="StageData" ControlDelay="2000" MinMag="65" scanFieldSize="1270" xAxisDir="1:RIGHT_TOWARD" yAxisDir="0:UP_TOWARD">
     <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="999999999" />
+  <Member RegName="XrayParam" AnalyExpCount="50" 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="30" QuantifyMinSize="1" ScanMode="0:PointMode" SmallPartAQTime="30" UseFilter="false" UsingXray="true" XrayLimit="999999999" />
 </XMLData>

+ 13 - 8
OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.cs

@@ -361,16 +361,21 @@ namespace OTSMeasureApp
 
             CBSEImgClr img;
             bool rst = GetScanImage(GetIWidth(), GetIHeight(), nDwellTime, out img);
-            if (img.GetWidth() != GetIWidth() || img.GetHeight() != GetIHeight())
+            if (rst) 
             {
-                log.Error("Wrong resolution!");
-                return false;
+                if (img.GetWidth() != GetIWidth() || img.GetHeight() != GetIHeight())
+                {
+                    log.Error("Wrong resolution!");
+                    return false;
+                }
+                originalBse = img;
+                originalBseData = img.GetImageDataPtr();
+                myFld = new COTSField();
+                myFld.SetBSEImage(img);
+                myFld.Sample = m_MeasureAppForm.m_ProjParam.GetResultData().GetWorkingSample();
+
             }
-            originalBse = img;
-            originalBseData = img.GetImageDataPtr();
-            myFld = new COTSField();
-            myFld.SetBSEImage(img);
-            myFld.Sample = m_MeasureAppForm.m_ProjParam.GetResultData().GetWorkingSample();
+            
 
             return rst;
 

+ 4 - 1
OTSIncAMeasureApp/ServiceCenter/OxfordExtender/OxfordSemController.cs

@@ -123,7 +123,8 @@ namespace OTSMeasureApp.ServiceCenter
 
         public bool MoveSEMToPoint(double a_dPositionX, double a_dPositionY, double rotation)
         {
-           var b1= iExtender.MoveStageXY((float)a_dPositionX, (float)a_dPositionY);
+            iExtender = ExtenderWrapperIpc.GetExtenderWrapper();
+            var b1= iExtender.MoveStageXY((float)a_dPositionX, (float)a_dPositionY);
             var b2=iExtender.SetStageGotoR((float)rotation);
            
             return b1&b2;
@@ -131,6 +132,8 @@ namespace OTSMeasureApp.ServiceCenter
 
         public bool MoveSEMToPoint(double a_dPositionX, double a_dPositionY)
         {
+            Thread.Sleep(1000);
+            iExtender = ExtenderWrapperIpc.GetExtenderWrapper();
             var b= iExtender.MoveStageXY((float)a_dPositionX, (float)a_dPositionY);
           
             return b;

+ 1 - 1
OxfordExtenderWrapper/ExtenderIpcUI1.cs

@@ -56,7 +56,7 @@ namespace OxfordExtenderWrapper
         public bool MoveStageXY(float x, float y)
         {
            
-                Thread.Sleep(200);
+                
                var r = iExtender.MoveStageXY(x, y);
             
             return r;

+ 1 - 1
OxfordExtenderWrapper/OxfordExtenderWrapper.csproj

@@ -49,7 +49,7 @@
   <ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <Reference Include="OINA.Extender, Version=6.1.0.0, Culture=neutral, PublicKeyToken=5efad68c95e0364e, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\OpenDll\OxfordApi61Dll\OINA.Extender.dll</HintPath>
+      <HintPath>..\OpenDll\OxfordApi61sp1Dll\OINA.Extender.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>