Преглед на файлове

fix the restore sem condition problem after DoHolePreview

gsp преди 3 години
родител
ревизия
977e1f7ee3
променени са 3 файла, в които са добавени 13 реда и са изтрити 15 реда
  1. 12 2
      OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CSmplMeasure.cs
  2. 1 6
      OTSSysMgrApp/OTSSysMgrApp.csproj
  3. 0 7
      OTSSysMgrApp/XMLData/SystemData.xml

+ 12 - 2
OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -1091,10 +1091,20 @@ namespace OTSModelSharp
                double wd = m_Sample.GetSEMDataMsr().GetWorkingDistance();
                 SemController sem = m_SemHardwareMgr;
                 double posX=0, posY=0,posR=0;
-                sem.GetSemPositionXY(ref posX, ref posY, ref posR);           
+                sem.GetSemPositionXY(ref posX, ref posY, ref posR);
+
+                CSEMStageData a_pCSEMStageData = m_pMsrThread.GetProjResultData().GetSEMStageData();
 
                 Point pos = new Point((int)posX, (int)posY);
-                semstate.Pos = pos;
+                Point otsPos = new Point(0, 0);
+
+                if (!a_pCSEMStageData.ConverSEMToOTSPoint(pos, ref otsPos)) ;
+                {
+                    return;
+                }
+
+                  
+                semstate.Pos = otsPos;
                 semstate.Magnification = dMagnification;
                 semstate.WorkingDistance = wd;
 

+ 1 - 6
OTSSysMgrApp/OTSSysMgrApp.csproj

@@ -241,13 +241,8 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\logo.jpg" />
     <Content Include="Resources\OTSSysMgr.ico" />
-    <Content Include="XMLData\SystemData.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Controller\" />
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
       <Visible>False</Visible>

+ 0 - 7
OTSSysMgrApp/XMLData/SystemData.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<SystemData>
-  <parameter>
-    <name></name>
-    <Value></Value>
-  </parameter>
-</SystemData>