Pārlūkot izejas kodu

Merge branch 'master' of http://192.168.1.123:10080/SDD1/HOZ

wb_han 5 gadi atpakaļ
vecāks
revīzija
295933d81b
1 mainītis faili ar 8 papildinājumiem un 6 dzēšanām
  1. 8 6
      SmartSEMControl/SmartSEM.cs

+ 8 - 6
SmartSEMControl/SmartSEM.cs

@@ -1014,23 +1014,25 @@ namespace SmartSEMControl
         public Boolean MoveStageXY(float x,float y)
         {
             //先取范围
-            object varMin = new VariantWrapper((float)0.0f);
-            object varMax = new VariantWrapper((float)0.0f);
-            long lrt = CZEMApi.GetLimits(AP_STAGE_GOTO_X, ref varMin, ref varMax);
+            object xMin = new VariantWrapper((float)0.0f);
+            object xMax = new VariantWrapper((float)0.0f);
+            long lrt = CZEMApi.GetLimits(AP_STAGE_GOTO_X, ref xMin, ref xMax);
             if (lrt != 0)
             {
                 return false;
             }
-            if (x > Convert.ToSingle(varMax) || x < Convert.ToSingle(varMin))
+            if (x > Convert.ToSingle(xMax) || x < Convert.ToSingle(xMin))
             {
                 return false;
             }
-            lrt = CZEMApi.GetLimits(AP_STAGE_GOTO_Y, ref varMin, ref varMax);
+            object yMin = new VariantWrapper((float)0.0f);
+            object yMax = new VariantWrapper((float)0.0f);
+            lrt = CZEMApi.GetLimits(AP_STAGE_GOTO_Y, ref yMin, ref yMax);
             if (lrt != 0)
             {
                 return false;
             }
-            if (y > Convert.ToSingle(varMax) || y < Convert.ToSingle(varMin))
+            if (y > Convert.ToSingle(yMax) || y < Convert.ToSingle(yMin))
             {
                 return false;
             }